From 3241bdd8168b478f9c3f1bac462579727654f21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Fri, 25 Apr 2025 11:09:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B3=A8=E9=87=8A=E6=8B=86=E6=9D=A1?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/service/Impl/InvoiceServiceImpl.java | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java index 585e938..b7c18de 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java @@ -390,65 +390,65 @@ public class InvoiceServiceImpl implements InvoiceService { //MES需要接收，则只抛送数据。 或如果是现场仓,先移到现场仓 if(src.size()>0 || !ERPRECEIVELOCATION.isEmpty()) { -// 查询MATERIALQUANTITY 与 MATERIALQUANTITY2是否相等，如果相等则未修改数量，不相等则修改数量 -// 如果已修改数量，则进行拆单 - for (int z = 0; z < packingQueryForList.size(); z++) { - String MATERIALPACKINGNAME = packingQueryForList.get(z).get("MATERIALPACKINGNAME").toString(); - Object[] bindSet = {MATERIALPACKINGNAME}; - String qtysql = "WHERE MATERIALPACKINGNAME = ?"; - List qtyQueryForList = MaterialPackingServiceProxy.getMaterialPackingService().select(qtysql, bindSet); - - String qty = String.valueOf(qtyQueryForList.get(z).getMaterialQuantity()); - - String qty2 = new Double(qtyQueryForList.get(z).getMaterialQuantity2()) == null ? "0" : String.valueOf(qtyQueryForList.get(z).getMaterialQuantity2()); - String materialPackingName = qtyQueryForList.get(z).getMaterialPackingName(); - String charge = qtyQueryForList.get(z).getCharge(); - BigDecimal bigQty = new BigDecimal(qty); - // 已拆数量 - BigDecimal bigQty2 = new BigDecimal(qty2); - - // 如果已拆数量不等于原数量，并且已拆数量为0(未拆分数量) - if(bigQty.compareTo(bigQty2) != 0 && !"0".equals(qty2)) { - // 剩余数量 - BigDecimal restQty = bigQty.subtract(bigQty2); - // 生成新的拆分条码 - String stringBigQty2 = bigQty2.toString(); - String newPalletNo = CodeGenerator.packingGenerateCode(materialPackingName,stringBigQty2,charge); - - // 写入拆分的新条码，更新原数据库 - List boxList = new ArrayList(); -// MaterialPackingKey materialpackingKey = new MaterialPackingKey(); - MaterialPacking materialpacking = new MaterialPacking(); -// materialpackingKey.setSiteName("SDK"); -// materialpackingKey.setMaterialPackingName(newPalletNo); -// materialpacking.setKey(materialpackingKey); - - // 复制一个当前的原标签数据 - MaterialPacking materialpackingNew = qtyQueryForList.get(z); - // 设置新为标签和数量 - materialpackingNew.setMaterialPackingName(newPalletNo); - // bigQty2 转double类型 - materialpackingNew.setMaterialQuantity(bigQty2.doubleValue()); - boxList.add(qtyQueryForList.get(z)); - boxList.add(materialpackingNew); - boolean moveTransformOut = chargeSplitService.packingChargeSplit(boxList, eventUser); - if (moveTransformOut != true) { - throw new RuntimeException("修改数量拆分失败"); - } - - // 原条码扣减 - SetEventInfo setEventInfo = new SetEventInfo(); - Map pakHashMap = new HashMap<>(); - pakHashMap.put("materialQuantity", restQty.doubleValue()); - - EventInfo eventInfo = new EventInfoUtil().makeEventInfo("修改数量拆分条码", eventUser, "修改数量拆分条码"); - setEventInfo.setUserColumns(pakHashMap); - MaterialPackingServiceProxy.getMaterialPackingService().setEvent(new MaterialPackingKey( queryForList.get(z).get("SITENAME").toString(), - queryForList.get(z).get("MATERIALPACKINGNAME").toString()), eventInfo, setEventInfo); - - } - - } +// 拆条码，查询MATERIALQUANTITY 与 MATERIALQUANTITY2是否相等，如果相等则未修改了数量，不相等则修改了数量 +// 如果已修改数量，则进行拆条码 +// for (int z = 0; z < packingQueryForList.size(); z++) { +// String MATERIALPACKINGNAME = packingQueryForList.get(z).get("MATERIALPACKINGNAME").toString(); +// Object[] bindSet = {MATERIALPACKINGNAME}; +// String qtysql = "WHERE MATERIALPACKINGNAME = ?"; +// List qtyQueryForList = MaterialPackingServiceProxy.getMaterialPackingService().select(qtysql, bindSet); +// +// String qty = String.valueOf(qtyQueryForList.get(z).getMaterialQuantity()); +// +// String qty2 = new Double(qtyQueryForList.get(z).getMaterialQuantity2()) == null ? "0" : String.valueOf(qtyQueryForList.get(z).getMaterialQuantity2()); +// String materialPackingName = qtyQueryForList.get(z).getMaterialPackingName(); +// String charge = qtyQueryForList.get(z).getCharge(); +// BigDecimal bigQty = new BigDecimal(qty); +// // 已拆数量 +// BigDecimal bigQty2 = new BigDecimal(qty2); +// +// // 如果已拆数量不等于原数量，并且已拆数量为0(未拆分数量) +// if(bigQty.compareTo(bigQty2) != 0 && !"0".equals(qty2)) { +// // 剩余数量 +// BigDecimal restQty = bigQty.subtract(bigQty2); +// // 生成新的拆分条码 +// String stringBigQty2 = bigQty2.toString(); +// String newPalletNo = CodeGenerator.packingGenerateCode(materialPackingName,stringBigQty2,charge); +// +// // 写入拆分的新条码，更新原数据库 +// List boxList = new ArrayList(); +//// MaterialPackingKey materialpackingKey = new MaterialPackingKey(); +// MaterialPacking materialpacking = new MaterialPacking(); +//// materialpackingKey.setSiteName("SDK"); +//// materialpackingKey.setMaterialPackingName(newPalletNo); +//// materialpacking.setKey(materialpackingKey); +// +// // 复制一个当前的原标签数据 +// MaterialPacking materialpackingNew = qtyQueryForList.get(z); +// // 设置新为标签和数量 +// materialpackingNew.setMaterialPackingName(newPalletNo); +// // bigQty2 转double类型 +// materialpackingNew.setMaterialQuantity(bigQty2.doubleValue()); +// boxList.add(qtyQueryForList.get(z)); +// boxList.add(materialpackingNew); +// boolean moveTransformOut = packingChargeSplit(boxList, eventUser); +// if (moveTransformOut != true) { +// throw new RuntimeException("修改数量拆分失败"); +// } +// +// // 原条码扣减 +// SetEventInfo setEventInfo = new SetEventInfo(); +// Map pakHashMap = new HashMap<>(); +// pakHashMap.put("materialQuantity", restQty.doubleValue()); +// +// EventInfo eventInfo = new EventInfoUtil().makeEventInfo("修改数量拆分条码", eventUser, "修改数量拆分条码"); +// setEventInfo.setUserColumns(pakHashMap); +// MaterialPackingServiceProxy.getMaterialPackingService().setEvent(new MaterialPackingKey( queryForList.get(z).get("SITENAME").toString(), +// queryForList.get(z).get("MATERIALPACKINGNAME").toString()), eventInfo, setEventInfo); +// +// } +// +// } //new MESServiceImpl().NeedReceiveMaterialInfoSend_NEW(shipRequestName, "SDK", materialPackingKeyList);