Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -315,7 +315,7 @@ public class BussinessTypeSaveRequest {
     private Integer deptNoInvType;
     private Boolean vailPrescribe;
     private Boolean inputSick;
-    private Boolean groupBuySplit;
+    private Integer groupBuySplit;
     /**
      * 是否允许库存批次号先进先出
      */

src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java

@@ -137,7 +137,7 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
     private String detailType;
     private Boolean vailPrescribe;
     private Boolean inputSick;
-    private Boolean groupBuySplit;
+    private Integer groupBuySplit;
     /**
      * 是否允许库存批次号先进先出
      */

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -194,7 +194,7 @@ public class BasicBussinessTypeResponse {
     private Integer deptNoInvType;
     private Boolean vailPrescribe;
     private Boolean inputSick;
-    private Boolean groupBuySplit;
+    private Integer groupBuySplit;
     /**
      * 是否允许库存批次号先进先出
      */

src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java

@@ -86,6 +86,7 @@ public class InvCountOrderDetailService extends ServiceImpl<InvCountOrderDetailM
         if (CollUtil.isNotEmpty(countOrderDetailList)) {
             for (InvCountOrderDetailEntity invCountOrderDetailEntity : countOrderDetailList) {
                 invCountOrderDetailEntity.setOrderIdFk(orderId);
+                invCountOrderDetailEntity.setCountNum(0);
             }
             invCountOrderDetailDao.insertBatch(countOrderDetailList);
         }