10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix:注释拆条码

Browse Source
This commit is contained in:
郭飞 2025-04-25 11:09:09 +08:00
parent df8d35f4c5
commit 3241bdd816
1 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
View File

@ -390,65 +390,65 @@ public class InvoiceServiceImpl implements InvoiceService {
//MES需要接收，则只抛送数据。 或如果是现场仓,先移到现场仓 //MES需要接收，则只抛送数据。 或如果是现场仓,先移到现场仓
if(src.size()>0 || !ERPRECEIVELOCATION.isEmpty()) { if(src.size()>0 || !ERPRECEIVELOCATION.isEmpty()) {
// 查询MATERIALQUANTITY 与 MATERIALQUANTITY2是否相等，如果相等则未修改数量，不相等则修改数量 // 拆条码，查询MATERIALQUANTITY 与 MATERIALQUANTITY2是否相等，如果相等则未修改了数量，不相等则修改了数量
// 如果已修改数量，则进行拆单 // 如果已修改数量，则进行拆条码
for (int z = 0; z < packingQueryForList.size(); z++) { // for (int z = 0; z < packingQueryForList.size(); z++) {
String MATERIALPACKINGNAME = packingQueryForList.get(z).get("MATERIALPACKINGNAME").toString(); // String MATERIALPACKINGNAME = packingQueryForList.get(z).get("MATERIALPACKINGNAME").toString();
Object[] bindSet = {MATERIALPACKINGNAME}; // Object[] bindSet = {MATERIALPACKINGNAME};
String qtysql = "WHERE MATERIALPACKINGNAME = ?"; // String qtysql = "WHERE MATERIALPACKINGNAME = ?";
List<MaterialPacking> qtyQueryForList = MaterialPackingServiceProxy.getMaterialPackingService().select(qtysql, bindSet); // List<MaterialPacking> qtyQueryForList = MaterialPackingServiceProxy.getMaterialPackingService().select(qtysql, bindSet);
//
String qty = String.valueOf(qtyQueryForList.get(z).getMaterialQuantity()); // 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 qty2 = new Double(qtyQueryForList.get(z).getMaterialQuantity2()) == null ? "0" : String.valueOf(qtyQueryForList.get(z).getMaterialQuantity2());
String materialPackingName = qtyQueryForList.get(z).getMaterialPackingName(); // String materialPackingName = qtyQueryForList.get(z).getMaterialPackingName();
String charge = qtyQueryForList.get(z).getCharge(); // String charge = qtyQueryForList.get(z).getCharge();
BigDecimal bigQty = new BigDecimal(qty); // BigDecimal bigQty = new BigDecimal(qty);
// 已拆数量 // // 已拆数量
BigDecimal bigQty2 = new BigDecimal(qty2); // BigDecimal bigQty2 = new BigDecimal(qty2);
//
// 如果已拆数量不等于原数量，并且已拆数量为0(未拆分数量) // // 如果已拆数量不等于原数量，并且已拆数量为0(未拆分数量)
if(bigQty.compareTo(bigQty2) != 0 && !"0".equals(qty2)) { // if(bigQty.compareTo(bigQty2) != 0 && !"0".equals(qty2)) {
// 剩余数量 // // 剩余数量
BigDecimal restQty = bigQty.subtract(bigQty2); // BigDecimal restQty = bigQty.subtract(bigQty2);
// 生成新的拆分条码 // // 生成新的拆分条码
String stringBigQty2 = bigQty2.toString(); // String stringBigQty2 = bigQty2.toString();
String newPalletNo = CodeGenerator.packingGenerateCode(materialPackingName,stringBigQty2,charge); // String newPalletNo = CodeGenerator.packingGenerateCode(materialPackingName,stringBigQty2,charge);
//
// 写入拆分的新条码，更新原数据库 // // 写入拆分的新条码，更新原数据库
List<MaterialPacking> boxList = new ArrayList<MaterialPacking>(); // List<MaterialPacking> boxList = new ArrayList<MaterialPacking>();
// MaterialPackingKey materialpackingKey = new MaterialPackingKey(); //// MaterialPackingKey materialpackingKey = new MaterialPackingKey();
MaterialPacking materialpacking = new MaterialPacking(); // MaterialPacking materialpacking = new MaterialPacking();
// materialpackingKey.setSiteName("SDK"); //// materialpackingKey.setSiteName("SDK");
// materialpackingKey.setMaterialPackingName(newPalletNo); //// materialpackingKey.setMaterialPackingName(newPalletNo);
// materialpacking.setKey(materialpackingKey); //// materialpacking.setKey(materialpackingKey);
//
// 复制一个当前的原标签数据 // // 复制一个当前的原标签数据
MaterialPacking materialpackingNew = qtyQueryForList.get(z); // MaterialPacking materialpackingNew = qtyQueryForList.get(z);
// 设置新为标签和数量 // // 设置新为标签和数量
materialpackingNew.setMaterialPackingName(newPalletNo); // materialpackingNew.setMaterialPackingName(newPalletNo);
// bigQty2 转double类型 // // bigQty2 转double类型
materialpackingNew.setMaterialQuantity(bigQty2.doubleValue()); // materialpackingNew.setMaterialQuantity(bigQty2.doubleValue());
boxList.add(qtyQueryForList.get(z)); // boxList.add(qtyQueryForList.get(z));
boxList.add(materialpackingNew); // boxList.add(materialpackingNew);
boolean moveTransformOut = chargeSplitService.packingChargeSplit(boxList, eventUser); // boolean moveTransformOut = packingChargeSplit(boxList, eventUser);
if (moveTransformOut != true) { // if (moveTransformOut != true) {
throw new RuntimeException("修改数量拆分失败"); // throw new RuntimeException("修改数量拆分失败");
} // }
//
// 原条码扣减 // // 原条码扣减
SetEventInfo setEventInfo = new SetEventInfo(); // SetEventInfo setEventInfo = new SetEventInfo();
Map<String, Object> pakHashMap = new HashMap<>(); // Map<String, Object> pakHashMap = new HashMap<>();
pakHashMap.put("materialQuantity", restQty.doubleValue()); // pakHashMap.put("materialQuantity", restQty.doubleValue());
//
EventInfo eventInfo = new EventInfoUtil().makeEventInfo("修改数量拆分条码", eventUser, "修改数量拆分条码"); // EventInfo eventInfo = new EventInfoUtil().makeEventInfo("修改数量拆分条码", eventUser, "修改数量拆分条码");
setEventInfo.setUserColumns(pakHashMap); // setEventInfo.setUserColumns(pakHashMap);
MaterialPackingServiceProxy.getMaterialPackingService().setEvent(new MaterialPackingKey( queryForList.get(z).get("SITENAME").toString(), // MaterialPackingServiceProxy.getMaterialPackingService().setEvent(new MaterialPackingKey( queryForList.get(z).get("SITENAME").toString(),
queryForList.get(z).get("MATERIALPACKINGNAME").toString()), eventInfo, setEventInfo); // queryForList.get(z).get("MATERIALPACKINGNAME").toString()), eventInfo, setEventInfo);
//
} // }
//
} // }
//new MESServiceImpl().NeedReceiveMaterialInfoSend_NEW(shipRequestName, "SDK", materialPackingKeyList); //new MESServiceImpl().NeedReceiveMaterialInfoSend_NEW(shipRequestName, "SDK", materialPackingKeyList);