Merge branch 'dev' into test

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

@@ -10,86 +10,91 @@ public class ConstantStatus {
     /**
      * 等待提交(草稿）
      */
-    public static final Integer ORDER_STATUS_TEMP_SAVE = 1;
+    public static final int ORDER_STATUS_TEMP_SAVE = 1;
 
     /**
      * 已提交待处理
      */
-    public static final Integer ORDER_STATUS_PROCESS = 2;
+    public static final int ORDER_STATUS_PROCESS = 2;
+
+    /**
+     * 已提交校验正在处理
+     */
+    public static final int ORDER_STATUS_CHECK_PROCESS = 12;
 
     /**
      * 处理成功待校验
      */
-    public static final Integer ORDER_STATUS_CHECK = 3;
+    public static final int ORDER_STATUS_CHECK = 3;
 
     /**
      * 处理异常
      */
-    public static final Integer ORDER_STATS_ERROR = 4;
+    public static final int ORDER_STATS_ERROR = 4;
 
     /**
      * 待核对
      */
-    public static final Integer ORDER_STATUS_CHECK_SUCCESS = 5;
+    public static final int ORDER_STATUS_CHECK_SUCCESS = 5;
 
     /**
      * 校验失败
      */
-    public static final Integer ORDER_STATUS_CHECK_FAIL = 6;
+    public static final int ORDER_STATUS_CHECK_FAIL = 6;
 
 
     /**
      * 待审核
      */
-    public static final Integer ORDER_STATUS_CHECK_REW = 10;
+    public static final int ORDER_STATUS_CHECK_REW = 10;
 
 
     /**
      * 审核通过
      */
-    public static final Integer ORDER_STATUS_AUDITED = 7;
+    public static final int ORDER_STATUS_AUDITED = 7;
 
     /**
      * 审核拒绝
      */
-    public static final Integer ORDER_STATUS_AUDITED_REFUSED = 8;
+    public static final int ORDER_STATUS_AUDITED_REFUSED = 8;
 
     /**
      * 已提交正在处理
      */
-    public static final Integer ORDER_STATUS_PROCESSING = 9;
+    public static final int ORDER_STATUS_PROCESSING = 9;
 
     /**
      * 业务单已提交待配货
      */
-    public static final Integer ORDER_STATUS_ALLOCATE = 11;
+    public static final int ORDER_STATUS_ALLOCATE = 11;
 
 
-    public static final Integer ORDER_DELIVERY_STATUS_UN = 1;
-    public static final Integer ORDER_DELIVERY_STATUS_ED = 2;
+    public static final int ORDER_DELIVERY_STATUS_UN = 1;
+    public static final int ORDER_DELIVERY_STATUS_ED = 2;
 
 
     /**
      * 单据创建类型  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;
+    public static final int ORDER_TYPE_BIZ = 1;
+    public static final int ORDER_TYPE_SCAN = 2;
+    public static final int ORDER_TYPE_NORMAL = 3;
+    public static final int ORDER_TYPE_WAIT = 4;
 
     /**
      * 供应商自助平台单据类型
      */
-    public static final Integer BUS_TYPE_NORMAL = 1;  //正常出入库单据（入账）
-    public static final Integer BUS_TYPE_DELIVERY = 2;    //送货出入库单据
-    public static final Integer BUS_TYPE_ARRIVAL = 3;  //到货出库单据类型
-    public static final Integer BUS_TYPE_RETURNED = 4;      //退货单单据类型
-    public static final Integer BUS_TYPE_INVOICE = 4;      //退货单单据类型
+    public static final int BUS_TYPE_NORMAL = 1;  //正常出入库单据（入账）
+    public static final int BUS_TYPE_DELIVERY = 2;    //送货出入库单据
+    public static final int BUS_TYPE_ARRIVAL = 3;  //到货出库单据类型
+    public static final int BUS_TYPE_RETURNED = 4;      //退货单单据类型
+    public static final int BUS_TYPE_INVOICE = 4;      //退货单单据类型
 
 
-    public static final Integer ACTION_TYPE_NORMAL = 1;         //带票
-    public static final Integer ACTION_TYPE_PREIN = 2;          //预验收
-    public static final Integer ACTION_TYPE_ADVANCE = 3;        //寄售
+    public static final int ACTION_TYPE_NORMAL = 1;         //带票
+    public static final int ACTION_TYPE_PREIN = 2;          //预验收
+    public static final int ACTION_TYPE_ADVANCE = 3;        //寄售
 
 
     public static final int ORDER_SPUSE_NO = 0;         //不允许供应商使用
@@ -97,41 +102,41 @@ public class ConstantStatus {
     public static final int ORDER_SPUSE_EDIT = 2;       //允许供应商编辑
 
 
-    public static final Integer ORDER_STATUS_ADDITIONAL = 5;    //补录单据
-//    public static final Integer ORDER_STATUS_RECEIVEED = 7;
+    public static final int ORDER_STATUS_ADDITIONAL = 5;    //补录单据
+//    public static final int ORDER_STATUS_RECEIVEED = 7;
 
     //订单处理状态
-    public static final Integer ORDER_DEAL_DRAFT = 1;   //草稿
-    public static final Integer ORDER_DEAL_POST = 2;   //已提交，待交接
-    public static final Integer ORDER_DEAL_REW = 4;     //交接中，待审核
-    public static final Integer ORDER_DEAL_CHECK = 3;     //已审核
+    public static final int ORDER_DEAL_DRAFT = 1;   //草稿
+    public static final int ORDER_DEAL_POST = 2;   //已提交，待交接
+    public static final int ORDER_DEAL_REW = 4;     //交接中，待审核
+    public static final int ORDER_DEAL_CHECK = 3;     //已审核
 
 
     //ERP校验状态
-    public static final Integer ORDER_CHECK_SUCCESS = 2;    //校验成功
-    public static final Integer ORDER_CHECK_FAIL = 1;       //校验失败
-    public static final Integer ORDER_CHECK_UN = 0;       //未校验
+    public static final int ORDER_CHECK_SUCCESS = 2;    //校验成功
+    public static final int ORDER_CHECK_FAIL = 1;       //校验失败
+    public static final int ORDER_CHECK_UN = 0;       //未校验
 
     //ERP订单上传状态
-    public static final Integer ORDER_EXPORT_UN = 0;    //未导出
-    public static final Integer ORDER_EXPORT_ED = 1;    //已导出
-    public static final Integer ORDER_EXPORT_FAIL = 2;    //导出失败
+    public static final int ORDER_EXPORT_UN = 0;    //未导出
+    public static final int ORDER_EXPORT_ED = 1;    //已导出
+    public static final int ORDER_EXPORT_FAIL = 2;    //导出失败
 
     //ERP订单签字状态
-    public static final Integer ORDER_SIGN_UN = 0;    //未签字
-    public static final Integer ORDER_SIGN_ED = 1;    //已签字
-    public static final Integer ORDER_SIGN_FAIL = 2;    //签字失败
+    public static final int ORDER_SIGN_UN = 0;    //未签字
+    public static final int ORDER_SIGN_ED = 1;    //已签字
+    public static final int ORDER_SIGN_FAIL = 2;    //签字失败
 
 
     //UDI产品信息表字段类型
-    public static final Integer PRODUCT_TYPE_UDI = 0;
-    public static final Integer PRODUCT_TYPE_THIRD = 1;
+    public static final int PRODUCT_TYPE_UDI = 0;
+    public static final int PRODUCT_TYPE_THIRD = 1;
 
     //DI类型
-    public static final Integer DI_TYPE_MAIN = 1;//主标识
-    public static final Integer DI_TYPE_SYDY = 2;//使用单元
-    public static final Integer DI_TYPE_BTBS = 3;//本体标识
-    public static final Integer DI_TYPE_BZBS = 4;//包装标识
+    public static final int DI_TYPE_MAIN = 1;//主标识
+    public static final int DI_TYPE_SYDY = 2;//使用单元
+    public static final int DI_TYPE_BTBS = 3;//本体标识
+    public static final int DI_TYPE_BZBS = 4;//包装标识
 
 
     //业务单据状态
@@ -174,8 +179,8 @@ public class ConstantStatus {
 
 
     //采购类型
-    public static final Integer PRUCHASE_ADVANCE = 1;   //预入库
-    public static final Integer PRUCHASE_COMMON = 2;    //普通采购
+    public static final int PRUCHASE_ADVANCE = 1;   //预入库
+    public static final int PRUCHASE_COMMON = 2;    //普通采购
 
 
     //往来单位类型
@@ -297,5 +302,4 @@ public class ConstantStatus {
     public static final int SCAN_ALL_PI = 3;        //有业务单拣货(有无三期)
 
 
-
 }

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

@@ -84,8 +84,10 @@ public class BasicGenExcelService {
         excelData.add(head);
         //选中导出
         if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) {
-            List<Integer> ids = basicCorpsExportRequest.getIds();
-            for (Integer id : ids) {
+//            List<Integer> ids = basicCorpsExportRequest.getIds();
+            List<Long> ids =basicCorpsExportRequest.getIds();
+
+            for (Long id : ids) {
                 BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
                 filterRequest.setId(id);
                 List<List<String>> genDatas = genExcelData(filterRequest);

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

@@ -67,7 +67,8 @@ public class BasicGenJsonService {
 
         List<BasicCorpEntity> unitMaintainEntities = new ArrayList<>();
         if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) {
-            List<Integer> ids = basicCorpsExportRequest.getIds();
+//            List<Integer> ids = basicCorpsExportRequest.getIds();
+            List<Long> ids   = basicCorpsExportRequest.getIds();
             ids.forEach(id -> {
                 BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();
                 request.setId(id);
@@ -97,7 +98,8 @@ public class BasicGenJsonService {
         BasicCorpExportLogResponse exportData = new BasicCorpExportLogResponse();
         List<BasicCorpEntity> unitMaintainEntities = new ArrayList<>();
         if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) {
-            List<Integer> ids = corpsExportRequest.getIds();
+//            List<Integer> ids = corpsExportRequest.getIds();
+            List<Long> ids = corpsExportRequest.getIds();
             ids.forEach(id -> {
                 BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();
                 request.setId(id);

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

@@ -80,7 +80,6 @@ public class BasicOrderPrintController {
     public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) {
 
 
-
         String name = getStatusName(filterOrderPrintRequest.getStatus());
         SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction());
         if (sysPdfTemplateRelevanceCodeEntity != null) {
@@ -273,7 +272,10 @@ public class BasicOrderPrintController {
                 Map<String, Object> bizData = new HashMap<>();
                 bizData.put("index", i);
                 bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode());
-                bizData.put("udiCode", udiProductEntity.getUuid() == null ? ' ' : udiProductEntity.getUuid());
+                String udiCode = "#" + obj.getNameCode() + "#" + obj.getProduceDate() + "#" + obj.getExpireDate() +
+                        "#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#"  + "#";
+                udiCode = udiCode.replaceAll("#null", "#");
+                bizData.put("udiCode", udiCode);
                 bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc());
                 bizData.put("ggxh", udiProductEntity.getGgxh() == null ? ' ' : udiProductEntity.getGgxh());
                 bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo());

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

@@ -662,6 +662,10 @@ public class UdiRelevanceController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         boolean falg = udiProductService.updateUdiInfoById(udiProductEntity);
+        UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+        udiRelevanceEntity.setId(udiProductEntity.getUid());
+        udiRelevanceEntity.setGroupBuy(udiProductEntity.isGroupBuy());
+        boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         if (udiProductEntity.getRelSupId() != null) {
             UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();
             udiRlSupEntity.setUpdateTime(new Date());

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

@@ -626,12 +626,16 @@ public class IoCodeTempController extends BaseController {
                 exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
                 exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0)));
 
+
+                if (!StringUtils.isNotBlank(exitLocalEntity.getSerialNo())) {
+                    return ResultVOUtils.error(500, "重复扫码！");
+                }
+
                 BaseResponse invRes = checkInv(bussinessTypeEntity, exitLocalEntity);
                 if (invRes != null) {
                     return invRes;
                 }
 
-                if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
                 if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
                     String errMsg = ioCheckInoutService.checkCode(genDetaiEntity);
                     if (errMsg != null) {
@@ -647,10 +651,6 @@ public class IoCodeTempController extends BaseController {
                 } else {
                     codeTempService.updateById(exitLocalEntity);
                 }
-
-                } else {
-                    return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
-                }
             }
         }
 
@@ -690,11 +690,11 @@ public class IoCodeTempController extends BaseController {
                 }
 
                 if (bussinessTypeEntity.getVailGroupBuy() == 1 && !udiRelevanceResponse.isGroupBuy()) {       //只采集集采产品
-                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入集采产品！");
+                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入集采产品！");
                 }
 
                 if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
-                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！");
+                    return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入非集采产品！");
                 }
 
                 //计算实际数量
@@ -822,7 +822,9 @@ public class IoCodeTempController extends BaseController {
         if (StrUtil.isEmpty(udiEntity.getExpireDate()) && !udiRelevanceResponse.getAllowNoExpire()) {
             errMsg = errMsg + ",失效日期";
         }
-
+        if (StrUtil.isEmpty(udiEntity.getSerialNo()) && !udiRelevanceResponse.getAllowNoSerial()) {
+            errMsg = errMsg + ",序列号";
+        }
         if (StrUtil.isNotEmpty(errMsg)) {
             BaseResponse baseResponse = ResultVOUtils.error(507, "产品三期缺失请补齐" + errMsg.substring(1) + "");
             baseResponse.setData(udiEntity);
@@ -831,6 +833,38 @@ public class IoCodeTempController extends BaseController {
         return null;
     }
 
+    //校验条码完整性
+    public BaseResponse checkCodeIntegrity(UdiRelevanceResponse checkUdi, UdiEntity udiEntity) {
+        String lostMsg = "";
+        //校验条码完整性
+        if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
+            lostMsg = lostMsg + ",批次号";
+        }
+        if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) {
+            lostMsg = lostMsg + ",生产日期";
+        }
+
+        if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) {
+            lostMsg = lostMsg + ",失效日期";
+        }
+        if (("是".equals(checkUdi.getScbssfbhxlh()) && StrUtil.isEmpty(udiEntity.getSerialNo()))
+        ) {
+            lostMsg = lostMsg + ",序列号";
+        }
+        if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) {
+            return ResultVOUtils.error(504, "序列号超出20位！");
+        }
+        if (StrUtil.isNotEmpty(udiEntity.getBatchNo()) && udiEntity.getBatchNo().length() > 20) {
+            return ResultVOUtils.error(504, "批次号超出20位！");
+        }
+        if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
+            lostMsg = "批次号与序列号不能同时为空！";
+        }
+        if (StrUtil.isNotEmpty(lostMsg))
+            return ResultVOUtils.error(500, lostMsg);
+        else return null;
+    }
+
     //校验供应商是否配送此产品
     public BaseResponse checkCorp(IoCodeTempEntity codeEnttity, BasicBussinessTypeEntity bussinessTypeEntity, String unitFk) {
         CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();

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

@@ -1,6 +1,8 @@
 package com.glxp.api.controller.inout;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -9,9 +11,11 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.InvBusUserEntity;
+import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.EntrustReceEntity;
 import com.glxp.api.entity.inout.*;
@@ -26,9 +30,13 @@ import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inout.PdaBusOrderResponse;
 import com.glxp.api.service.auth.InvBusUserService;
+import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.EntrustReceService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.OrderNoTypeBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -40,10 +48,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS;
 
 
 @Slf4j
@@ -67,6 +75,8 @@ public class IoOrderController extends BaseController {
     IoAddInoutService ioAddInoutService;
     @Resource
     IoCheckInoutService ioCheckInoutService;
+    @Resource
+    IoOrderInvoiceService orderInvoiceService;
 
     /**
      * 查询单据列表
@@ -125,7 +135,6 @@ public class IoOrderController extends BaseController {
         if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
             orderService.setInvoiceFiltes(filterOrderRequest);
         }
-
         if (filterOrderRequest.getSourceLocalType() != null) {
             if (filterOrderRequest.getSourceLocalType() == 1) {
                 filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5));
@@ -133,32 +142,19 @@ public class IoOrderController extends BaseController {
                 filterOrderRequest.setSourceTypes(Arrays.asList(6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17));
             }
         }
-
         String customerId = getCustomerId();
         if (!customerId.equals("110")) {
             filterOrderRequest.setFromCorp(customerId);
         }
-        List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
+        List<IoOrderResponse> list = orderService.getfilterOrderList(filterOrderRequest);
 
         for (IoOrderResponse ioOrderResponse : list) {
             if (ioOrderResponse.getCheckStatus() == null) {
                 ioOrderResponse.setCheckStatus(0 + "");
             }
-            FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
-            filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
-            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
-            BigDecimal amount = new BigDecimal(0.00);
-            for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
-                if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
-                    amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
-                }
-            }
-            ioOrderResponse.setAllAmount(amount);
-
-
+            ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
         }
 
-
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
@@ -183,6 +179,11 @@ public class IoOrderController extends BaseController {
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse submitBiz(@RequestBody AddOrderRequest addOrderRequest) {
 
+        IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+        BaseResponse tempResponse = checkSubmitEnable(orderEntity);
+        if (tempResponse != null)
+            return tempResponse;
+
         //校验单据是否已完成
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo());
 
@@ -210,7 +211,6 @@ public class IoOrderController extends BaseController {
             }
         }
 
-        IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
         ioAddInoutService.dealBusProcess(orderEntity, addOrderRequest.getFromVailPi());
         return ResultVOUtils.success("提交成功！");
     }
@@ -220,6 +220,10 @@ public class IoOrderController extends BaseController {
     @PostMapping("warehouse/inout/submitCodes")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse submitCodes(@RequestBody AddOrderRequest addOrderRequest) {
+        IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+        BaseResponse tempResponse = checkSubmitEnable(orderEntity);
+        if (tempResponse != null)
+            return tempResponse;
 
         //校验单据是否已完成
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo());
@@ -227,7 +231,6 @@ public class IoOrderController extends BaseController {
         if (CollUtil.isEmpty(orderDetailCodeEntities)) {
             return ResultVOUtils.error(500, "单据未扫码或扫码校验无法通过,提交失败,请检查后重新提交！");
         }
-        IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
         ioAddInoutService.dealProcess(orderEntity);
 
         //不需要手动校验，则走正常单据校验处理流程
@@ -274,6 +277,11 @@ public class IoOrderController extends BaseController {
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
 
+        IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+        BaseResponse tempResponse = checkSubmitEnable(orderEntity);
+        if (tempResponse != null)
+            return tempResponse;
+
         //校验单据是否已完成
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo());
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo());
@@ -295,7 +303,6 @@ public class IoOrderController extends BaseController {
                     return ResultVOUtils.error(500, errMsg);
                 }
                 saveOrderWeb(addOrderRequest);
-                IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
                 orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
                 orderService.update(orderEntity);
@@ -304,7 +311,6 @@ public class IoOrderController extends BaseController {
                 return ResultVOUtils.error(500, "单据校验提交失败,请先录入业务单据！");
             }
         } else {
-            IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
             ioAddInoutService.dealProcess(orderEntity);
             checkInoutService.check(addOrderRequest.getBillNo());
             return ResultVOUtils.success("提交成功！");
@@ -313,6 +319,17 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success("提交成功！");
     }
 
+    public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) {
+        if (orderEntity.getStatus() == ORDER_STATUS_CHECK_PROCESS || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESS
+                || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESSING) {
+            return ResultVOUtils.error(500, "提交失败，单据正在处理，请稍后刷新查看！");
+        }
+        if (orderEntity.getStatus() != 1 && orderEntity.getStatus() != 3 && orderEntity.getStatus() != 4 && orderEntity.getStatus() != 6) {
+            return ResultVOUtils.error(500, "提交失败，单据已提交，请稍后刷新查看！");
+        }
+        return null;
+    }
+
     //带配货-立即提交
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/waitAllocate/submitOrderWeb")
@@ -321,6 +338,10 @@ public class IoOrderController extends BaseController {
 
         //校验单据是否已完成
         IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
+        BaseResponse tempResponse = checkSubmitEnable(orderEntity);
+        if (tempResponse != null)
+            return tempResponse;
+
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo());
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo());
 
@@ -368,6 +389,10 @@ public class IoOrderController extends BaseController {
     @PostMapping("udiwms/inout/order/delete")
     @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) {
+        IoOrderEntity orderEntity = orderService.findByBillNo(deleteRequest.getBillNo());
+        if (orderEntity.getStatus() != 1 && orderEntity.getStatus() != 3 && orderEntity.getStatus() != 4 && orderEntity.getStatus() != 6) {
+            return ResultVOUtils.error(500, "单据已提交无法删除！");
+        }
         orderService.deleteByBillNo(deleteRequest.getBillNo());
         orderDetailBizService.deleteByOrderId(deleteRequest.getBillNo());
         orderDetailCodeService.deleteByOrderId(deleteRequest.getBillNo());
@@ -652,4 +677,108 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+
+    @Resource
+    GennerOrderUtils gennerOrderUtils;
+    @Resource
+    InvWarehouseService invWarehouseService;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/stock/order/change")
+    public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) {
+
+
+        IoOrderEntity originOrder = orderService.findByBillNo(addOrderChangeRequest.getOrderId());
+        IoOrderEntity newOrder = new IoOrderEntity();
+        List<IoCodeEntity> originCodes = codeService.findByOrderId(originOrder.getBillNo());
+        newOrder.setCreateTime(new Date());
+        newOrder.setFromCorp(addOrderChangeRequest.getFromCorp());
+
+        newOrder.setFromInvCode(addOrderChangeRequest.getFromInvCode());
+        if (addOrderChangeRequest.getFromInvCode() != null) {
+            InvWarehouseEntity fromInv = invWarehouseService.findByInvSubByCode(addOrderChangeRequest.getFromInvCode());
+            newOrder.setFromDeptCode(fromInv.getParentId());
+        }
+
+
+        InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderChangeRequest.getInvCode());
+        newOrder.setInvCode(addOrderChangeRequest.getInvCode());
+        newOrder.setDeptCode(invWarehouseEntity.getParentId());
+        newOrder.setCorpOrderId(CustomUtil.getId() + "x");
+
+        BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderChangeRequest.getAction());
+        newOrder.setAction(addOrderChangeRequest.getAction());
+        newOrder.setMainAction(basicBussinessTypeEntity.getMainAction());
+        newOrder.setRelKey(originOrder.getRelKey());
+        newOrder.setExportStatus(0);  //设置导出状态为未导出
+        newOrder.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);//设置单据未草稿状态
+        newOrder.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); //设置验收状态为未验收
+        newOrder.setFromType(ConstantStatus.FROM_COPY);
+        newOrder.setOrderType(2);
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderChangeRequest.getAction());
+        String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
+        String supplementOrderNo = orderNo;
+        newOrder.setBillNo(supplementOrderNo);
+        newOrder.setReplicateNo(null); //新单据的复制单号置空
+        originOrder.setReplicateNo(orderNo);
+        List<IoCodeTempEntity> supplementCodes = new ArrayList<>();
+
+        List<IoCodeEntity> products = addOrderChangeRequest.getProducts();
+        List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(originOrder.getBillNo());
+        // 计算出两个集合之间产品批次号组成的差异
+        List<IoOrderDetailBizEntity> IoStatDayEntityList = orderDetailBizEntities.stream()
+                .filter(comment -> products.stream()
+                        .anyMatch(p -> Objects.equals(p.getBatchNo(), comment.getBatchNo()) // 使用 Objects.equals 来进行非空判断
+                                && Objects.equals(p.getRelId(), comment.getBindRlFk())))
+                .collect(Collectors.toList());
+        //生成业务单
+        if (CollUtil.isNotEmpty(IoStatDayEntityList)) {
+            for (IoOrderDetailBizEntity orderDetailBizEntity : IoStatDayEntityList) {
+                orderDetailBizEntity.setOrderIdFk(newOrder.getBillNo());
+                orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId());
+                orderDetailBizService.insert(orderDetailBizEntity);
+            }
+        }
+
+
+        originCodes.forEach(
+                code -> {
+                    //复制选中的产品
+                    for (IoCodeEntity product : products) {
+                        if (product.getRelId().equals(code.getRelId())) {
+                            if ((StrUtil.isNotBlank(product.getBatchNo()) && StrUtil.isNotBlank(code.getBatchNo()) && product.getBatchNo().equals(code.getBatchNo()))
+                                    || (StrUtil.isBlank(product.getBatchNo()) && StrUtil.isBlank(code.getBatchNo()))) {
+                                IoCodeTempEntity supplementCode = new IoCodeTempEntity();
+                                BeanUtil.copyProperties(code, supplementCode);
+                                supplementCode.setInvCode(newOrder.getInvCode());
+                                supplementCode.setDeptCode(newOrder.getDeptCode());
+                                supplementCode.setOrderId(newOrder.getBillNo());
+                                supplementCode.setCorpOrderId(newOrder.getCorpOrderId());
+                                //查询补单设置
+                                supplementCode.setAction(newOrder.getAction());
+                                supplementCode.setMainAction(newOrder.getMainAction());
+                                supplementCode.setUpdateTime(new Date());
+                                supplementCode.setCreateTime(new Date());
+                                supplementCode.setId(null);
+                                supplementCodes.add(supplementCode);
+                                break;
+                            }
+                        }
+                    }
+                }
+        );
+        newOrder.setUpdateTime(new Date());
+        orderService.insertOrder(newOrder);
+        codeTempService.insertBatch(supplementCodes);
+        orderService.update(originOrder);
+
+        ioAddInoutService.dealProcess(newOrder);
+        //不需要手动校验，则走正常单据校验处理流程
+        if (!ioCheckInoutService.checkManual(newOrder.getBillNo())) {
+            ioCheckInoutService.check(newOrder.getBillNo());
+        }
+
+        return ResultVOUtils.success();
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.glxp.api.controller.inout;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@@ -27,6 +28,7 @@ import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
 import com.glxp.api.entity.thrsys.ThrOrderEntity;
 import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.api.req.inout.*;
+import com.glxp.api.req.inv.FilterInvoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest;
 import com.glxp.api.res.PageSimpleResponse;
@@ -54,6 +56,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -570,19 +573,28 @@ public class IoOrderDetailBizController extends BaseController {
         IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
 
         FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
+        FilterOrderDetailBizRequest filterOrderDetailBizRequest1 = new FilterOrderDetailBizRequest();
+        filterOrderDetailBizRequest1.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
+        filterOrderDetailBizRequest1.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
 
         filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
+        filterOrderDetailBizRequest.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
+        filterOrderDetailBizRequest.setRelId(ioOrderInvoiceEntity.getBizIdFk());
 
         ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
-
+        ioOrderDetailBizEntity.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
+        ioOrderDetailBizEntity.setBindRlFk(ioOrderInvoiceEntity.getBizIdFk());
         ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().longValue());
         ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId() + "");
         List<IoOrderInvoiceResponse> list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest);
+        List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = orderDetailBizService.filterListInv(filterOrderDetailBizRequest1);
         if (list.size() == 0) {
             ioOrderDetailBizEntity.setRegStatus(false);
+        } else {
+            ioOrderDetailBizEntity.setRegStatus(true);
         }
         orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(ioOrderInvoiceResponses);
 
 
     }
@@ -653,12 +665,25 @@ public class IoOrderDetailBizController extends BaseController {
 
     }
 
+
+    @GetMapping("/udiwms/inout/biz/parseInvoice")
+    public BaseResponse parseInvoice(String code) {
+        List<String> list = Arrays.asList(code.split(","));
+        FilterInvoiceRequest filterInvoiceRequest = new FilterInvoiceRequest();
+        filterInvoiceRequest.setType(list.get(1));
+        filterInvoiceRequest.setInvoiceCode(list.get(2));
+        filterInvoiceRequest.setInvoiceEncode(list.get(3));
+        filterInvoiceRequest.setPrice(new BigDecimal(list.get(4)));
+        filterInvoiceRequest.setInvoiceDate(DateUtil.formatDateTime(DateUtil.parse(list.get(5), "yyyyMMdd")));
+        return ResultVOUtils.success(filterInvoiceRequest);
+    }
+
+
     @PostMapping("/udiwms/inout/biz/updateorderBiz")
-    public BaseResponse updateorderBiz(@RequestBody List<IoOrderDetailCodeEntity> list) {
+    public BaseResponse updateorderBiz(@RequestBody InvoiceRequest invoiceRequest) {
         String billNo = null;
-        for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : list) {
-            ioOrderDetailBizEntity.setRegStatus(true);
-            orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+        for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : invoiceRequest.getList()) {
+            ioOrderInvoiceService.updateRegStatus(ioOrderDetailBizEntity);
             billNo = ioOrderDetailBizEntity.getOrderIdFk();
         }
         IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
@@ -677,26 +702,26 @@ public class IoOrderDetailBizController extends BaseController {
      */
     @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList")
     public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
-        List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest);
-        for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
-            if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
-                ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
+        List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
+        List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderDetailBizRequest.getOrderIdFk());
+        for (IoOrderDetailCodeResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) {
+            if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
+                orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
             }
             String msg = "";
-            IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
-            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());
-            ioOrderInvoiceEntity.setBatchNo(ioOrderDetailCodeRespons.getBatchNo());
-            ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailCodeRespons.getBindRlFk().toString());
-            List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
-            for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
-                if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) {
-                    msg += "," + obj.getInvoiceEncode();
+            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+                if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()))
+                        && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) {
+                    orderDetailCodeEntity.setRegStatus(true);
+                    if (StrUtil.isNotEmpty(orderInvoiceEntity.getInvoiceEncode())) {
+                        msg += "," + orderInvoiceEntity.getInvoiceEncode();
+                    }
                 }
             }
             if (msg.length() > 1) {
                 msg = msg.substring(1);
             }
