From e55a9f35a1653a21d50c7d9712e466152932c61b Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Wed, 26 Oct 2022 11:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/acs/rest/AcsToWmsController.java | 4 +-- .../wms/sch/service/impl/TaskServiceImpl.java | 5 ++++ .../callEmpty/GjxCallEmpVehicleTask.java | 1 + .../callEmpty/YqxCallEmpVehicleTask.java | 3 ++ .../sendMaterial/GjxSendMaterialTask.java | 6 ++-- .../wql/QSCH_gjxSendMaterial_01.wql | 26 +++++++++--------- .../src/main/java/org/nl/wms/wms.xls | Bin 253440 -> 253952 bytes .../main/resources/config/application-dev.yml | 4 +-- .../src/views/wms/sch/task/index.vue | 6 ++-- 9 files changed, 33 insertions(+), 22 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 301c847..0fe289f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; - /** * @author ludj * @date 2021-07-21 @@ -57,7 +55,7 @@ public class AcsToWmsController { @Log("二次申请任务") @ApiOperation("二次申请任务") @SaCheckPermission("menu:list") - public ResponseEntity towApply(@RequestBody String task_id) { + public ResponseEntity againApply(@RequestBody String task_id) { return new ResponseEntity<>(acsToWmsService.againApply(task_id), HttpStatus.OK); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index fc25354..5283eaa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -103,6 +103,11 @@ public class TaskServiceImpl implements TaskService { JSONObject point2 = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); taskObj.put("point2_region_name", point2.getString("region_name")); } + String point_code3 = taskObj.getString("point_code3"); + if (ObjectUtil.isNotEmpty(point_code3)) { + JSONObject point3 = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0); + taskObj.put("point3_region_name", point3.getString("region_name")); + } res.add(taskObj); } json.put("content", res); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java index a5fe607..6bab955 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java @@ -308,6 +308,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) +// 虽然是养生A区，应该有二次申请，但是通过判断叠盘架是否有任务来判断做限制 public String createTask(JSONObject form) { /* * 1.先生成确定终点的任务 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java index 4bdcb9d..f188912 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java @@ -167,6 +167,9 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { } } + /** + * 虽然是养生A区，应该有二次申请，但是通过判断叠盘架是否有任务来判断做限制 + */ @Override @Transactional(rollbackFor = Exception.class) public void findStartPoint() { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java index 6346282..6903cb1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java @@ -168,7 +168,6 @@ public class GjxSendMaterialTask extends AbstractAcsTask { JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='1'").uniqueResult(0); if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!"); taskObj.put("point_code2", firstRow.getString("point_code")); - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); taskObj.put("update_time", DateUtil.now()); //需要设置等待点 if (row_num > 2) { @@ -178,6 +177,10 @@ public class GjxSendMaterialTask extends AbstractAcsTask { //二楼普通任务 taskObj.put("acs_task_type", "2"); } + //把物料信（SKU）息更新到点位上 + JSONObject param = new JSONObject(); + param.put("material_id", taskObj.getString("material_id")); + pointTab.update(param, "block_num = '" + block_num + "' and row_num = '" + (row_num-1) + "' and col_num = '" + col_num + "'"); taskTab.update(taskObj); } else {//找空位入 @@ -196,7 +199,6 @@ public class GjxSendMaterialTask extends AbstractAcsTask { Integer col_num = json2.getInteger("col_num"); JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='1'").uniqueResult(0); taskObj.put("point_code2", firstRow.getString("point_code")); - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); //二楼终点追加任务 taskObj.put("acs_task_type", "4"); taskObj.put("update_time", DateUtil.now()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql index 7581b04..0e1fdc2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql @@ -44,22 +44,22 @@ IF 输入.flag = "1" QUERY SELECT - p.point_id, - p.point_code, - p.point_name, - p.block_num, - p.row_num, - p.col_num + p.point_id, + p.point_code, + p.point_name, + p.block_num, + p.row_num, + p.col_num FROM - ST_IVT_StructIvt ivt - LEFT JOIN SCH_BASE_Point p on ivt.point_id = p.point_id - WHERE - p.is_used = '1' + + SCH_BASE_Point p + where p.is_used = '1' AND is_delete = '0' - and lock_type='1' - and p.row_num>1 + AND lock_type = '1' + AND p.row_num >1 + and p.point_status='1' OPTION 输入.material_id <> "" - ivt.material_id = 输入.material_id + p.material_id = 输入.material_id ENDOPTION OPTION 输入.region_code <> "" p.region_code = 输入.region_code diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 855cacce10109e67b811472a8b808c2523c5c636..e55151dce31f214284e343d5b2f6d82c00941411 100644 GIT binary patch delta 24127 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 Kt*F;k82%r_U~3To delta 23501 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 L)K-6?t2X>U>EG;h diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml index 8d35511..d3cd31b 100644 --- a/lms/nladmin-system/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml @@ -6,8 +6,8 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - # url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true +# url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yongyu_lms2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} password: ${DB_PWD:P@ssw0rd} # password: ${DB_PWD:12356} diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index 0d37c08..075944e 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -113,11 +113,11 @@ @selection-change="crud.selectionChangeHandler" > - + - + @@ -127,6 +127,8 @@ + +