From 507bc47a7cbc22a1929ba8dfa602f8b030e5476a Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Wed, 26 Oct 2022 19:25:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/sch/tasks/InTask.java | 2 +- .../service/impl/InbillServiceImpl.java | 50 ------------------- .../impl/RawAssistIStorServiceImpl.java | 42 ++++++---------- .../service/impl/StorPublicServiceImpl.java | 1 + 4 files changed, 17 insertions(+), 78 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java index 3cf3c577c..33e2bcafd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java @@ -52,7 +52,7 @@ public class InTask extends AbstractAcsTask { map.put("update_optid",currentUserId); map.put("update_optname",nickName); map.put("update_time",now); - WQLObject.getWQLObject("SCH_BASE_Task").update(map,"taskdtl_id = '"+taskObj.getString("taskdtl_id")+"'"); + WQLObject.getWQLObject("SCH_BASE_Task").update(map,"task_id = '"+taskObj.getString("task_id")+"'"); } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java index 034630ea1..aa3385d71 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java @@ -87,8 +87,6 @@ public class InbillServiceImpl { case "2": //解锁终点,绑定载具 String vehicle_code = form.getString("vehicle_code"); - String storagevehicle_id = form.getString("storagevehicle_id"); - String storagevehicle_type = form.getString("storagevehicle_type"); map.put("lock_type", "00"); map.put("point_status", "02"); map.put("vehicle_code", vehicle_code); @@ -100,10 +98,8 @@ public class InbillServiceImpl { map.put("inv_code", ""); point_table.update(map, "point_code = '" + end_point + "'"); HashMap struct_map = new HashMap<>(); - struct_map.put("storagevehicle_id", storagevehicle_id); struct_map.put("lock_type", "00"); struct_map.put("storagevehicle_code", vehicle_code); - struct_map.put("storagevehicle_type", storagevehicle_type); struct_map.put("taskdtl_type", ""); struct_map.put("taskdtl_id", ""); struct_map.put("task_code", ""); @@ -119,7 +115,6 @@ public class InbillServiceImpl { public void confirmDis(JSONObject form) { WQLObject dis_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); WQLObject dtl_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); - WQLObject pcs_if_purchaseorderproc = WQLObject.getWQLObject("pcs_if_purchaseorderproc"); String task_id = form.getString("task_id"); if (StrUtil.isEmpty(task_id)) { @@ -146,18 +141,6 @@ public class InbillServiceImpl { dtl_row.put("real_qty", real_qty); dtl_table.update(dtl_row); - //判断是否为软废采购入库，修改采购入库单 - JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_row.getString("iostorinv_id") + "'").uniqueResult(0); - if (mst_jo.getString("bill_type").equals("000202")) { - String bill_id = dtl_row.getString("base_billdtl_id"); - JSONArray bill_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("base_billdtl_id = '" + bill_id + "' AND bill_status < '99'").getResultJSONArray(0); - if (bill_rows.size() == 0) { - HashMap bill_map = new HashMap<>(); - bill_map.put("proc_status", "09"); - pcs_if_purchaseorderproc.update(bill_map, "id = '" + bill_id + "'"); - } - } - //判断主表是否改为完成 JSONArray dtl_rows = dtl_table.query("iostorinv_id = '" + dtl_row.getString("iostorinv_id") + "' AND bill_status < '99'").getResultJSONArray(0); if (dtl_rows.size() == 0) { @@ -171,11 +154,6 @@ public class InbillServiceImpl { public void confirmMst(JSONObject from) { WQLObject dtl_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); WQLObject dis_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); - WQLObject bucket_table = WQLObject.getWQLObject("md_pb_bucketrecord"); - WQLObject reMstTab = WQLObject.getWQLObject("PCS_RC_ReceiveMst"); //到货通知单主表 - WQLObject reDtlTab = WQLObject.getWQLObject("PCS_RC_ReceiveDtl"); //到货通知单明细表 - WQLObject procTab = WQLObject.getWQLObject("PCS_IF_PurchaseOrderProc"); //采购订单接口处理表 - WQLObject dtlTab = WQLObject.getWQLObject("QL_TEST_InspectionSheetDtl"); //质检单明细表 String iostorinv_id = from.getString("iostorinv_id"); Long currentUserId = SecurityUtils.getCurrentUserId(); @@ -184,7 +162,6 @@ public class InbillServiceImpl { JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); - String bill_type = mst_jo.getString("bill_type"); //查询 JSONArray dtl_rows = dtl_table.query("iostorinv_id = '" + iostorinv_id + "' AND bill_status < '99'").getResultJSONArray(0); @@ -222,13 +199,6 @@ public class InbillServiceImpl { i_form.put("qty_unit_name", dis_row.getString("qty_unit_name")); storPublicService.IOStor(i_form, "33"); - //更新桶记录表 - HashMap bucket_map = new HashMap(); - bucket_map.put("status", "03"); - bucket_map.put("instor_optid", currentUserId); - bucket_map.put("instor_optname", nickName); - bucket_map.put("instor_time", now); - bucket_table.update(bucket_map, "storagevehicle_code = '" + dis_row.getString("storagevehicle_code") + "' AND status = '02'"); //如果单据为原辅料入库，且为寄样合格，回写到货通知单 @@ -237,26 +207,6 @@ public class InbillServiceImpl { mst_jo.put("confirm_optid", currentUserId); mst_jo.put("confirm_optname", nickName); mst_jo.put("confirm_time", now); - if("000101".equals(bill_type)){ - //查询 - dtl_rows = dtl_table.query("iostorinv_id = '" + iostorinv_id + "' AND bill_status = '99'").getResultJSONArray(0); - - for(int i=0; i 0) { - throw new BadRequestException("存在未完成的作业，或存在组盘记录！"); - } - - //将明细全部变为99 - HashMap map = new HashMap(); - map.put("bill_status", "99"); - dtl_wql.update(map, "iostorinv_id = '" + whereJson.get("iostorinv_id") + "' AND bill_status < '99'").getResultJSONArray(0); - - //完成单据 - inbillService.confirmMst(JSONObject.parseObject(JSON.toJSONString(whereJson))); + JSONObject task_jo = JSONObject.parseObject(JSON.toJSONString(taskDto)); + AbstractAcsTask task = new InTask(); + task.updateTaskStatus(task_jo, "2"); } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java index 9d3579444..f79e8a090 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java @@ -418,6 +418,7 @@ public class StorPublicServiceImpl implements StorPublicService { } jo_in.put("stor_code", jo.getString("stor_code")); jo_in.put("stor_id", jo.getString("stor_id")); + jo_in.put("stor_name", jo.getString("stor_name")); this.createStructIvtFlow(jo_in); } }