修改bug。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.dal.dataobject.countJob;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sun.xml.bind.v2.TODO;
@@ -100,14 +102,17 @@ public class CountJobMainDO extends BaseDO {
     /**
      * 承接人用户ID
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String acceptUserId;
     /**
      * 承接人用户名
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String acceptUserName;
     /**
      * 承接时间
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private LocalDateTime acceptTime;
     /**
      * 完成人用户ID

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.dal.dataobject.inspectJob;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sun.xml.bind.v2.TODO;
@@ -99,14 +101,17 @@ public class InspectJobMainDO extends BaseDO {
     /**
      * 承接人用户ID
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String acceptUserId;
     /**
      * 承接人用户名
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String acceptUserName;
     /**
      * 承接时间
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private LocalDateTime acceptTime;
     /**
      * 完成人用户ID

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java

@@ -1,8 +1,6 @@
 package com.win.module.wms.dal.dataobject.purchasereturnJob;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.sun.xml.bind.v2.TODO;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
@@ -123,14 +121,17 @@ public class PurchasereturnJobMainDO extends BaseDO {
     /**
      * 承接人用户ID
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String acceptUserId;
     /**
      * 承接人用户名
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String acceptUserName;
     /**
      * 承接时间
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private LocalDateTime acceptTime;
     /**
      * 完成人用户ID

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.dal.dataobject.putawayJob;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sun.xml.bind.v2.TODO;
@@ -86,14 +88,17 @@ public class PutawayJobMainDO extends BaseDO {
     /**
      * 承接人用户ID
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String acceptUserId;
     /**
      * 承接人用户名
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private String acceptUserName;
     /**
      * 承接时间
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private LocalDateTime acceptTime;
     /**
      * 完成人用户ID

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@@ -57,6 +57,7 @@ import javax.validation.Validator;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -418,11 +419,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         mainDo.setToAreaCodes(businesstypeDO.getInAreaCodes());
     }
 
-    private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDo, PurchasereturnRequestMainDO mainDO) {
+    private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDo, PurchasereturnRequestMainDO mainDO, List<String> inventoryStatusList) {
-        ArrayList<String> inventoryStatus = new ArrayList<>();
-        inventoryStatus.add(detailDo.getInventoryStatus());
         BigDecimal bigDecimal = new BigDecimal(0);
-        List<BalanceDO> balance = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFromLocationCode(), inventoryStatus);
+        List<BalanceDO> balance = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFromLocationCode(), inventoryStatusList);
         if (balance != null) {
             for (BalanceDO balanceDO : balance) {
                 bigDecimal = bigDecimal.add(balanceDO.getQty());
@@ -471,7 +470,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber());
         mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber());
         ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
-        BigDecimal bigDecimal = validatorBalance(detailDo, mainDo);
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
+        List<String> inventoryStatusList = Arrays.asList(businesstypeDO.getOutInventoryStatuses().split(","));
+        BigDecimal bigDecimal = validatorBalance(detailDo, mainDo, inventoryStatusList);
         ifDetailQtyBigThanQty(detailDo.getQty(), bigDecimal);
     }
 
@@ -559,7 +560,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
             message.append(ex.getMessage()).append(",");
         }
         try {
-            BigDecimal bigDecimal = validatorBalance(detailDo, mainDo);
+            List<String> inventoryStatusList = new ArrayList<>();
+            inventoryStatusList.add(detailDo.getInventoryStatus());
+            BigDecimal bigDecimal = validatorBalance(detailDo, mainDo, inventoryStatusList);
             try {
                 ifDetailQtyBigThanQty(detailDo.getQty(), bigDecimal);
             } catch (Exception ex) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java

@@ -54,11 +54,10 @@ public class RuleServiceImpl implements RuleService {
     }
 
     public RuleDO existRuleDO(RuleDO rule){
-        QueryWrapper<RuleDO>  queryWrapper = new QueryWrapper();
+        QueryWrapper<RuleDO>  queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("strategy_code", rule.getStrategyCode());
         queryWrapper.eq("priority",rule.getPriority());
-        RuleDO RuleDO = ruleMapper.selectOne(queryWrapper);
+        return ruleMapper.selectOne(queryWrapper);
-        return RuleDO;
     }
 
     @Override