任务增加两个属性。

win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/filter/MyI18nInterceptor.java

@@ -17,7 +17,6 @@ public class MyI18nInterceptor implements HandlerInterceptor {
         final String key = "language";
         String language = request.getHeader(key);
         // 前端传递的language必须是zh-CN格式的，中间的-必须要完整，不能只传递zh或en
-        log.debug("当前语言={}", language);
         if(language == null || language.isEmpty()) {
             language = "zh-CN";
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java

@@ -1,18 +1,11 @@
 package com.win.module.wms.controller.countJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -143,4 +136,10 @@ public class CountJobMainBaseVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java

@@ -17,11 +17,9 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
 @Data
 public class InspectJobMainBaseVO {
 
-
     @Schema(description = "id", example = "id")
     private Long id;
 
-
     @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "申请单号不能为空")
     private String requestNumber;
@@ -179,4 +177,10 @@ public class InspectJobMainBaseVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java

@@ -157,4 +157,10 @@ public class PurchasereceiptJobMainBaseVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainBaseVO.java

@@ -1,18 +1,12 @@
 package com.win.module.wms.controller.purchasereturnJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -175,4 +169,10 @@ public class PurchasereturnJobMainBaseVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainBaseVO.java

@@ -1,18 +1,12 @@
 package com.win.module.wms.controller.putawayJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -150,4 +144,10 @@ public class PutawayJobMainBaseVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "入库库存状态范围")
+    private String inInventoryStatuses;
+
+    @Schema(description = "出库库存状态范围")
+    private String outInventoryStatuses;
+
 }

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

@@ -201,9 +201,16 @@ public class CountJobMainDO extends BaseDO {
      * 允许修改箱码
      */
     private String allowModifyPackingNumber;
-
     /**
      * 主表ID
      */
     private Long masterId;
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
 }

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

@@ -276,5 +276,12 @@ public class InspectJobMainDO extends BaseDO {
      * 枚举 {@link TODO true_false 对应的类}
      */
     private String allowModifyPackingNumber;
-
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java

@@ -250,5 +250,12 @@ public class PurchasereceiptJobMainDO extends BaseDO {
      * 枚举 {@link TODO true_false 对应的类}
      */
     private String allowModifyPackingNumber;
-
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
 }

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

@@ -256,5 +256,12 @@ public class PurchasereturnJobMainDO extends BaseDO {
      * 枚举 {@link TODO true_false 对应的类}
      */
     private String allowModifyPackingNumber;
-
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
 }

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

@@ -1,16 +1,12 @@
 package com.win.module.wms.dal.dataobject.putawayJob;
 
+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.*;
-import java.util.*;
+
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 上架任务主 DO
@@ -227,5 +223,12 @@ public class PutawayJobMainDO extends BaseDO {
      * 枚举 {@link TODO true_false 对应的类}
      */
     private String allowModifyPackingNumber;
-
+    /**
+     * 入库库存状态范围
+     */
+    private String inInventoryStatuses;
+    /**
+     * 出库库存状态范围
+     */
+    private String outInventoryStatuses;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -386,7 +386,10 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
         //增加业务类型
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob");
         inspectJobMainDO.setBusinessType(businesstypeDO.getCode());
+        inspectJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
+        inspectJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         inspectJobMainMapper.insert(inspectJobMainDO);
+        inspectJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
         List<InspectJobDetailDO> inspectJobDetailDOList = new ArrayList<>();
         for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) {
             InspectJobDetailDO inspectJobDetailDO = InspectJobDetailConvert.INSTANCE.convert(inspectRequestDetailDO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@@ -521,6 +521,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
             //增加业务类型
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob");
             purchasereceiptJobMainDO.setBusinessType(businesstypeDO.getCode());
+            purchasereceiptJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
+            purchasereceiptJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
             purchasereceiptJobMainMapper.insert(purchasereceiptJobMainDO);
             List<PurchasereceiptJobDetailDO> purchasereceiptJobDetailDOList = new ArrayList<>();
             for(PurchasereceiptJobDetailCreateReqVO purchasereceiptJobDetailCreateReqVO : purchasereceiptJobMainCreateReqVO.getSubList()) {

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

@@ -209,9 +209,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         }
     }
 
-    private void ifdetailQtyBigThanQty(BigDecimal detailQty, BigDecimal qty) {
+    private void ifDetailQtyBigThanQty(BigDecimal detailQty, BigDecimal qty) {
         if (detailQty.compareTo(qty) > 0) {
-            throw exception(QTY_EXCEPTION, "退货数量" + qty + "不能大于于收货数量" + detailQty);
+            throw exception(QTY_EXCEPTION, "退货数量" + qty + "不能大于收货数量" + detailQty);
         }
     }
 
@@ -336,6 +336,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
 
     /**
      * 生成采购收货任务，不要改动事务传播方式，否则会有事务问题
+     *
      * @param mainDO       采购收货主
      * @param detailDOList 采购收货子
      */
@@ -363,6 +364,10 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         purchasereturnJobMainDO.setCreator(null);
         purchasereturnJobMainDO.setUpdateTime(null);
         purchasereturnJobMainDO.setUpdater(null);
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
+        purchasereturnJobMainDO.setBusinessType(businesstypeDO.getCode());
+        purchasereturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
+        purchasereturnJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         purchasereturnJobMainMapper.insert(purchasereturnJobMainDO);
         List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
         List<PurchasereturnJobDetailDO> purchasereturnJobDetailDOList = new ArrayList<>();
@@ -465,9 +470,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
         mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber());
         mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber());
-        ifdetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
+        ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
         BigDecimal bigDecimal = validatorBalance(detailDo, mainDo);
-        ifdetailQtyBigThanQty(detailDo.getQty(),bigDecimal);
+        ifDetailQtyBigThanQty(detailDo.getQty(), bigDecimal);
     }
 
     /**
@@ -546,7 +551,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
             PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
             PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
             try {
-                ifdetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
+                ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
             } catch (Exception ex) {
                 message.append(ex.getMessage()).append(",");
             }
@@ -556,7 +561,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         try {
             BigDecimal bigDecimal = validatorBalance(detailDo, mainDo);
             try {
-                ifdetailQtyBigThanQty(detailDo.getQty(),bigDecimal);
+                ifDetailQtyBigThanQty(detailDo.getQty(), bigDecimal);
             } catch (Exception ex) {
                 message.append(ex.getMessage()).append(",");
             }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@@ -355,6 +355,10 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         putawayJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete());
         putawayJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
         putawayJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
+        putawayJobMainDO.setBusinessType(businesstypeDO.getCode());
+        putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
+        putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         putawayJobMainMapper.insert(putawayJobMainDO);
         List<PutawayJobDetailDO> putawayJobDetailDOList = new ArrayList<>();
         for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {