diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java index 354a047ca..f4290540a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java @@ -48,7 +48,7 @@ public class ProductInstorServiceImpl implements ProductInstorService { @Override public JSONObject boxQuery(JSONObject whereJson) { String box_no = whereJson.getString("box_no"); - //1-报废入库;2-生产入库;3-退货入库 + //1-报废入库;2-生产入库;3-退货入库; 4 - 拆分入库 String option = whereJson.getString("option"); JSONArray rows = new JSONArray(); @@ -69,6 +69,11 @@ public class ProductInstorServiceImpl implements ProductInstorService { //查询状态为生成的子卷包装关系对应表 rows = WQL.getWO("PDA_ST_01").addParamMap(map).process().getResultJSONArray(0); } + if (option.equals("4")) { + map.put("flag", "8"); + //查询状态为生成的子卷包装关系对应表 + rows = WQL.getWO("PDA_ST_01").addParamMap(map).process().getResultJSONArray(0); + } JSONObject jo = new JSONObject(); jo.put("data", rows); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql index 27d20d1e9..23859b627 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql @@ -149,6 +149,31 @@ ENDQUERY ENDIF + IF 输入.flag = "8" + QUERY + SELECT + sub.package_box_SN, + sub.container_name, + sub.product_name, + sub.product_description, + sub.net_weight + FROM + st_ivt_iostorinvdis dis + LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_SN = dis.box_no AND sub.container_name = dis.pcsn + LEFT JOIN sch_base_task task ON task.vehicle_code = dis.storagevehicle_code + WHERE + mst.bill_type = '1005' + AND sub.STATUS = '0' + AND mst.is_delete = '0' + AND mst.bill_status = '99' + AND dis.work_status = '99' + AND task.task_id IS NULL + AND sub.package_box_SN = 输入.box_no + ENDSELECT + ENDQUERY + ENDIF + IF 输入.flag = "5" QUERY SELECT 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 b9a8c489a..b8fb5e38c 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 @@ -56,6 +56,7 @@ WHEN '1002' THEN '报废出库' WHEN '1003' THEN '改切出库' WHEN '1004' THEN '调拨出库' + WHEN '1005' THEN '拆分出库' WHEN '1009' THEN '手工出库' END ) AS bill_type_name, diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index e9144ea41..ae9845394 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -214,6 +214,11 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jo_mst.put("is_upload", "1"); } } + + // 拆分入库 + if (StrUtil.equals(bill_type, "1005")) { + + } } } } @@ -756,6 +761,12 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst); } + // 拆分入库 + if (StrUtil.equals(bill_type, "1005")) { + + } + + } }