From bb6fc64d15964524a66acd91dc00198bc4a52d90 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 25 Aug 2023 15:44:14 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=88=86=E9=85=8D=E6=8C=89=E9=92=AE=E3=80=81?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=A3=9E=E4=B9=A6BUG=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=81=E5=BA=9F=E7=AE=94=E4=B8=8B=E5=8D=B7=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E4=B8=BA=E7=82=B9=E4=BD=8D+=E5=BA=9F=E7=AE=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 4 + .../pda/mps/service/impl/OutServiceImpl.java | 8 +- .../org/nl/wms/sch/manage/AutoSendFeiShu.java | 2 +- .../org/nl/wms/sch/tasks/CutTrussTask.java | 4 +- .../inbill/rest/RawAssistIStorController.java | 9 + .../inbill/service/RawAssistIStorService.java | 2 + .../impl/RawAssistIStorServiceImpl.java | 41 ++- .../src/views/wms/st/inbill/DivDialog.vue | 274 +++++------------- .../src/views/wms/st/inbill/index.vue | 3 +- .../src/views/wms/st/inbill/rawassist.js | 28 +- 10 files changed, 142 insertions(+), 233 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index f65d814dc..b7d3c9f63 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -863,6 +863,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { map.put("error", whereJson.getString("error")); map.put("error_msg", whereJson.getString("error_msg")); map.put("error_update_time", DateUtil.now()); + if (whereJson.getString("error").equals("0")){ + map.put("is_upload", "0"); + map.put("upload_time", DateUtil.now()); + } } wo.update(map, "device_code = '" + device_code + "'"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java index 3394d2c81..ed216eaa6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java @@ -239,7 +239,13 @@ public class OutServiceImpl implements OutService { if (StrUtil.isEmpty(empty_vehicle.getString("vehicle_code"))){ throw new BadRequestException("点位："+empty_vehicle.getString("point_code")+"载具号为空！"); } - jo.put("vehicle_code", "waste foil"); + jo.put("vehicle_code", point_code+"废箔"); + if (jo.getString("vehicle_code").contains("废箔")){ + System.out.println("YES-------"); + } + if (!jo.getString("vehicle_code").contains("废箔")){ + System.out.println("NO-------"); + } jo.put("product_area", cut_ivt.getString("product_area")); //分切>输送线 子卷出站 jo.put("task_type", "010404"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java index 6d08fef08..898ba3de3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java @@ -30,7 +30,7 @@ public class AutoSendFeiShu { WQLObject wo = WQLObject.getWQLObject("em_bi_devicestatus"); //查询故障了还未发送的 - JSONArray send_rows = wo.query("error > '0' AND is_upload = '0' AND upload_flag = '1'").getResultJSONArray(0); + JSONArray send_rows = wo.query("error > '0' AND IFNULL(is_upload,'0') = '0' AND upload_flag = '1'").getResultJSONArray(0); this.sendInfo(send_rows); //查询已经发送了但是还是故障中的 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java index 507ba1aca..7449621ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java @@ -126,7 +126,7 @@ public class CutTrussTask extends AbstractAcsTask { //分切>输送线 子卷出站 if (jsonTask.getString("task_type").equals("010404")) { - if (!jsonTask.getString("vehicle_code").equals("waste foil")) { + if (!jsonTask.getString("vehicle_code").contains("废箔")) { //更新出站气涨轴的分切计划状态 JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '06'").getResultJSONArray(0); if (ObjectUtil.isEmpty(plan_jo2)) { @@ -443,7 +443,7 @@ public class CutTrussTask extends AbstractAcsTask { } //分切>输送线 子卷出站 - if (form.getString("task_type").equals("010404") && !json.getString("vehicle_code").equals("waste foil")) { + if (form.getString("task_type").equals("010404") && !json.getString("vehicle_code").contains("废箔")) { //更新出站气涨轴的分切计划状态 JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0); if (ObjectUtil.isEmpty(plan_jo2)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java index 7341d68b1..86e359054 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java @@ -103,6 +103,15 @@ public class RawAssistIStorController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @PostMapping("/allDivStruct") + @Log("全部分配货位") + @ApiOperation("全部分配货位") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity allDivStruct(@RequestBody JSONObject whereJson) { + rawAssistIStorService.allDivStruct(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/unDivStruct") @Log("取消分配货位") @ApiOperation("取消分配货位") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java index 996f51c6a..72f1ccfb6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java @@ -34,6 +34,8 @@ public interface RawAssistIStorService { void divStruct(Map whereJson); + void allDivStruct(JSONObject form); + void unDivStruct(Map whereJson); void divPoint(Map whereJson); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index 72f62961a..4c78fb19a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -38,10 +38,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; +import java.util.*; /** * PC端出入库新增 @@ -648,6 +645,42 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { } } + @Override + @Transactional + public void allDivStruct(JSONObject form) { + String iostorinv_id = form.getString("iostorinv_id"); + String sect_id = form.getString("sect_id"); + + JSONObject sect_jo = WQLObject.getWQLObject("st_ivt_sectattr").query("sect_id = '"+sect_id+"'").uniqueResult(0); + if (!sect_jo.getString("sect_type_attr").equals("09")){ + throw new BadRequestException("只能对虚拟区的库区进行全部分配！"); + } + //查询当前入库单状态为生成的入库单明细 + JSONArray dis_rows =WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' AND work_status = '00'").getResultJSONArray(0); + HashSet vehicle_set = new HashSet<>(); + for (int j = 0; j < dis_rows.size(); j++) { + JSONObject dtl_row = dis_rows.getJSONObject(j); + vehicle_set.add(dtl_row.getString("box_no")); + } + for (String vehicle_code : vehicle_set) { + HashMap map = new HashMap<>(); + map.put("flag", "4"); + map.put("iostorinv_id", iostorinv_id); + map.put("package_box_sn", vehicle_code); + JSONArray dtl_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).process().getResultJSONArray(0); + List list = new ArrayList<>(); + for (int i = 0; i < dtl_rows.size(); i++) { + JSONObject jo = dtl_rows.getJSONObject(i); + list.add(JSON.parseObject(jo.toString(),Map.class)); + } + Map dis_map = new HashMap<>(); + dis_map.put("tableMater",list); + dis_map.put("sect_id",sect_id); + dis_map.put("checked",true); + this.divStruct(dis_map); + } + } + @Transactional(rollbackFor = Exception.class) @Override public void unDivStruct(Map jo) { diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue index 1cf5556d5..099b86c14 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue @@ -14,7 +14,18 @@ 入库分配 - + + + 全部分配 + + 关闭 @@ -51,49 +62,25 @@ - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + +