Merge remote-tracking branch 'origin/test'

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -70,11 +70,12 @@ public class ConstantStatus {
 
 
     /**
-     * 单据创建类型  2.新增扫码单据，1、新增业务单据，3、正常单据处理
+     * 单据创建类型  2.新增扫码单据，1、新增业务单据，3、正常单据处理,4:带配货页面
      */
     public static final Integer ORDER_TYPE_BIZ = 1;
     public static final Integer ORDER_TYPE_SCAN = 2;
     public static final Integer ORDER_TYPE_NORMAL = 3;
+    public static final Integer ORDER_TYPE_WAIT = 4;
 
     /**
      * 供应商自助平台单据类型

src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.Log;
@@ -70,6 +71,7 @@ public class BasicBusTypeChangeController {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
         }
         basicBusTypeChangeEntity.setUpdateTime(new Date());
+        basicBusTypeChangeEntity.setId(IdUtil.getSnowflakeNextId());
         basicBusTypeChangeService.insert(basicBusTypeChangeEntity);
         return ResultVOUtils.success("更新成功");
     }

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

@@ -664,13 +664,13 @@ public class IoCodeTempController extends BaseController {
                 }
 
                 if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
-                    if (bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() == 1 && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
+                    if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
                         String errMsg = ioCheckInoutService.checkCode(genDetaiEntity);
                         if (errMsg != null) {
                             return ResultVOUtils.error(500, errMsg);
                         } else
                             codeTempService.updateById(exitLocalEntity);
-                    } else if (bussinessTypeEntity.isCheckEnable() && (bussinessTypeEntity.getCheckWebNew() == 2 || (bussinessTypeEntity.getCheckWebNew() == 3 && addOrderRequest.getFromVailPi() == 1)) && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
+                    } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
                         String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity);
                         if (errMsg != null) {
                             return ResultVOUtils.error(500, errMsg);
@@ -821,13 +821,13 @@ public class IoCodeTempController extends BaseController {
             }
 
             //是否边扫边校验
-            if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() == 1) {
+            if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
                 String errMsg = ioCheckInoutService.checkCode(codeEnttity);
                 if (errMsg != null) {
                     return ResultVOUtils.error(500, errMsg);
                 } else
                     codeTempService.insert(codeEnttity);
-            } else if (bussinessTypeEntity.isCheckEnable() && (bussinessTypeEntity.getCheckWebNew() == 2 || (bussinessTypeEntity.getCheckWebNew() == 3 && addOrderRequest.getFromVailPi() == 1)) && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
+            } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
                 String errMsg = ioCheckInoutService.checkNoPiCode(codeEnttity);
                 if (errMsg != null) {
                     return ResultVOUtils.error(500, errMsg);

src/main/java/com/glxp/api/res/PageSimpleResponse.java

@@ -10,7 +10,12 @@ import java.util.List;
 @Data
 public class PageSimpleResponse<T> {
     // 总数
-    private Long total;
+    private Integer total;
     // 列表
     private List<T> list;
+
+    public void setTotal(Long total) {
+
+        this.total = total.intValue();
+    }
 }

src/main/resources/schemas/schema_v2.1.sql

@@ -387,3 +387,5 @@ CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2);
 
 CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
+