diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java index 0489c1180..6620aae75 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java @@ -68,4 +68,11 @@ public class ProductOutTwoController { return new ResponseEntity<>(productOutTwoService.confirmPass(whereJson), HttpStatus.OK); } + @PostMapping("/outPointPass") + @Log("avg取货点放行") + @SaIgnore + public ResponseEntity outPointPass(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(productOutTwoService.outPointPass(whereJson), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java index e398aa233..f0a2f472a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java @@ -65,4 +65,13 @@ public interface ProductOutTwoService { * @return JSONObject： 返回前端参数 */ JSONObject confirmPass(JSONObject whereJson); + + /** + * 捆扎点位放行 + * @param whereJson { + * point_code: 点位编码(CK2026/CK2027) + * } + * @return JSONObject： 返回前端参数 + */ + JSONObject outPointPass(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java index 56c9a11aa..bf95ca057 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java @@ -150,4 +150,21 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService { result.put("message", "成功放行!"); return result; } + + @Override + public JSONObject outPointPass(JSONObject whereJson) { + WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class); + JSONArray action_rows = new JSONArray(); + JSONObject action_jo = new JSONObject(); + action_jo.put("device_code", whereJson.getString("point_code")); + action_jo.put("code", "to_command"); + action_jo.put("product_area", "BLK"); + action_jo.put("value", "20"); + action_rows.add(action_jo); + wmsToAcsService.action(action_rows); + + JSONObject result = new JSONObject(); + result.put("message", "成功放行!"); + return result; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java index 4ad9bd0a0..6d0d85685 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java @@ -39,8 +39,8 @@ public class InBillQueryController { @GetMapping(value = "/query2") @Log("查询") - public ResponseEntity query2(@RequestParam Map whereJson, Pageable page, String[] product_area) { - return new ResponseEntity<>(inBillQueryService.queryAll2(whereJson, page, product_area), HttpStatus.OK); + public ResponseEntity query2(@RequestParam Map whereJson, Pageable page, String[] product_area, String[] stor_id) { + return new ResponseEntity<>(inBillQueryService.queryAll2(whereJson, page, product_area, stor_id), HttpStatus.OK); } @PostMapping @@ -77,7 +77,7 @@ public class InBillQueryController { @Log("导出数据2") @GetMapping(value = "/download2") - public void download2(@RequestParam Map map, HttpServletResponse response, String[] product_area) throws IOException { - inBillQueryService.download2(map, response, product_area); + public void download2(@RequestParam Map map, HttpServletResponse response, String[] product_area,String[] stor_id) throws IOException { + inBillQueryService.download2(map, response, product_area,stor_id); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java index cf8b69a6d..3e2169f64 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java @@ -25,7 +25,7 @@ public interface InBillQueryService { */ Map queryAll(Map whereJson, Pageable page, String[] product_area); - Map queryAll2(Map whereJson, Pageable page, String[] product_area); + Map queryAll2(Map whereJson, Pageable page, String[] product_area, String[] stor_id); /** * 查询所有数据不分页 @@ -58,5 +58,5 @@ public interface InBillQueryService { void download(Map map, HttpServletResponse response, String[] product_area) throws IOException; - void download2(Map map, HttpServletResponse response, String[] product_area) throws IOException; + void download2(Map map, HttpServletResponse response, String[] product_area,String[] stor_id) throws IOException; } \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 6721cf890..182dee0c3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -105,8 +105,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { } @Override - public Map queryAll2(Map whereJson, Pageable page, String[] product_area) { - String stor_id = MapUtil.getStr(whereJson, "stor_id"); + public Map queryAll2(Map whereJson, Pageable page, String[] product_area,String[] stor_id) { String bill_type = MapUtil.getStr(whereJson, "bill_type"); String with = MapUtil.getStr(whereJson, "with"); // 厚度*幅宽 String begin_time = MapUtil.getStr(whereJson, "begin_time"); @@ -125,7 +124,6 @@ public class InBillQueryServiceImpl implements InBillQueryService { } else { map.put("flag", "6"); } - map.put("stor_id", stor_id); map.put("bill_type", bill_type); map.put("with", with); map.put("pcsn", pcsn); @@ -166,6 +164,17 @@ public class InBillQueryServiceImpl implements InBillQueryService { } map.put("areas", areas); } + if (ObjectUtil.isNotEmpty(stor_id)) { + String storIds = "("; + for (int i = 0; i < stor_id.length; i++) { + if (i != stor_id.length - 1) { + storIds += "'" + stor_id[i] + "',"; + } else { + storIds += "'" + stor_id[i] + "')"; + } + } + map.put("storIds", storIds); + } JSONObject json = WQL.getWO("ST_IVT_INBILLQUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.confirm_time DESC,dis.box_no"); return json; } @@ -355,8 +364,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { } @Override - public void download2(Map map, HttpServletResponse response, String[] product_area) throws IOException { - String stor_id = MapUtil.getStr(map, "stor_id"); + public void download2(Map map, HttpServletResponse response, String[] product_area,String[] stor_id) throws IOException { String bill_type = MapUtil.getStr(map, "bill_type"); String with = MapUtil.getStr(map, "with"); // 厚度*幅宽 String begin_time = MapUtil.getStr(map, "begin_time"); @@ -375,7 +383,6 @@ public class InBillQueryServiceImpl implements InBillQueryService { } else { mapParam.put("flag", "6"); } - mapParam.put("stor_id", stor_id); mapParam.put("bill_type", bill_type); mapParam.put("with", with); mapParam.put("pcsn", pcsn); @@ -416,6 +423,18 @@ public class InBillQueryServiceImpl implements InBillQueryService { mapParam.put("areas", areas); } + if (ObjectUtil.isNotEmpty(stor_id)) { + String storIds = "("; + for (int i = 0; i < stor_id.length; i++) { + if (i != stor_id.length - 1) { + storIds += "'" + stor_id[i] + "',"; + } else { + storIds += "'" + stor_id[i] + "')"; + } + } + mapParam.put("storIds", storIds); + } + JSONArray resultJSONArray = WQL.getWO("ST_IVT_INBILLQUERY").addParamMap(mapParam).process().getResultJSONArray(0); List> list = new ArrayList<>(); if ("0".equals(is_all)) { @@ -434,6 +453,25 @@ public class InBillQueryServiceImpl implements InBillQueryService { mp.put("销售订单", json.getString("sale_order_name")); mp.put("行号", ""); } + // 业务类型 + String bill_type1 = json.getString("bill_type"); + if (bill_type1.equals("0001")) { + mp.put("业务类型", "生产入库"); + } else if (bill_type1.equals("0002")) { + mp.put("业务类型", "退货入库"); + } else if (bill_type1.equals("0003")) { + mp.put("业务类型", "报废入库"); + } else if (bill_type1.equals("0004")) { + mp.put("业务类型", "调拨入库"); + }else if (bill_type1.equals("0005")) { + mp.put("业务类型", "拆箱入库"); + } else if (bill_type1.equals("0006")) { + mp.put("业务类型", "返检入库"); + }else if (bill_type1.equals("0007")) { + mp.put("业务类型", "改切入库"); + }else if (bill_type1.equals("0009")) { + mp.put("业务类型", "手工入库"); + } mp.put("客户编码", json.getString("customer_name")); mp.put("客户名称", json.getString("cust_name")); mp.put("业务员", json.getString("sales_owner")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql index d78b06d11..c85cfb7d5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql @@ -26,6 +26,7 @@ 输入.thickness_request TYPEAS s_string 输入.sap_pcsn TYPEAS s_string 输入.areas TYPEAS f_string + 输入.storIds TYPEAS f_string [临时表] @@ -767,8 +768,8 @@ AND mst.is_delete = '0' AND mst.bill_status = '99' - OPTION 输入.stor_id <> "" - mst.stor_id = 输入.stor_id + OPTION 输入.storIds <> "" + mst.stor_id in 输入.storIds ENDOPTION OPTION 输入.is_virtual = "0" @@ -905,8 +906,8 @@ AND mst.is_delete = '0' AND mst.bill_status = '99' - OPTION 输入.stor_id <> "" - mst.stor_id = 输入.stor_id + OPTION 输入.storIds <> "" + mst.stor_id = 输入.storIds ENDOPTION OPTION 输入.is_virtual = "0" diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue index 661855511..41936bad5 100644 --- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue +++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue @@ -15,10 +15,11 @@