From c99745bcf67220a362c1d8890e7c21d388a92a0f Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 31 Oct 2022 20:41:22 +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 --- .../src/main/java/org/nl/start/Init.java | 21 ++++++++++++------- .../wms/pda/st/rest/VirtualOutController.java | 4 ++-- .../service/impl/VirtualOutServiceImpl.java | 2 +- .../org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql | 15 +++++++++++++ .../service/impl/CheckOutBillServiceImpl.java | 4 ++++ .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 4 ++-- .../src/views/wms/st/outbill/AddDialog.vue | 1 + 7 files changed, 39 insertions(+), 12 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/start/Init.java b/lms/nladmin-system/src/main/java/org/nl/start/Init.java index 2125fb689..52fded750 100644 --- a/lms/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/lms/nladmin-system/src/main/java/org/nl/start/Init.java @@ -20,22 +20,29 @@ import org.springframework.stereotype.Component; public class Init implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { -// WQLObject tab = WQLObject.getWQLObject("ST_IVT_StructAttr"); + /*WQLObject tab = WQLObject.getWQLObject("ST_IVT_StructAttr"); - /*String now = DateUtil.now(); - for (int i = 0; i < 10000; i++) { + String now = DateUtil.now(); + for (int i = 1; i < 10000; i++) { JSONObject json = new JSONObject(); json.put("struct_id", IdUtil.getSnowflake(1,1).nextId()); - if (i > 10) { - json.put("struct_code", "01-"+"0"+i+"-01"); + if (i < 10) { + json.put("struct_code", "01-"+"000"+i+"-01"); + json.put("struct_name", "01排"+"000"+i+"列-01层"); + }else if (i >= 10 && i < 100) { + json.put("struct_code", "01-"+"00"+i+"-01"); + json.put("struct_name", "01排"+"00"+i+"列-01层"); + }else if (i >= 100 && i < 1000) { + json.put("struct_code", "01-"+"0"+i+"-01"); + json.put("struct_name", "01排"+"0"+i+"列-01层"); } else { json.put("struct_code", "01-"+i+"-01"); + json.put("struct_name", "01排"+i+"列-01层"); } - json.put("struct_name", "1排"+i+"列"); - json.put("simple_name", "1排"+i+"列"); + json.put("simple_name", json.getString("struct_name")); json.put("sect_id", "1586913215886004224"); json.put("sect_code", "XN01"); json.put("sect_name", "虚拟区"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java index e3136e26b..7352dce2f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/VirtualOutController.java @@ -30,7 +30,7 @@ public class VirtualOutController { private final VirtualOutService virtualOutService; - @PostMapping("/ivtQuery") + @PostMapping("/billQuery") @Log("出库初始化查询") @ApiOperation("出库初始化查询") public ResponseEntity ivtQuery(@RequestBody JSONObject whereJson){ @@ -44,7 +44,7 @@ public class VirtualOutController { return new ResponseEntity<>(virtualOutService.billType(whereJson),HttpStatus.OK); } - @PostMapping("/ivtDisQuery") + @PostMapping("/ivtQuery") @Log("分配明细查询") @ApiOperation("分配明细查询") public ResponseEntity ivtDisQuery(@RequestBody JSONObject whereJson){ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java index a44b87759..3f8697c84 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java @@ -46,7 +46,7 @@ public class VirtualOutServiceImpl implements VirtualOutService { @Override public JSONObject billType(JSONObject whereJson) { - JSONArray resultJSONArray = WQLObject.getWQLObject("sys_dict_detail").query("name = 'ST_INV_OUT_TYPE'").getResultJSONArray(0); + JSONArray resultJSONArray = WQL.getWO("PDA_VIRTUALOUT").addParam("flag", "3").process().getResultJSONArray(0); JSONObject jo = new JSONObject(); jo.put("rows", resultJSONArray); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql index 19421ac6e..d8d2b1a06 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql @@ -17,6 +17,7 @@ 输入.bill_code TYPEAS s_string 输入.bill_type TYPEAS s_string 输入.material_code TYPEAS s_string + 输入.box_no TYPEAS s_string [临时表] @@ -129,6 +130,20 @@ mater.material_code = 输入.material_code ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "3" + QUERY + SELECT + label, + value + FROM + sys_dict_detail + WHERE + name = 'ST_INV_OUT_TYPE' + ENDSELECT ENDQUERY ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index a647dd9ef..26b96fd8a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -393,6 +393,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { dtl.put("struct_code", ivt.getString("struct_code")); dtl.put("struct_name", ivt.getString("struct_name")); dtl.put("pcsn", ivt.getString("pcsn")); + dtl.put("box_no", ivt.getString("storagevehicle_code")); dtl.put("storagevehicle_id", ivt.getString("storagevehicle_id")); dtl.put("storagevehicle_code", ivt.getString("storagevehicle_code")); dtl.put("storagevehicle_type", ivt.getString("storagevehicle_type")); @@ -752,6 +753,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { dtl.put("struct_code", ivt.getString("struct_code")); dtl.put("struct_name", ivt.getString("struct_name")); dtl.put("pcsn", ivt.getString("pcsn")); + dtl.put("box_no", ivt.getString("storagevehicle_code")); dtl.put("storagevehicle_id", ivt.getString("storagevehicle_id")); dtl.put("storagevehicle_code", ivt.getString("storagevehicle_code")); dtl.put("storagevehicle_type", ivt.getString("storagevehicle_type")); @@ -899,6 +901,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject from_start = new JSONObject(); from_start.put("struct_id", dis.getString("struct_id")); from_start.put("lock_type", "1"); + from_start.put("storagevehicle_code", ""); +// from_start.put("vehicle_code", ""); if ("02".equals(dis.getString("taskdtl_type"))) { from_start.put("is_free", "1"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index fb0fdfc8d..9d9bae232 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -160,7 +160,7 @@ LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id WHERE - 1 = 1 and struct.lock_type='01' + 1 = 1 and struct.lock_type='1' and struct.struct_id in ( SELECT dis.struct_id @@ -217,7 +217,7 @@ LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt2.material_id LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id WHERE - 1 = 1 and struct.lock_type='00' + 1 = 1 and struct.lock_type='1' OPTION 输入.material_id <> "" ivt2.material_id = 输入.material_id ENDOPTION diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue index 8a936fb9c..08e2ff53e 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue @@ -151,6 +151,7 @@ +