-            ioOrderDetailCodeRespons.setInvoiceCodes(msg);
+            orderDetailCodeEntity.setInvoiceCodes(msg);
         }
         PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(ioOrderDetailCodeResponses);
         return ResultVOUtils.page(pageInfo);

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

@@ -327,17 +327,20 @@ public class IoOrderReviewController extends BaseController {
         if (StrUtil.isNotEmpty(code)) {
             code = code.replace("\r\n", "");
         }
-
         if (code.endsWith("\u001D")) {
             code = code.replace("\u001D", "");
         }
-
         for (IoCodeEntity checkOrderCodesBean : codesList) {
-            if (checkOrderCodesBean.getCode().toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) {
-                if (checkOrderCodesBean.getStatus() == Constant.DB_CHECK_ED
-                        && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) {
+            String checkCode = checkOrderCodesBean.getCode();
+            if (checkCode.endsWith("\u001D")) {
+                checkCode = checkCode.replace("\u001D", "");
+            }
+            if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) {
+                if (StrUtil.isNotEmpty(checkOrderCodesBean.getSerialNo())) {
+                    if (checkOrderCodesBean.getScanCount() > 0) {
                         return Constant.CHECK_REPEAT;
                     }
+                }
                 int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode());
                 if (curCount == IntUtil.value(checkOrderCodesBean.getReCount())) {
                     checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);
@@ -351,8 +354,18 @@ public class IoOrderReviewController extends BaseController {
 
     public IoCodeEntity isExit(List<IoCodeEntity> codeList, String code) {
         if (CollUtil.isNotEmpty(codeList)) {
+            if (StrUtil.isNotEmpty(code)) {
+                code = code.replace("\r\n", "");
+            }
+            if (code.endsWith("\u001D")) {
+                code = code.replace("\u001D", "");
+            }
             for (IoCodeEntity codeEntity : codeList) {
-                if (codeEntity.getCode().equals(code)) {
+                String checkCode = codeEntity.getCode();
+                if (checkCode.endsWith("\u001D")) {
+                    checkCode = checkCode.replace("\u001D", "");
+                }
+                if (checkCode.equals(code)) {
                     return codeEntity;
                 }
             }

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -10,11 +10,10 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.InnerOrderEntity;
-import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
+import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
-import com.glxp.api.entity.system.SystemPDFModuleEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
 import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
 import com.glxp.api.req.inv.*;
@@ -42,7 +41,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 public class InvInnerOrderPrintController {

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -22,6 +22,8 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
 
     List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
 
+    List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
+
     /**
      * 查询单据实体列表
      *

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -23,7 +23,10 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
 
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
+    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
+
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
     /**

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -87,6 +87,8 @@ public class UdiProductEntity {
 
     private boolean groupBuy;
 
+    private Long uid;
+
 
     public Boolean getAllowNoBatch() {
         if (allowNoBatch == null)

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

@@ -137,7 +137,7 @@ public class IoCodeEntity implements Serializable {
     private Date createTime;
 
     @TableField(exist = false)
-    private int status;     //条码校验状态
+    private Integer status;     //条码校验状态
     @TableField(exist = false)
     private int scanCount;
 
@@ -148,6 +148,7 @@ public class IoCodeEntity implements Serializable {
             return 0;
         return count;
     }
+
     @JsonIgnore
     public int getMyReCount() {
         if (reCount == null) {

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @TableName(value = "io_order_detail_code")
@@ -194,6 +195,7 @@ public class IoOrderDetailCodeEntity {
     @TableField(value = "regStatus")
     private boolean regStatus;
 
-
+    @TableField(value = "updateTime")
+    private Date updateTime;
 
 }

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

@@ -109,7 +109,7 @@ public class IoOrderInvoiceEntity {
     private Long bizIdFk;
 
     @TableField(exist = false)
-    private Integer regId;
+    private Long regId;
 
 
     @TableField(exist = false)

src/main/java/com/glxp/api/req/auth/PCLoginRequest.java

@@ -13,7 +13,6 @@ public class PCLoginRequest {
     @NotEmpty(message = "密码不能为空")
     private String password;
 
-    @NotEmpty(message = "机器码不能为空")
     private String machineInfo;
 
 }

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

@@ -6,7 +6,7 @@ import java.util.List;
 
 @Data
 public class BasicCorpsExportRequest {
-    List<Integer> ids;
+    List<Long> ids;
     private Integer id;
     private String key;
     private String unitId;

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

@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 public class BasicUnitMaintainFilterRequest extends ListPageRequest {
 
-    private Integer id;
+    private Long id;
     private String key;
     private String unitId;
     private String name;

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

@@ -0,0 +1,27 @@
+package com.glxp.api.req.inout;
+
+import com.glxp.api.entity.inout.IoCodeEntity;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class AddOrderChangeRequest {
+
+    private String corpOrderId;
+    private String mainAction;
+    private String action;
+    private String fromCorp;
+    private String fromDeptCode;
+    private String fromInvCode;
+    private Integer fromType;
+    private String actDate;
+    private String deptCode;
+    private String invCode;
+    private String orderId;
+
+    private List<IoCodeEntity> products;
+
+
+}

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

@@ -188,5 +188,6 @@ public class FilterOrderRequest extends ListPageRequest {
     private String supInoivceSearch;
     private List<String> invoiceActions1;
     private List<String> invoiceActions2;
+    private String orderBy;
 
 }

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

@@ -0,0 +1,21 @@
+package com.glxp.api.req.inout;
+
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : zhangsan
+ * @date : 2023/6/8 15:15
+ * @modyified By :
+ */
+
+@Data
+public class InvoiceRequest {
+    private List<IoOrderDetailCodeEntity> list;
+    private String key;
+
+
+
+}

src/main/java/com/glxp/api/req/inv/FilterInvoiceRequest.java

@@ -0,0 +1,41 @@
+package com.glxp.api.req.inv;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 查询库存预警消息参数
+ */
+@Data
+public class FilterInvoiceRequest extends ListPageRequest {
+
+
+    /**
+     * 预警类型：10：增值税电子普通发票；01：增值税专用发票；04：增值税普通发票；32：电子发票(普通发票)；31：电子发票(增值税专用发票)
+     */
+    private String type;
+
+    /**
+     * 发票代码
+     */
+    private String invoiceCode;
+
+    /**
+     * 发票编码
+     */
+    private String invoiceEncode;
+
+    /**
+     * 开票日期
+     */
+    private String invoiceDate;
+
+
+    /**
+     * 发票价格
+     */
+    private BigDecimal price;
+
+}

src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java

@@ -99,5 +99,6 @@ public class PurOrderRequest extends ListPageRequest {
     private String startAuditDate;
     private String endAuditDate;
     private Integer dealStatus;
+    private String orderBy;
 
 }

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

@@ -94,4 +94,6 @@ public class UdiRlSupResponse {
     private String classifyName;
 
     private boolean groupBuy;           //是否集采产品
+
+    private Long uid;
 }

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

@@ -252,6 +252,8 @@ public class IoOrderResponse {
     private String relKey;      //关联单据唯一键
     private Integer suppleCount; //补单次数
 
+    private int invoiceStatus;//发票登记状态0：未登记，1：未全部登记；2：已全部登记
+
 
     public String getFromName() {
 

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -333,6 +333,7 @@ public class IoAddInoutService {
 
                     UpdateWrapper<IoOrderDetailCodeEntity> updateWrapper = new UpdateWrapper<>();
                     updateWrapper.set("count", orderDetailCodeEntity.getCount()).set("reCount", orderDetailCodeEntity.getReCount());
+                    orderDetailCodeEntity.setUpdateTime(new Date());
                     orderDetailCodeDao.updateCount(orderDetailCodeEntity);
                     isUpdate = true;
                     break;

src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java

@@ -281,7 +281,6 @@ public class IoChangeInoutService {
                     }
                 }
             }
-
             //根据单据设置状态 1:草稿
             if (bussinessChangeTypeEntity.getAuditStatus() == 1) {
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.inout;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.thread.ThreadUtil;
@@ -9,6 +10,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
+import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.UdiEntity;
@@ -42,6 +44,8 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
 
+import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS;
+
 /**
  * 校验出入库服务
  */
@@ -66,6 +70,9 @@ public class IoCheckInoutService {
     private final IoOrderDetailBizService orderDetailBizService;
     @Resource
     IoOrderDetailResultService orderDetailResultService;
+    @Resource
+    IoOrderDetailCodeDao orderDetailCodeDao;
+
     @Resource
     InvPreinDetailService invPreinDetailService;
     @Resource
@@ -125,8 +132,14 @@ public class IoCheckInoutService {
     public void check(String orderId) {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         //过滤非未校验或校验异常
-        if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_FAIL)
+        if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_PROCESS &&
+                orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_FAIL)
             return;
+
+        orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS);
+        orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+        orderService.update(orderEntity);
+
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
         if (!bussinessTypeEntity.isCheckEnable()) {
             unCheckFirstFinish(orderEntity);
@@ -295,6 +308,7 @@ public class IoCheckInoutService {
             orderDetailBizService.deleteByOrderId(orderEntity.getBillNo());
         }
         orderDetailResultService.deleteByOrderId(orderEntity.getBillNo());
+        if (!orderDetailBizService.isExit(orderEntity.getBillNo())) {
             orderDetailCodeEntities.forEach(orderDetailCodeEntity ->
             {
                 //生成业务单据
@@ -303,8 +317,11 @@ public class IoCheckInoutService {
                 orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount());
                 orderDetailBizEntity.setId(null);
                 orderDetailBizService.insert(orderDetailBizEntity);
+            });
 
-
+        }
+        orderDetailCodeEntities.forEach(orderDetailCodeEntity ->
+        {
             //生成单据结果
             IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity();
             BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity);
@@ -333,6 +350,9 @@ public class IoCheckInoutService {
         checkThird(orderEntity);
     }
 
+    @Resource
+    IoOrderInvoiceService orderInvoiceService;
+
 
     //一次校验完成
     public void checkFirstFinish(IoOrderEntity orderEntity) {
@@ -402,6 +422,7 @@ public class IoCheckInoutService {
                     if (checkCount(bizEntity, codeEntity) == null) {
                         bizEntity.setCheckSuccess(true);
                         codeEntity.setCheckSuccess(true);
+                        codeEntity.setPrice(bizEntity.getPrice());
                     }
                     break;
                 }
@@ -430,6 +451,8 @@ public class IoCheckInoutService {
                 orderDetailResultService.insert(orderDetailResultEntity);
             }
 
+//            orderDetailCodeDao.updateBatchById(orderDetailCodeEntities);
+
             //临时表转正式表
             List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
             for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
@@ -451,6 +474,7 @@ public class IoCheckInoutService {
         }
     }
 
+
     //业务单正向校验
     public String bizNoPiCheck(List<IoOrderDetailBizEntity> orderDetailBizEntities, IoOrderEntity orderEntity) {
 
@@ -1008,4 +1032,6 @@ public class IoCheckInoutService {
         }
         return bizEntity.getCoName() + "数量不匹配！";
     }
+
+
 }

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -38,11 +38,14 @@ public interface IoOrderDetailBizService {
 
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
+    List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
+
     IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);
 
     List<IoOrderDetailBizEntity> checkOrderList(String orderId);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
+
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
     Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);

src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java

@@ -2,8 +2,10 @@ package com.glxp.api.service.inout;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.inout.IoCodeRelEntity;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
 
 import java.util.List;
 
@@ -20,5 +22,10 @@ public interface IoOrderInvoiceService extends IService<IoOrderInvoiceEntity> {
 
     List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest);
 
+    // 更新发票状态
+    boolean updateRegStatus(IoOrderDetailCodeEntity orderDetailCodeEntity);
 
+    IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse);
+
+    boolean findRegStausByProduct(String billNo);
 }

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -56,6 +56,8 @@ public interface IoOrderService {
 
     List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
 
+    List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
+
     /**
      * 查询单据列表
      *

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -41,7 +41,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
 
     @Override
     public List<IoOrderDetailBizEntity> findByOrderId(String orderId) {
-        return ioOrderDetailBizDao.selectList(new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk", orderId));
+        return ioOrderDetailBizDao.selectList(new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk", orderId).orderByDesc("updateTime"));
     }
 
     @Override
@@ -132,6 +132,17 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest);
     }
 
+    @Override
+    public List<IoOrderDetailCodeResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
+        if (null == OrderDetailCodeRequest) {
+            return Collections.emptyList();
+        }
+        if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) {
+            PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit());
+        }
+        return ioOrderDetailBizDao.getfilterOrderList(OrderDetailCodeRequest);
+    }
+
     @Override
     public IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk) {
         QueryWrapper<IoOrderDetailBizEntity> ew = new QueryWrapper<>();

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -40,7 +40,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
 
     @Override
     public List<IoOrderDetailCodeEntity> findByOrderId(String orderId) {
-        return ioOrderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId));
+        return ioOrderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId).orderByDesc("updateTime"));
     }
 
     @Override

src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java

@@ -1,12 +1,17 @@
 package com.glxp.api.service.inout.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.inout.IoCodeRelMapper;
+import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
 import com.glxp.api.entity.inout.IoCodeRelEntity;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +19,7 @@ import com.glxp.api.service.inout.IoOrderInvoiceService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -22,6 +28,8 @@ import java.util.List;
 public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper, IoOrderInvoiceEntity> implements IoOrderInvoiceService {
     @Resource
     IoOrderInvoiceMapper ioOrderInvoiceMapper;
+    @Resource
+    IoOrderDetailCodeDao orderDetailCodeDao;
 
     @Override
     public List<IoOrderInvoiceEntity> findByBillNo(String orderIdFk) {
@@ -51,4 +59,69 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper,
     public List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
         return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceRequest);
     }
+
+    @Override
+    public boolean updateRegStatus(IoOrderDetailCodeEntity orderDetailCodeEntity) {
+        IoOrderInvoiceRequest orderInvoiceRequest = new IoOrderInvoiceRequest();
+        orderInvoiceRequest.setBatchNo(orderDetailCodeEntity.getBatchNo());
+        orderInvoiceRequest.setBindRlFk(orderDetailCodeEntity.getBindRlFk() + "");
+        List<IoOrderInvoiceEntity> orderInvoiceEntities = selectOrderInvoice(orderInvoiceRequest);
+        if (CollUtil.isNotEmpty(orderInvoiceEntities)) {
+//            BigDecimal amount = new BigDecimal(0.00);
+//            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+//                amount = amount.add(new BigDecimal(orderInvoiceEntity.getPrice()));
+//            }
+//            if (amount.compareTo(orderDetailCodeEntity.getPrice()) == 0) {
+//                orderDetailCodeEntity.setRegStatus(true);
+//            } else {
+//                orderDetailCodeEntity.setRegStatus(false);
+//            }
+            orderDetailCodeEntity.setRegStatus(true);
+        } else {
+            orderDetailCodeEntity.setRegStatus(false);
+        }
+        orderDetailCodeDao.updateById(orderDetailCodeEntity);
+        return true;
+    }
+
+    @Override
+    public IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse) {
+        List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceMapper.selectList(new QueryWrapper<IoOrderInvoiceEntity>().eq("orderIdFk", orderResponse.getBillNo()));
+        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderResponse.getBillNo()));
+        if (CollUtil.isNotEmpty(orderDetailCodeEntities)) {
+            BigDecimal amount = new BigDecimal(0.00);
+            for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) {
+                for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+                    if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo()))
+                            && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) {
+                        orderDetailCodeEntity.setRegStatus(true);
+                    }
+                }
+                if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
+                    amount = amount.add(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
+                }
+            }
+            orderResponse.setAllAmount(amount);
+        } else
+            return orderResponse;
+
+        int isAll = 0;
+        for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) {
+            if (orderDetailCodeEntity.isRegStatus()) {
+                isAll++;
+            }
+        }
+        if (orderDetailCodeEntities.size() == isAll)
+            orderResponse.setInvoiceStatus(2);//已全部登记
+        else if(isAll >0){
+            orderResponse.setInvoiceStatus(1);//未全部登记
+        }
+        return orderResponse;
+
+    }
+
+    @Override
+    public boolean findRegStausByProduct(String billNo) {
+        return false;
+    }
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -276,6 +276,7 @@ public class IoOrderServiceImpl implements IoOrderService {
             }
         }
 
+
         return 0;
     }
 
@@ -545,6 +546,17 @@ public class IoOrderServiceImpl implements IoOrderService {
         return orderDao.getfilterList(filterOrderRequest);
     }
 
+    @Override
+    public List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest) {
+        if (null == filterOrderRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        }
+        return orderDao.getfilterOrderList(filterOrderRequest);
+    }
+
     @Override
     public List<IoOrderEntity> filterOrderList(FilterOrderRequest filterOrderRequest) {
         if (null == filterOrderRequest) {

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java

@@ -116,7 +116,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
 
             String udiCode = "#" + udiProductEntity.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
-                    "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
+                    "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#"  + "#" ;
             udiCode = udiCode.replaceAll("#null", "#");
             innerOrderPrintEntity.setUdiCode(udiCode);
             invInnerOrderPrintDao.insert(innerOrderPrintEntity);
@@ -165,12 +165,10 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
         if (innerOrderQRCodeTextPDFTemplateRequest.getOrderId() != null) {
             filterStockprintRequest.setSOrderId(innerOrderQRCodeTextPDFTemplateRequest.getOrderId());
             deleteStPrintTempRequest.setStockOrderFk(innerOrderQRCodeTextPDFTemplateRequest.getOrderId() + "");
-
         } else {
             deleteStPrintTempRequest.setPrintCodeIdFk(innerOrderQRCodeTextPDFTemplateRequest.getQueryId());
             filterStockprintRequest.setId(innerOrderQRCodeTextPDFTemplateRequest.getQueryId());
         }
-
         innerOrderPdfTempService.delete(deleteStPrintTempRequest);
         List<InnerOrderPrintResponse> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterStockprintRequest);
         if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
@@ -285,7 +283,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
 
             String udiCode = "#" + obj.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
-                    "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
+                    "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + "#" ;
             udiCode = udiCode.replaceAll("#null", "#");
             innerOrderPrintEntity.setUdiCode(udiCode);
             invInnerOrderPrintDao.insert(innerOrderPrintEntity);

src/main/java/com/glxp/api/util/IntUtil.java

@@ -15,4 +15,11 @@ public class IntUtil {
         else return value.longValue();
 
     }
+
+
+    public static boolean value(Boolean value) {
+        if (value == null)
+            return false;
+        else return value;
+    }
 }

src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java

@@ -20,24 +20,37 @@ public class UdiCalCountUtil {
 //    }
 
     public int getActCount(UdiRelevanceResponse udiRelevanceResponse) {
-        int actCount;
-        if (!udiRelevanceResponse.getUseDy() && (udiRelevanceResponse.getDiType() == null || udiRelevanceResponse.getDiType() != 2)) {
-            if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
-                actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
-            } else {
+
+        //启用使用单元
+        if (udiRelevanceResponse.getUseDy()) {
+            if (udiRelevanceResponse.getDiType() == 1) {
+                if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) {
+                    udiRelevanceResponse.setZxxsbzbhsydysl(1);
+                }
+                return udiRelevanceResponse.getZxxsbzbhsydysl();
+            } else if (udiRelevanceResponse.getDiType() == 4) {
                 if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
                     udiRelevanceResponse.setBhzxxsbzsl(1);
                 }
                 if (udiRelevanceResponse.getZxxsbzbhsydysl() == null || udiRelevanceResponse.getZxxsbzbhsydysl() == 0) {
                     udiRelevanceResponse.setZxxsbzbhsydysl(1);
                 }
-                actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
+                return udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
+            } else {
+                return udiRelevanceResponse.getBhzxxsbzsl();
             }
+        } else {//不启用使用单元
+            if (udiRelevanceResponse.getDiType() == 1) {
+                return 1;
+            } else if (udiRelevanceResponse.getDiType() == 4) {
+                if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
+                    udiRelevanceResponse.setBhzxxsbzsl(1);
+                }
+                return udiRelevanceResponse.getBhzxxsbzsl();
             } else {
-            actCount = udiRelevanceResponse.getBhzxxsbzsl();
+                return udiRelevanceResponse.getBhzxxsbzsl();
+            }
         }
-
-        return actCount;
     }
 
     public int getActCount(IoCodeTempEntity codeTempEntity) {

src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml

@@ -390,7 +390,7 @@
     </select>
 
     <select id="getMaxSpaceCode" resultType="java.lang.String">
-        select max(CONVERT(code, signed))
+        select max(CONVERT(code, signed)) from auth_space
         <where>
             <if test="invCode != null and invCode != ''">
                 and invWarehouseCode = #{invCode}

src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

@@ -793,9 +793,6 @@
             <if test="updateTime != null">
                 updateTime=#{updateTime},
             </if>
-            <if test="groupBuy != null">
-                groupBuy=#{groupBuy},
-            </if>
         </trim>
         where id = #{id}
     </update>

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -105,7 +105,8 @@
                basic_products.basicPrductRemak6,
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
---                basic_products.groupBuy,
+               basic_udirel.groupBuy,
+               basic_udirel.id as uid,
                basic_corp.name      companyName
         FROM company_product_relevance
                  inner JOIN basic_udirel

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -133,7 +133,14 @@
                 </if>
             </if>
         </where>
-        order by createTime desc
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by updateTime desc
+            </otherwise>
+        </choose>
     </select>
 
     <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderResponse">
@@ -149,10 +156,14 @@
                (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
                (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
                (select name from basic_corp bc where bc.erpId = io.customerId)          customerName,
-        (SELECT count(*) FROM io_order_detail_code  WHERE io_order_detail_code.orderIdFk = io.billNo
+               (SELECT count(*)
+                FROM io_order_detail_code
+                WHERE io_order_detail_code.orderIdFk = io.billNo
                   and io_order_detail_code.regStatus = 1
                        ) AS                                                             allCout,
-        (SELECT count(*) FROM io_order_detail_code  WHERE io_order_detail_code.orderIdFk = io.billNo
+               (SELECT count(*)
+                FROM io_order_detail_code
+                WHERE io_order_detail_code.orderIdFk = io.billNo
                   and io_order_detail_code.regStatus = 0
                        ) As                                                             partCount
         from io_order as io
@@ -274,12 +285,9 @@
                 </if>
             </if>
         </where>
-        order by createTime desc
     </select>
 
 
-
-
     <select id="filterOrderList" resultType="com.glxp.api.entity.inout.IoOrderEntity">
         select *
         from io_order
@@ -330,7 +338,6 @@
                 ]]>
             </if>
         </where>
-        order by createTime desc
     </select>
 
 
@@ -407,4 +414,146 @@
         from io_order
         where billNo = #{billNo}
     </select>
+
+
+    <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
+        SELECT io.*,
+               bus.NAME AS billTypeName,
+               ad.NAME  AS deptName,
+               aw.NAME  AS invName,
+               bc.NAME  AS fromCorpName
+        FROM io_order io
+                     LEFT JOIN basic_bussiness_type bus ON io.action = bus.action
+                     LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE
+                     LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE
+                     LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
+                     LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
+        <where>
+            <if test="id != null and id != ''">
+                AND io.id = #{id}
+            </if>
+            <if test="corpName != null and corpName != ''">
+                AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
+                    concat('%', #{corpName}, '%')
+            </if>
+            <if test="action != null and action != ''">
+                AND io.action = #{action}
+            </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND io.mainAction = #{mainAction}
+            </if>
+            <if test="billNo != null and billNo != ''">
+                AND io.billNo like concat('%', #{billNo}, '%')
+            </if>
+            <if test="corpOrderId != null and corpOrderId != ''">
+                AND io.corpOrderId = #{corpOrderId}
+            </if>
+            <if test="fromCorp != null and fromCorp != ''">
+                AND io.fromCorp = #{fromCorp}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND io.deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND io.invCode = #{invCode}
+            </if>
+            <if test="busType != null">
+                AND io.busType = #{busType}
+            </if>
+            <if test="inCodeStatus != null">
+                AND io.inCodeStatus = #{inCodeStatus}
+            </if>
+            <if test="relKey != null">
+                AND io.relKey = #{relKey}
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+            </if>
+            <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
+                AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
+            </if>
+            <if test="actions != null and actions.size() != 0">
+                AND io.`action` in
+                <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="sourceTypes != null and sourceTypes.size() != 0">
+                AND io.fromType in
+                <foreach collection="sourceTypes" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="statuses != null and statuses.size() != 0">
+                AND io.status in
+                <foreach collection="statuses" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="dealStatuses != null and dealStatuses.size() != 0">
+                AND io.dealStatus in
+                <foreach collection="dealStatuses" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="orderIds != null and orderIds.size() != 0">
+                AND io.billNo in
+                <foreach collection="orderIds" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="status != null">
+                AND io.status = #{status}
+            </if>
+            <if test="orderType != null">
+                AND io.orderType = #{orderType}
+            </if>
+
+            <if test="supInoivceSearch != null">
+                <if test="invoiceActions1 != null and invoiceActions2 == null">
+                    AND (io.`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and io.status = 10)
+                </if>
+
+                <if test="invoiceActions1 == null and invoiceActions2 != null">
+                    and (
+                            io.`action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and io.status = 7
+                            )
+                </if>
+
+                <if test="invoiceActions1 != null and invoiceActions2 != null">
+                    AND ((io.`action` in
+                    <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and io.status = 10)
+                            or (
+                            io.`action` in
+                    <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                    and io.status = 7)
+                            )
+                </if>
+            </if>
+        </where>
+        GROUP BY io.id
+        <choose>
+            <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
+                order by ${orderBy} ${sort}
+            </when>
+            <otherwise>
+                order by updateTime desc
+            </otherwise>
+        </choose>
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -50,9 +50,7 @@
 
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        SELECT ic.*,
-               (select cpmctymc from basic_products where basic_products.uuid = bu.uuid GROUP BY	basic_products.uuid) cpmctymc,
-               (select ggxh from basic_products where basic_products.uuid = bu.uuid GROUP BY	basic_products.uuid)     ggxh
+        SELECT ic.*, cpmctymc, ggxh
         FROM io_order_invoice ic
                      LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
                      LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
@@ -72,13 +70,15 @@
             <if test="batchNo == null || batchNo == ''">
                 AND (ic.batchNo is null or ic.batchNo = '')
             </if>
-
         </where>
         GROUP BY ic.id
     </select>
 
-    <select id="selectByinvoiceId" parameterType="java.lang.Long"  resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        select * from io_order_invoice where id= #{id}
+    <select id="selectByinvoiceId" parameterType="java.lang.Long"
+            resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
+        select *
+        from io_order_invoice
+        where id = #{id}
     </select>
 
     <select id="selectOrderDetailBiz" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity">
@@ -111,4 +111,21 @@
             </if>
         </where>
     </select>
+
+    <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
+        select *
+        from io_order_detail_code
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+            <if test="relId != null">
+                AND bindRlFk = #{relId}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+        </where>
+        group by io_order_detail_code.id
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml

@@ -33,7 +33,8 @@
     <update id="updateCount">
         update io_order_detail_code
         set count   = #{count},
-            reCount = #{reCount}
+            reCount = #{reCount},
+            updateTime = #{updateTime}
         where id = #{id}
     </update>
 

src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml

@@ -12,15 +12,11 @@
 
     <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
-        SELECT ic.*,
-               (select cpmctymc
-                from basic_products
-                where basic_products.uuid = bu.uuid
-                GROUP BY basic_products.uuid)                                                                     cpmctymc,
-               (select ggxh from basic_products where basic_products.uuid = bu.uuid GROUP BY basic_products.uuid) ggxh
+        SELECT ic.*,bp.cpmctymc,bp.ggxh
         FROM io_order_invoice ic
         LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
         LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        and bp.id >1
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -102,5 +102,14 @@
                 AND createUser = #{createUser}
             </if>
         </where>
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by pur_order.updateTime desc
+            </otherwise>
+        </choose>
+
     </select>
 </mapper>

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

@@ -1,397 +1,418 @@
 # #   字段新增   （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
 #
 #
-# CALL Pro_Temp_ColumnWork('basic_download_status', 'cacheFilePath',
-#                          'varchar(255) ', 1);
-#
-# CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime',
-#                          'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1);
-# CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime',
-#                          'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1);
-# CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'updateTime',
-#                          'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1);
-# CALL Pro_Temp_ColumnWork('auth_dept_user', 'updateTime',
-#                          'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1);
-#
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'department', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'warehouseDict', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'userData', 'tinyint ', 1);
-#
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeLost', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeRel', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'dbDiCompany', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'inCodeStatus', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'processStatus', 'tinyint ', 1);
-#
-# CALL Pro_Temp_ColumnWork('io_order', 'suppleCount', 'tinyint ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'relKey', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'checkTime', 'datetime ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'checkUser', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'varchar(255) ', 1);
-#
-#
-#
-# CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255) ', 1);
-#
-# CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3);
-# CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3);
-#
-# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1);
-#
-# CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255)  ', 1);
-# CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255)  ', 1);
-# CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255)  ', 1);
-#
-# CALL Pro_Temp_ColumnWork('basic_products', 'groupBuy', 'tinyint  ', 1);
-#
-#
-#
-# CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1);
-#
-#
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1);
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'certIdFk', 'varchar(255)', 1);
-#
-# CALL Pro_Temp_ColumnWork('basic_products', 'allowNoSerial', 'tinyint', 1);
-#
-#
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'busType', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inStock', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'actionType', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckEnable', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckWebNew', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaUn', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaEd', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckUdims', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPc', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckSp', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckChange', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckBalance', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckCopy', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'fillCodeRel', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkVailDate', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkExpire', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'checkPreInOrders', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'checkPreInSpaceCode', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'checkPreInInvCode', 'varchar(255)', 1);
-#
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'sortNum', 'int', 1);
-#
-#
-#
-# CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'expireDate', 'varchar(255) ', 1);
-#
-# CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'batchNo', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'productDate', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'expireDate', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'arrivalCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('pur_arrival', 'supId', 'varchar(255) ', 1);
-#
-# CALL Pro_Temp_ColumnWork('pur_returned_detail', 'batchNo', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('pur_returned_detail', 'productDate', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('pur_returned_detail', 'expireDate', 'varchar(255) ', 1);
-#
-#
-# CALL Pro_Temp_ColumnWork('pur_delivery', 'supId', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('pur_returned', 'supId', 'varchar(255) ', 1);
-#
-#
-# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'targetBusAction', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busBeforeTime', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'beforeTime', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'auditStatus', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busAuditStatus', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'createType', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'auditStatus', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busAuditStatus', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'targetBusAction', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1);
-# CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1);
-#
-# INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
-#                                     `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
-# VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1);
-# INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
-#                                     `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
-# VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1);
-# INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
-#                                     `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
-# VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1);
-#
-#
-# CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originCount', 'int', 1);
-# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originReCount', 'int', 1);
-#
-# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'mainAction', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('inv_prein_detail', 'action', 'varchar(255)', 1);
-#
-# CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255)', 1);
-#
-# INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
-#                                       `paramType`, `paramExplain`)
-# VALUES (20040, 0, '允许送货单直接入库变更库存', 'deliveryInstock', '0', 1, 0, '0：否；1：是');
-#
-# CALL Pro_Temp_ColumnWork('sup_product', 'manufactory', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('sup_product', 'allowNoBatch', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sup_product', 'allowNoExpire', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sup_product', 'allowNoProduct', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sup_product', 'allowNoSerial', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('inv_remind_msg', 'remindCount', 'int', 1);
-# CALL Pro_Temp_ColumnWork('sup_cert_remind_msg', 'remindCount', 'int', 1);
-#
-# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'orderStatus', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'direct', 'tinyint', 1);
-#
-#
-# CALL Pro_Temp_ColumnWork('sup_manufacturer', 'agentName', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('sys_pdf_module', 'modelKey', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessType', 'varchar(255)', 1);
-# CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)', 1);
-#
-# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1);
-#
-# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'coldFilePath', 'varchar(255)', 1);
-#
-# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkColdFileName', 'varchar(255)', 1);
-#
-#
-# CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1);
-#
-# INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
-# VALUES (100, 'clean_log_task', '0 0 2 1/1 * ? ', NULL, '删除日志数据');
-#
-#
-#
-# CALL Pro_Temp_ColumnWork('inv_product', 'nowStock', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_product', 'frozenCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_product', 'planInCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_product', 'planOutCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_product', 'onWayCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_product', 'availableStock', 'int ', 1);
-#
-# CALL Pro_Temp_ColumnWork('inv_product_detail', 'inCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_product_detail', 'outCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_prein_product_detail', 'inCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_prein_product_detail', 'outCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'inCount', 'int ', 1);
-# CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'outCount', 'int ', 1);
-#
-#
-# CALL Pro_Temp_ColumnWork('auth_warehouse', 'updateTime', 'datetime ', 1);
-#
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'basicType', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'basicDept', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'updateTime', 'datetime', 1);
-#
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'orderToInSyncTime', 'int', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'supCert', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'basicThirdDept', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'updateTime', 'datetime', 1);
-# CALL Pro_Temp_ColumnWork('sys_param_config', 'updateTime', 'datetime', 1);
-# CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_code', 'updateTime', 'datetime', 1);
-# CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'datetime', 1);
-# CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1);
-# CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1);
-#
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'advancePreIn', 'tinyint', 1);
-#
-#
-# INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
-# VALUES (211, 'syncDi', '0 24 3 * * ?', NULL, NULL);
-# INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
-# VALUES (212, 'syncCompany', '0 0 3 * * 1', NULL, NULL);
-#
-#
-#
-# # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3);
-# # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);
-#
-#
-# CREATE TABLE IF NOT EXISTS `inv_prein_product`
-# (
-#     `id`             int                                                           NOT NULL AUTO_INCREMENT,
-#     `relIdFk`        bigint                                                        NULL DEFAULT NULL COMMENT '耗材字典ID',
-#     `nameCode`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识',
-#     `batchNo`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
-#     `productionDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
-#     `expireDate`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
-#     `inCount`        int                                                           NULL DEFAULT NULL COMMENT '入库数量',
-#     `outCount`       int                                                           NULL DEFAULT NULL COMMENT '出库数量',
-#     `reCount`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '实际数量',
-#     `customerId`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '客户ID',
-#     `supId`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ID',
-#     `deptCode`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码',
-#     `invCode`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码',
-#     `createTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
-#     `updateTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
-#     PRIMARY KEY (`id`) USING BTREE
-# ) ENGINE = InnoDB
-#   CHARACTER SET = utf8mb4
-#   COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存表'
-#   ROW_FORMAT = DYNAMIC;
-#
-# SET FOREIGN_KEY_CHECKS = 1;
-#
-#
-#
-# CREATE TABLE IF NOT EXISTS `inv_prein_product_detail`
-# (
-#     `id`           int                                                           NOT NULL AUTO_INCREMENT,
-#     `code`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'UDI码',
-#     `mainAction`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '出入单据类型',
-#     `action`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '单据类型',
-#     `orderId`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单号外键',
-#     `relId`        int                                                           NOT NULL COMMENT '耗材字典ID',
-#     `nameCode`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识',
-#     `batchNo`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
-#     `produceDate`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
-#     `expireDate`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
-#     `serialNo`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号',
-#     `supId`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商',
-#     `count`        int                                                           NULL DEFAULT NULL COMMENT '扫码数量',
-#     `reCount`      int                                                           NULL DEFAULT NULL COMMENT '实际数量',
-#     `deptCode`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码',
-#     `invCode`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '仓库编码',
-#     `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码',
-#     `purchaseType` tinyint                                                       NULL DEFAULT NULL COMMENT '采购类型',
-#     `updateTime`   datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
-#     PRIMARY KEY (`id`) USING BTREE
-# ) ENGINE = InnoDB
-#   CHARACTER SET = utf8mb4
-#   COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存详情表'
-#   ROW_FORMAT = DYNAMIC;
-#
-#
-# CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes`
-# (
-#     `id`          int                                                           NOT NULL AUTO_INCREMENT,
-#     `action`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-#     `name`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-#     `outChange`   tinyint                                                       NULL DEFAULT NULL,
-#     `orderStatus` tinyint                                                       NULL DEFAULT NULL,
-#     PRIMARY KEY (`id`) USING BTREE
-# ) ENGINE = InnoDB
-#   AUTO_INCREMENT = 128
-#   CHARACTER SET = utf8mb4
-#   COLLATE = utf8mb4_0900_ai_ci COMMENT = '单据同步 - 业务单据类型'
-#   ROW_FORMAT = DYNAMIC;
-#
-#
-# # 修改主键为LONG
-# CALL Pro_Temp_ColumnWork('basic_hosp_type', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('basic_udirel', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('basic_products', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('company_product_relevance', 'id', 'bigint', 2);
-#
-# CALL Pro_Temp_ColumnWork('basic_corp', 'id', 'bigint', 2);
-#
-#
-# CALL Pro_Temp_ColumnWork('sup_cert', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('sup_cert_set', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('sup_company', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('sup_manufacturer', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('sup_product', 'id', 'bigint', 2);
-#
-#
-# CALL Pro_Temp_ColumnWork('io_code_lost', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('io_code_rel', 'id', 'bigint', 2);
-#
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('basic_bustype_change', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'id', 'bigint', 2);
-#
-#
-# CALL Pro_Temp_ColumnWork('auth_user', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('auth_user_bustype', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('auth_user_bustype', 'userId', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('auth_dept', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('auth_warehouse', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('auth_space', '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('thr_dept', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2);
-#
-# CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2);
-# CALL Pro_Temp_ColumnWork('auth_role', 'isCustomer', 'int', 1);
-#
+CALL Pro_Temp_ColumnWork('basic_download_status', 'cacheFilePath',
+                         'varchar(255) ', 1);
+
+CALL Pro_Temp_ColumnWork('auth_user_bustype', 'updateTime',
+                         'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1);
+CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'updateTime',
+                         'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1);
+CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'updateTime',
+                         'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1);
+CALL Pro_Temp_ColumnWork('auth_dept_user', 'updateTime',
+                         'datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ', 1);
+
+CALL Pro_Temp_ColumnWork('sync_data_set', 'department', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'warehouseDict', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'userData', 'tinyint ', 1);
+
+CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeLost', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'udiCodeRel', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'dbDiCompany', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'fromThrBillNo', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'busType', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'inCodeStatus', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'processStatus', 'tinyint ', 1);
+
+CALL Pro_Temp_ColumnWork('io_order', 'suppleCount', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'relKey', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'checkTime', 'datetime ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'checkUser', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'varchar(255) ', 1);
+
+
+
+CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255) ', 1);
+
+CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3);
+CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3);
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1);
+
+CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255)  ', 1);
+CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255)  ', 1);
+CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255)  ', 1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'groupBuy', 'tinyint  ', 1);
+
+
+
+CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1);
+
+
+CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'certIdFk', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'allowNoSerial', 'tinyint', 1);
+
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'busType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inStock', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'actionType', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckEnable', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckWebNew', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaUn', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaEd', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckUdims', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPc', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckSp', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckChange', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckBalance', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckCopy', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'fillCodeRel', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkVailDate', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkExpire', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'checkPreInOrders', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'checkPreInSpaceCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'checkPreInInvCode', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'sortNum', 'int', 1);
+
+
+
+CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'expireDate', 'varchar(255) ', 1);
+
+CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'batchNo', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'productDate', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'expireDate', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'arrivalCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('pur_arrival', 'supId', 'varchar(255) ', 1);
+
+CALL Pro_Temp_ColumnWork('pur_returned_detail', 'batchNo', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_returned_detail', 'productDate', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_returned_detail', 'expireDate', 'varchar(255) ', 1);
+
+
+CALL Pro_Temp_ColumnWork('pur_delivery', 'supId', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_returned', 'supId', 'varchar(255) ', 1);
+
+
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'targetBusAction', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busBeforeTime', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'beforeTime', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'auditStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busAuditStatus', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'createType', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('basic_bustype_change', 'auditStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busAuditStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_change', 'targetBusAction', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1);
+
+INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
+                                    `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
+VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1);
+INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
+                                    `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
+VALUES ('1541070754823692289', '1000002', '寄售库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 3, 1);
+INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
+                                    `thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
+VALUES ('1541070754823692290', '1000001', '预验收库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 2, 1);
+
+
+CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originCount', 'int', 1);
+CALL Pro_Temp_ColumnWork('inv_prein_detail', 'originReCount', 'int', 1);
+
+CALL Pro_Temp_ColumnWork('inv_prein_detail', 'mainAction', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_prein_detail', 'action', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('io_code_lost', 'nameCode', 'varchar(255)', 1);
+
+INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
+                                      `paramType`, `paramExplain`)
+VALUES (20040, 0, '允许送货单直接入库变更库存', 'deliveryInstock', '0', 1, 0, '0：否；1：是');
+
+CALL Pro_Temp_ColumnWork('sup_product', 'manufactory', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('sup_product', 'allowNoBatch', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sup_product', 'allowNoExpire', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sup_product', 'allowNoProduct', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sup_product', 'allowNoSerial', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('inv_remind_msg', 'remindCount', 'int', 1);
+CALL Pro_Temp_ColumnWork('sup_cert_remind_msg', 'remindCount', 'int', 1);
+
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'orderStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'direct', 'tinyint', 1);
+
+
+CALL Pro_Temp_ColumnWork('sup_manufacturer', 'agentName', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_module', 'modelKey', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessType', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'coldFilePath', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkColdFileName', 'varchar(255)', 1);
+
+
+CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1);
+
+INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
+VALUES (100, 'clean_log_task', '0 0 2 1/1 * ? ', NULL, '删除日志数据');
+
+
+
+CALL Pro_Temp_ColumnWork('inv_product', 'nowStock', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_product', 'frozenCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_product', 'planInCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_product', 'planOutCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_product', 'onWayCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_product', 'availableStock', 'int ', 1);
+
+CALL Pro_Temp_ColumnWork('inv_product_detail', 'inCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_product_detail', 'outCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_prein_product_detail', 'inCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_prein_product_detail', 'outCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'inCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'outCount', 'int ', 1);
+
+
+CALL Pro_Temp_ColumnWork('auth_warehouse', 'updateTime', 'datetime ', 1);
+
+CALL Pro_Temp_ColumnWork('sync_data_set', 'basicType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'basicDept', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'updateTime', 'datetime', 1);
+
+CALL Pro_Temp_ColumnWork('sync_data_set', 'orderToInSyncTime', 'int', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'supCert', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'basicThirdDept', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_param_config', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_code', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1);
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'advancePreIn', 'tinyint', 1);
+
+
+INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
+VALUES (211, 'syncDi', '0 24 3 * * ?', NULL, NULL);
+INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
+VALUES (212, 'syncCompany', '0 0 3 * * 1', NULL, NULL);
+
+
+
+# CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3);
+# CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);
+
+
+CREATE TABLE IF NOT EXISTS `inv_prein_product`
+(
+    `id`             int                                                           NOT NULL AUTO_INCREMENT,
+    `relIdFk`        bigint                                                        NULL DEFAULT NULL COMMENT '耗材字典ID',
+    `nameCode`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识',
+    `batchNo`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
+    `productionDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
+    `expireDate`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
+    `inCount`        int                                                           NULL DEFAULT NULL COMMENT '入库数量',
+    `outCount`       int                                                           NULL DEFAULT NULL COMMENT '出库数量',
+    `reCount`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '实际数量',
+    `customerId`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '客户ID',
+    `supId`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ID',
+    `deptCode`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码',
+    `invCode`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码',
+    `createTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    `updateTime`     datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存表'
+  ROW_FORMAT = DYNAMIC;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+CREATE TABLE IF NOT EXISTS `inv_prein_product_detail`
+(
+    `id`           int                                                           NOT NULL AUTO_INCREMENT,
+    `code`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'UDI码',
+    `mainAction`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '出入单据类型',
+    `action`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '单据类型',
+    `orderId`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单号外键',
+    `relId`        int                                                           NOT NULL COMMENT '耗材字典ID',
+    `nameCode`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识',
+    `batchNo`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
+    `produceDate`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期',
+    `expireDate`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期',
+    `serialNo`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号',
+    `supId`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商',
+    `count`        int                                                           NULL DEFAULT NULL COMMENT '扫码数量',
+    `reCount`      int                                                           NULL DEFAULT NULL COMMENT '实际数量',
+    `deptCode`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码',
+    `invCode`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '仓库编码',
+    `invSpaceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码',
+    `purchaseType` tinyint                                                       NULL DEFAULT NULL COMMENT '采购类型',
+    `updateTime`   datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '预验收库存详情表'
+  ROW_FORMAT = DYNAMIC;
+
+
+CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes`
+(
+    `id`          int                                                           NOT NULL AUTO_INCREMENT,
+    `action`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+    `name`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+    `outChange`   tinyint                                                       NULL DEFAULT NULL,
+    `orderStatus` tinyint                                                       NULL DEFAULT NULL,
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 128
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '单据同步 - 业务单据类型'
+  ROW_FORMAT = DYNAMIC;
+
+
+# 修改主键为LONG
+CALL Pro_Temp_ColumnWork('basic_hosp_type', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('basic_products', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('company_product_relevance', 'id', 'bigint', 2);
+
+CALL Pro_Temp_ColumnWork('basic_corp', 'id', 'bigint', 2);
+
+
+CALL Pro_Temp_ColumnWork('sup_cert', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('sup_cert_set', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('sup_company', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('sup_manufacturer', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('sup_product', 'id', 'bigint', 2);
+
+
+CALL Pro_Temp_ColumnWork('io_code_lost', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('io_code_rel', 'id', 'bigint', 2);
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('basic_bustype_change', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'id', 'bigint', 2);
+
+
+CALL Pro_Temp_ColumnWork('auth_user', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_user_bustype', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_user_bustype', 'userId', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_dept', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_warehouse', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('auth_space', '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('thr_dept', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2);
+
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2);
+CALL Pro_Temp_ColumnWork('auth_role', 'isCustomer', 'int', 1);
+
 # ALTER TABLE `auth_dept_user`
 #     ADD UNIQUE (`userId`, deptId);
-#
-#
-# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);
-# CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2);
-#
-# CALL Pro_Temp_ColumnWork('io_order_detail_code', 'regStatus', 'varchar(255) ', 1);
-# CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1);
-#
-# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncStatus', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncChange', 'tinyint', 1);
-# CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1);
-#
-#
-#
-# CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2);
-# CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2);
-# CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'bigint ', 2);
-#
-#
-# CALL Pro_Temp_ColumnWork('pur_order_detail', 'price', 'decimal(10, 2)', 1);
 
 
-INSERT ignore INTO `sys_pdf_template_relevance_label`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, `localAction`, `remark1`, `remark2`, `remark3`, `printType`, `modelKey`) VALUES (1, 30, 110, 0, 9, '内部码打印', NULL, NULL, NULL, NULL, 'lable');
-INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, `localAction`, `remark1`, `remark2`, `remark3`, `printType`, `modelKey`) VALUES (1, 31, 110, 0, NULL, '配送企业资质打印', NULL, NULL, NULL, NULL, 'reportForms');
-INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, `localAction`, `remark1`, `remark2`, `remark3`, `printType`, `modelKey`) VALUES (2, 32, 110, 0, NULL, '生产企业资质打印', NULL, NULL, NULL, NULL, 'reportForms');
-INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, `localAction`, `remark1`, `remark2`, `remark3`, `printType`, `modelKey`) VALUES (3, 33, 110, 0, NULL, '配送产品资质打印', NULL, NULL, NULL, NULL, 'reportForms');
-INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, `localAction`, `remark1`, `remark2`, `remark3`, `printType`, `modelKey`) VALUES (4, 33, 110, 0, NULL, '库存报表打印', NULL, NULL, NULL, NULL, 'reportForms');
-INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, `localAction`, `remark1`, `remark2`, `remark3`, `printType`, `modelKey`) VALUES (5, 33, 110, 0, NULL, '内部码报表打印', NULL, NULL, NULL, NULL, 'reportForms');
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2);
+
+CALL Pro_Temp_ColumnWork('io_order_detail_code', 'regStatus', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncChange', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1);
+
+
+
+CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2);
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2);
+CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'bigint ', 2);
+
+
+CALL Pro_Temp_ColumnWork('pur_order_detail', 'price', 'decimal(10, 2)', 1);
+
+
+INSERT ignore INTO `sys_pdf_template_relevance_label`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`,
+                                                      `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
+                                                      `modelKey`)
+VALUES (1, 30, 110, 0, 9, '内部码打印', NULL, NULL, NULL, NULL, 'lable');
+INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`,
+                                                         `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
+                                                         `modelKey`)
+VALUES (1, 31, 110, 0, NULL, '配送企业资质打印', NULL, NULL, NULL, NULL, 'reportForms');
+INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`,
+                                                         `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
+                                                         `modelKey`)
+VALUES (2, 32, 110, 0, NULL, '生产企业资质打印', NULL, NULL, NULL, NULL, 'reportForms');
+INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`,
+                                                         `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
+                                                         `modelKey`)
+VALUES (3, 33, 110, 0, NULL, '配送产品资质打印', NULL, NULL, NULL, NULL, 'reportForms');
+INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`,
+                                                         `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
+                                                         `modelKey`)
+VALUES (4, 33, 110, 0, NULL, '库存报表打印', NULL, NULL, NULL, NULL, 'reportForms');
+INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `customerId`, `adminId`, `moduleId`,
+                                                         `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
+                                                         `modelKey`)
+VALUES (5, 33, 110, 0, NULL, '内部码报表打印', NULL, NULL, NULL, NULL, 'reportForms');
 CALL Pro_Temp_ColumnWork('basic_udirel', 'zdcfsycs', 'int', 1);
+CALL Pro_Temp_ColumnWork('io_order_detail_code', 'updateTime', 'datetime', 1);
+
 
+call Modify_index('basic_products','uuid','idx_uuid','BTREE');