diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java index 5005aaf8..de87be93 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java @@ -577,6 +577,9 @@ public class MdGruopDickServiceImpl extends ServiceImpl 0) List validItems = item.stream() @@ -597,6 +601,9 @@ public class MdGruopDickServiceImpl extends ServiceImpl 0) { + log.error(item.get(0).getVehicle_code()+ "的物料数量为:" + validItems.get(0).getQty() + + ",上报重量为:" + actualWeightKg + ",载具重量为:" + weight + ",去皮重量为:" + netWeight + ",与物料实际重量:" + materialWeight + ",进行对比已超过误差值" + diffWeight + ",不允许入库,请检查。"); throw new BadRequestException( - String.format("weightError-该载具:%s,称重重量为%s,与物料实际重量:%s,进行对比已超过误差值:%sg,不允许入库,请检查。", - item.get(0).getVehicle_code(), netWeight, materialWeight, diffWeight) + (item.get(0).getVehicle_code() + "的物料数量为:" + validItems.get(0).getQty() + ",上报重量为:" + actualWeightKg + "kg,载具重量为:" + weight + "g" + ",物料单重为:" + validItems.get(0).getSingle_weight() + validItems.get(0).getAssist_unit_id() +",去皮重量为:" + netWeight + "g,与物料实际重量:" + materialWeight + "g,进行对比已超过误差值" + diffWeight + "g,不允许入库,请检查。") ); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java index 999c5720..ffec3cdb 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java @@ -437,17 +437,13 @@ public class SyncErpBillsScheduleService { if (ObjectUtils.isNotEmpty(formDataList)) { String assistUint = "0"; String netWeight = "0"; - JSONArray uintJsonArray = JSONObject.parseObject(JSON.toJSONString(r)).getJSONArray("MaterialStock"); - if (ObjectUtils.isNotEmpty(uintJsonArray)) { - JSONObject u1 = JSONObject.parseObject(JSON.toJSONString(uintJsonArray.get(0))); - JSONObject u2 = u1.getJSONObject("AuxUnitID"); - assistUint = u2 != null ? u2.getString("Number") : "0"; - } JSONArray netWeightArray = JSONObject.parseObject(JSON.toJSONString(r)).getJSONArray("MaterialBase"); if (ObjectUtils.isNotEmpty(netWeightArray)) { JSONObject u1 = JSONObject.parseObject(JSON.toJSONString(netWeightArray.get(0))); String u2 = u1.getString("NETWEIGHT"); netWeight = StringUtils.isNotBlank(u2) ? u2 : "0"; + JSONObject u3 = u1.getJSONObject("WEIGHTUNITID"); + assistUint = u3 != null ? "kg".equals(u3.getString("Number"))||"MX041".equals(u3.getString("Number"))?"kg":"g" : "g"; } PmFormData mainFormData = formDataList.stream().filter(rs1 -> "BD_MATERIAL".equals(rs1.getForm_type())).collect(Collectors.toList()).get(0); JSONObject object = mainFormData.getForm_data(); @@ -464,15 +460,8 @@ public class SyncErpBillsScheduleService { materialBase.setQty_unit_id(m_unit); materialBase.setAssist_unit_id(assistUint); BigDecimal netWeightGet = new BigDecimal(netWeight); - //辅助单位净重为kg - if (netWeightGet.compareTo(BigDecimal.ZERO) > 0 && assistUint.contains("kg")) { - BigDecimal newWeightGet = netWeightGet.multiply(new BigDecimal(1000)); - materialBase.setNet_weight(newWeightGet); - materialBase.setNearby_weight(newWeightGet); - } else { - materialBase.setNet_weight(netWeightGet); - materialBase.setNearby_weight(netWeightGet); - } + materialBase.setNet_weight(netWeightGet); + materialBase.setNearby_weight(netWeightGet); materialBase.setPrint_no(formData.getPcsn()); if (materialInfo != null) { iMdMeMaterialbaseService.update(new LambdaUpdateWrapper()