修改bug，修改Integer 为int

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.inout;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -34,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -75,7 +77,7 @@ public class IoOrderDetailBizController extends BaseController {
     public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) {
 
         AuthAdmin authAdmin = getUser();
-        if (addBizProductReqeust.getRelId() == null)
+        if (addBizProductReqeust.getRelId() == null && CollUtil.isEmpty(addBizProductReqeust.getDatas()))
             return ResultVOUtils.error(500, "未选择产品信息");
         if (addBizProductReqeust.getOrderEntity() == null)
             return ResultVOUtils.error(500, "未指定订单");
@@ -88,6 +90,10 @@ public class IoOrderDetailBizController extends BaseController {
             orderEntity.setCreateUser(authAdmin.getId() + "");
             orderEntity.setCreateTime(new Date());
             orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
+            if (StrUtil.isNotEmpty(orderEntity.getFromInvCode())) {
+                InvWarehouseEntity fromEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode());
+                orderEntity.setFromDeptCode(fromEntity.getParentId());
+            }
             orderEntity.setFromType(ConstantStatus.FROM_WEBNEW);
             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
             orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
@@ -100,21 +106,34 @@ public class IoOrderDetailBizController extends BaseController {
             orderEntity.setInvCode(orderEntity.getInvCode());
             orderService.insertOrder(orderEntity);
         }
-        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(addBizProductReqeust.getRelId());
+
-        IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
+        List<AddBizProductReqeust> datas = new ArrayList<>();
-        ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
+        if (CollUtil.isNotEmpty(addBizProductReqeust.getDatas())) {
-        ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
+            datas.addAll(addBizProductReqeust.getDatas());
-        ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
+        } else {
-        ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
+            datas.add(addBizProductReqeust);
-        ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
+        }
-        ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
+        for (AddBizProductReqeust item : datas) {
-        ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(item.getRelId());
-        ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
+            IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
-        ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
+            ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
-        ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
+            ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
-        ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice());
+            ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
-        ioOrderDetailBizEntity.setSupId(addBizProductReqeust.getSupId());
+            ioOrderDetailBizEntity.setNameCode(udiRelevanceResponse.getNameCode());
-        orderDetailBizService.insert(ioOrderDetailBizEntity);
+            ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
+            ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
+            ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
+            ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
+            ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
+            ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
+            ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice());
+            ioOrderDetailBizEntity.setProductDate(item.getProductDate());
+            ioOrderDetailBizEntity.setExpireDate(item.getExpireDate());
+            ioOrderDetailBizEntity.setBatchNo(item.getBatchNo());
+            ioOrderDetailBizEntity.setSupId(item.getSupId());
+            orderDetailBizService.insert(ioOrderDetailBizEntity);
+        }
+
         orderEntity.setUpdateTime(new Date());
         orderEntity.setUpdateUser(authAdmin.getId() + "");
         orderService.update(orderEntity);

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -138,7 +138,7 @@ public class IoOrderDetailBizEntity {
      * 单据数量
      */
     @TableField(value = "`count`")
-    private Integer count;
+    private int count;
 
     /**
      * 备注
@@ -183,4 +183,4 @@ public class IoOrderDetailBizEntity {
     @TableField(exist = false)
     private Integer scanCount;
 
-}
+}

src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java

@@ -138,13 +138,13 @@ public class IoOrderDetailCodeEntity {
      * 单据数量
      */
     @TableField(value = "`count`")
-    private Integer count;
+    private int count;
 
     /**
      * 扫码数量
      */
     @TableField(value = "reCount")
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 备注
@@ -186,6 +186,6 @@ public class IoOrderDetailCodeEntity {
     private boolean checkSuccess;
 
     @TableField(exist = false)
-    private Integer orderCount;
+    private int orderCount;
 
-}
+}

src/main/java/com/glxp/api/entity/inv/InvPreProductEntity.java

@@ -51,19 +51,19 @@ public class InvPreProductEntity {
      * 入库数量
      */
     @TableField(value = "inCount")
-    private Integer inCount;
+    private int inCount;
 
     /**
      * 出库数量
      */
     @TableField(value = "outCount")
-    private Integer outCount;
+    private int outCount;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private String reCount;
+    private int reCount;
 
     /**
      * 客户ID
@@ -130,4 +130,4 @@ public class InvPreProductEntity {
     public static final String COL_CREATETIME = "createTime";
 
     public static final String COL_UPDATETIME = "updateTime";
-}
+}

src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java

@@ -3,12 +3,21 @@ package com.glxp.api.req.inout;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class AddBizProductReqeust {
 
     private IoOrderEntity orderEntity;
+
+    //单选添加
     private Long relId;
     private String zczbhhzbapzbh;
     private String supId;
+    private String batchNo;
+    private String productDate;
+    private String expireDate;
+
+    List<AddBizProductReqeust> datas;           //多选添加
 
 }

src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java

@@ -115,12 +115,12 @@ public class IoOrderDetailBizResponse {
     /**
      * 单据数量
      */
-    private Integer count;
+    private int count;
 
     /**
      * 实际数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 备注

src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java

@@ -115,12 +115,12 @@ public class IoOrderDetailResultResponse {
     /**
      * 单据数量
      */
-    private Integer count;
+    private int count;
 
     /**
      * 扫码数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 备注

src/main/java/com/glxp/api/res/inv/InvProductResponse.java

@@ -58,17 +58,17 @@ public class InvProductResponse {
     /**
      * 入库数量
      */
-    private Integer inCount;
+    private int inCount;
 
     /**
      * 出库数量
      */
-    private Integer outCount;
+    private int outCount;
 
     /**
      * 实际数量
      */
-    private Integer reCount;
+    private int reCount;
 
     /**
      * 客户ID

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 123456
+    password: Glxp@6066
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 60