From a4399e74a4fbef78093a853ccbf583780ae13abf Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 30 Oct 2025 10:55:05 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E5=8E=9F=E6=9D=90=E6=96=99=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=AE=9A=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/core/service/impl/InbillServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java index 592483d9..adbf9397 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java @@ -282,12 +282,27 @@ public class InbillServiceImpl { i_form.put("qty_unit_name", dis_row.getString("qty_unit_name")); storPublicService.IOStor(i_form, "33"); + // 判断此入库单是否有完成的理化单据 + JSONObject jsonPhy = WQLObject.getWQLObject("ql_test_physicalmst") + .query("material_id = '" + dis_row.getString("material_id") + "' AND pcsn = '" + dis_row.getString("pcsn") + "' AND bill_status = '99' AND is_effective = '1'") + .uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonPhy) && bill_type.equals("000101")) { + dis_row.put("ivt_level",jsonPhy.getString("grade")); + JSONObject ivtJson = new JSONObject(); + ivtJson.put("ivt_level",jsonPhy.getString("grade")); + ivtTab.update(ivtJson, "struct_id = '"+dis_row.getString("struct_id")+"' AND material_id = '"+dis_row.getString("material_id")+"' AND pcsn = '"+dis_row.getString("pcsn")+"'"); + } + //更新桶记录表 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); + if (ObjectUtil.isNotEmpty(jsonPhy) && bill_type.equals("000101")) { + bucket_map.put("ivt_level", jsonPhy.getString("grade")); + } + bucket_table.update(bucket_map, "storagevehicle_code = '" + dis_row.getString("storagevehicle_code") + "' AND status = '02'"); //如果单据为原辅料入库，且为寄样合格，回写到货通知单