diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index f11eac63..a926621f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -381,6 +381,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService //增加业务类型 BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord"); inspectRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode()); + inspectRecordMainCreateReqVO.setId(null); inspectRecordMainMapper.insert(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMainCreateReqVO)); for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) { InspectRecordDetailCreateReqVO inspectRecordDetailCreateReqVO = new InspectRecordDetailCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 3a9a0e7f..4b712d76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -419,13 +419,14 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque mainDo.setToAreaCodes(businesstypeDO.getInAreaCodes()); } - private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDo, PurchasereturnRequestMainDO mainDO, List inventoryStatusList) { + private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDO, PurchasereturnRequestMainDO mainDO, List inventoryStatusList) { BigDecimal bigDecimal = new BigDecimal(0); - List balance = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFromLocationCode(), inventoryStatusList); + List balance = jobUtils.selectlocationReturnManagementAccuracy(detailDO.getItemCode(), detailDO.getPackingNumber(), detailDO.getBatch(), detailDO.getFromLocationCode(), inventoryStatusList); if (balance != null) { for (BalanceDO balanceDO : balance) { bigDecimal = bigDecimal.add(balanceDO.getQty()); mainDO.setFromWarehouseCode(balanceDO.getWarehouseCode()); + detailDO.setInventoryStatus(balanceDO.getInventoryStatus()); } } return bigDecimal; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java index b70ee393..49206dae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java @@ -612,18 +612,22 @@ public class RuleServiceImpl implements RuleService { * @return */ private boolean forEachParams(Map params, JSONArray conditionArray) { + boolean result1 = false; for(int i = 0; i < conditionArray.size(); i++) { JSONObject conditionObject = conditionArray.getJSONObject(i); for (String key : params.keySet()) { if(key.equals(conditionObject.get("ParamCode")) && conditionObject.get("ParamCode") != null) { - boolean result = this.checkCondition(conditionObject, key, params.get(key)); - if(!result) { - return false; + boolean result2 = this.checkCondition(conditionObject, key, params.get(key)); + if(!result2) { + result1 = false; + break; + } else { + result1 = true; } } } } - return true; + return result1; } /**