界面流程调整

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

@@ -78,6 +78,8 @@ public class ConstantStatus {
     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 Integer ACTION_TYPE_NORMAL = 1;         //带票

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

@@ -186,7 +186,7 @@ public class BasicBussinessTypeController extends BaseController {
             bussinessTypeFilterRequest.setUserId(getUserId());
         } else {
             //当前用户为供应商，查询单据类型添加允许供应商使用参数
-//            bussinessTypeFilterRequest.setSpUse(true);
+            bussinessTypeFilterRequest.setSpUse(true);
         }
 
         List<BasicBussinessTypeResponse> bussinessTypeEntities;

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

@@ -1,7 +1,6 @@
 package com.glxp.api.controller.basic;
 
 
-
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
@@ -47,7 +46,7 @@ public class BasicInCodeController {
     public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) {
 
 
-       List<IoOrderResponse> ioOrderEntityList=ioOrderService.filterList(filterOrderRequest);
+        List<IoOrderResponse> ioOrderEntityList = ioOrderService.filterList(filterOrderRequest);
 
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(ioOrderEntityList);
         PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -60,7 +59,7 @@ public class BasicInCodeController {
     @GetMapping("/udiwms/stock/order/detail/filter")
     public BaseResponse filterStockOrderDetail(FilterOrderDetailBizRequest filterOrderDetailBizRequest) {
 
-        List<IoOrderDetailBizResponse> ioOrderDetailBizResponseList=ioOrderDetailBizService.filterList(filterOrderDetailBizRequest);
+        List<IoOrderDetailBizResponse> ioOrderDetailBizResponseList = ioOrderDetailBizService.filterList(filterOrderDetailBizRequest);
 
         PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(ioOrderDetailBizResponseList);
         PageSimpleResponse<IoOrderDetailBizResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -70,17 +69,17 @@ public class BasicInCodeController {
     }
 
     @PostMapping("/udiwms/stock/order/addOrderPrint")
-    public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques){
+    public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) {
-
+
-        if(invInnerOrderprintReques.getOrderIdFk()!=null){
+        if (invInnerOrderprintReques.getOrderIdFk() != null) {
-         Boolean falg=invInnerOrderPrintService.addInCodeList(invInnerOrderprintReques.getOrderIdFk(),invInnerOrderprintReques.isChack());
+            Boolean falg = invInnerOrderPrintService.addInCodeList(invInnerOrderprintReques.getOrderIdFk(), invInnerOrderprintReques.isChack());
-         if(!falg){
+            if (!falg) {
-             return  ResultVOUtils.error(999,"生成失败！");
+                return ResultVOUtils.error(999, "生成失败！");
-         }
+            }
-        }else{
+        } else {
-            return  ResultVOUtils.error(999,"参数错误！");
+            return ResultVOUtils.error(999, "参数错误！");
         }
-        return  ResultVOUtils.success();
+        return ResultVOUtils.success();
 
     }
 }

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

@@ -161,12 +161,11 @@ public class UdiRelevanceController extends BaseController {
         } else {
             filterUdiRelRequest.setDiType(1);
         }
-
+        if (isHosUser()) {
-//        if (isHosUser()) {
+            filterUdiRelRequest.setUnitFk(null);
-//            filterUdiRelRequest.setUnitFk(null);
+        } else {
-//        } else {
+            filterUdiRelRequest.setUnitFk(getCustomerId());
-//            filterUdiRelRequest.setUnitFk(getCustomerId());
+        }
-//        }
         udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
         if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
             for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {

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

@@ -83,8 +83,8 @@ public class IoOrderController extends BaseController {
 
     @GetMapping("/udiwms/inout/order/filterInvoice")
     public BaseResponse filterInvoice(FilterOrderRequest filterOrderRequest) {
-        filterOrderRequest.setDealStatuses(Arrays.asList(2,3));
+        filterOrderRequest.setDealStatuses(Arrays.asList(2, 3));
-        filterOrderRequest.setStatuses(Arrays.asList(7,5,8));
+        filterOrderRequest.setStatuses(Arrays.asList(7, 5, 10));
         String customerId = getCustomerId();
         if (!customerId.equals("110")) {
             filterOrderRequest.setFromCorp(customerId);
@@ -95,7 +95,6 @@ public class IoOrderController extends BaseController {
     }
 
 
-
     //新增业务-立即提交
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/submitBiz")

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

@@ -6,6 +6,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 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.controller.BaseController;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
@@ -27,7 +28,7 @@ import java.util.List;
  * 单据扫码明细查询接口
  */
 @RestController
-public class IoOrderDetailResultController {
+public class IoOrderDetailResultController extends BaseController {
     @Resource
     IoOrderService orderService;
     @Resource
@@ -60,7 +61,18 @@ public class IoOrderDetailResultController {
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/resultDetail/filterOrderList")
     public BaseResponse filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest) {
+
+        if (isHosUser()) {
+//            orderDetailResultRequest.setFromCorpName();
+        } else {
+            orderDetailResultRequest.setFromCorp(getCustomerId());
+        }
+
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest);
+
+//        for (IoOrderDetailResultResponse orderDetailResultResponse : list) {
+//            if(orderDetailResultResponse.get)
+//        }
         PageInfo<IoOrderDetailResultResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }

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

@@ -221,4 +221,9 @@ public class IoOrderEntity {
     @TableField(value = "deliveryStatus")
     private Integer deliveryStatus;     //单据送货验收状态
 
+    @TableField(value = "processStatus")
+    private Integer processStatus;     //退货单据处理状态
+    @TableField(value = "processStatus")
+    private int inCodeStatus;     //内部码生成状态
+
 }

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

@@ -72,4 +72,10 @@ public class InvPreinDetailEntity {
     @TableField(value = "reCount")
     private int reCount;
 
+    /**
+     * 1:在库，2：已退回；3.已使用
+     */
+    @TableField(value = "status")
+    private int status;
+
 }

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

@@ -104,5 +104,6 @@ public class FilterBussinessTypeRequest extends ListPageRequest {
     private Boolean preIn;
 
     private Integer busType;
+    private Boolean inStock;
 
 }

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

@@ -37,6 +37,9 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String startTime;
     private String endTime;
     private String fromCorpName;
+    private String startAduditTime;  //起始日期
+    private String endAduditTime;       //结束日期
+    private String fromCorp;
 
 
 }

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

@@ -122,6 +122,10 @@ public class IoOrderDetailResultResponse {
      */
     private int reCount;
 
+    private Integer inCount;
+    private Integer outCount;
+
+
     /**
      * 备注
      */
@@ -154,6 +158,7 @@ public class IoOrderDetailResultResponse {
     private int acceptCount;
     private String fromCorpName;
     private String billTypeName;
+    private String mainAction;
 
 
 }

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

@@ -217,6 +217,8 @@ public class IoOrderResponse {
     private Integer exportStatus;
 
     private Integer deliveryStatus;
+    private Integer processStatus;
+    private int inCodeStatus;
 
 
     /**

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

@@ -19,7 +19,10 @@ public class InvProductResponse {
      * 产品名称
      */
     private String cpmctymc;
-
+    /**
+     * 计量单位
+     */
+    private String measname;
     /**
      * 耗材字典ID
      */

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

@@ -40,9 +40,9 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         if(StrUtil.isNotEmpty(orderId)){
             ew.eq("orderIdFk",orderId);
         }
-        if(chack){
+//        if(chack){
-            ew.isNull("nameCode");
+//            ew.isNull("nameCode");
-        }
+//        }
         List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList=ioOrderDetailBizDao.selectList(ew);
         return ioOrderDetailBizEntityList;
     }

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

@@ -525,7 +525,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 filterOrderRequest.setDealStatuses(Arrays.asList(2));
                 break;
             case Constant.ORDER_STATUS_AUDITED:
-                filterOrderRequest.setStatuses(Arrays.asList(7,10));
+                filterOrderRequest.setStatuses(Arrays.asList(7));
                 filterOrderRequest.setDealStatuses(Arrays.asList(3,4));
                 break;
             case Constant.ORDER_STATUS_SUP_SEARCH:

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

@@ -8,6 +8,7 @@ import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.dao.inv.InvInnerOrderPrintDao;
 import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.InnerOrderDetailEntity;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
 import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
@@ -23,6 +24,7 @@ import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
+import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.inv.InnerOrderDetailService;
 import com.glxp.api.service.inv.InvInnerOrderPdfTempService;
 import com.glxp.api.service.inv.InvInnerOrderPrintService;
@@ -118,7 +120,7 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
 
             String udiCode = "#" + udiProductEntity.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
                     "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
-            udiCode = udiCode.replaceAll("#null","");
+            udiCode = udiCode.replaceAll("#null", "");
             innerOrderPrintEntity.setUdiCode(udiCode);
             invInnerOrderPrintDao.insert(innerOrderPrintEntity);
         }
@@ -244,24 +246,29 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
         return null;
     }
 
+    @Resource
+    IoOrderService orderService;
 
     //-----------------------------------------------------------业务单据打印-----------------------------//
     @Override
-    public Boolean addInCodeList(String orderIdFk,boolean check) {
+    public Boolean addInCodeList(String orderIdFk, boolean check) {
         //先删除数据
         QueryWrapper<InvInnerOrderPrintEntity> ew = new QueryWrapper<>();
         ew.eq("orderIdFk", orderIdFk);
         invInnerOrderPrintDao.delete(ew);
-
+        IoOrderEntity orderEntity = orderService.findByBillNo(orderIdFk);
-        List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderIdAndNameCode(orderIdFk,check);
+        List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderIdAndNameCode(orderIdFk, check);
-        if(ioOrderDetailBizEntityList.size()==0){
+        if (ioOrderDetailBizEntityList.size() == 0) {
             return false;
         }
-
         for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) {
+            //todo 暂时这样子，以后要过滤
+            if (check && obj.getNameCode().length() == 14) {
+                continue;
+            }
             InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity();
             innerOrderPrintEntity.setOrderIdFk(obj.getOrderIdFk());
-            innerOrderPrintEntity.setProductId(obj.getBindRlFk()+"");
+            innerOrderPrintEntity.setProductId(obj.getBindRlFk() + "");
             innerOrderPrintEntity.setExpireDate(obj.getExpireDate());
             innerOrderPrintEntity.setProductDate(obj.getProductDate());
             innerOrderPrintEntity.setProductName(obj.getCoName());
@@ -282,12 +289,14 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
 
             String udiCode = "#" + obj.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() +
                     "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + udiProductEntity.getWarehouseCode() + "#" + udiProductEntity.getDeptCode();
-            udiCode = udiCode.replaceAll("#null","");
+            udiCode = udiCode.replaceAll("#null", "");
             innerOrderPrintEntity.setUdiCode(udiCode);
             invInnerOrderPrintDao.insert(innerOrderPrintEntity);
         }
+        orderEntity.setInCodeStatus(1);//
+        orderService.update(orderEntity);
         return true;
     }
 
 
-}
+}

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

@@ -12,6 +12,10 @@
             <if test="action != null and action != ''">
                 AND bu.action like concat('%', #{action}, '%')
             </if>
+
+            <if test="inStock != null">
+                AND bu.inStock = #{inStock}
+            </if>
             <if test="advanceType != null">
                 AND bu.advanceType = #{advanceType}
             </if>
@@ -237,6 +241,10 @@
             <if test="name != ''and name != null">
                 AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
             </if>
+
+            <if test="inStock != null">
+                AND basic_bussiness_type.inStock = #{inStock}
+            </if>
             <if test="action != ''and action != null">
                 AND basic_bussiness_type.action = #{action}
             </if>

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

@@ -103,7 +103,7 @@
                basic_products.basicPrductRemak6,
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
-               basic_corp.name      companyName,
+               basic_corp.name      companyName
         FROM company_product_relevance
                      inner JOIN basic_udirel
                 ON company_product_relevance.udiRlIdFk = basic_udirel.id

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

@@ -24,14 +24,12 @@
     </select>
 
     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
-        SELECT
+        SELECT a2.*,a1.mainAction,
-        a2.*,
+               b1.NAME AS                                                               fromCorpName,
-        b1.NAME AS fromCorpName,
+               (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
-        ( SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action ) billTypeName
+        FROM io_order_detail_result a2
-        FROM
+                     LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
-        io_order_detail_result a2
+                     LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
-        LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
-        LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND a2.orderIdFk = #{orderIdFk}
@@ -42,11 +40,14 @@
             <if test="spec != null and spec != ''">
                 AND a2.spec = #{spec}
             </if>
+            <if test="fromCorp != null and fromCorp != ''">
+                AND a1.fromCorp = #{fromCorp}
+            </if>
             <if test="fromCorpName != null and fromCorpName != ''">
                 AND b1.name = #{fromCorpName}
             </if>
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
-                AND date_format(a1.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+                AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
             <if test="batchNo != null and batchNo != ''">
                 AND a2.batchNo = #{batchNo}
@@ -59,4 +60,4 @@
             </if>
         </where>
     </select>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -8,6 +8,7 @@
         select ip.id,
                ip.nameCode,
                bp.cpmctymc,
+               bp.measname,
                ip.relIdFk,
                bp.ggxh,
                ip.batchNo,

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

@@ -1,77 +1,81 @@
--- -- 字段新增   （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
+#   字段新增   （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
--- CALL Pro_Temp_ColumnWork('io_order', 'fromReceiveBillNo', 'varchar(255) ', 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', 'fromThrBillNo', 'varchar(255) ', 1);
--- CALL Pro_Temp_ColumnWork('io_order', 'syncStatus', 'tinyint ', 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', 'busType', 'tinyint ', 1);
--- CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'deliveryStatus', 'tinyint ', 1);
---
+CALL Pro_Temp_ColumnWork('io_order', 'inCodeStatus', 'tinyint ', 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('thr_bustype_origin', 'thirdSysName', 'varchar(255) ', 3);
--- CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ', 3);
---
+
--- CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
--- CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', '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', 'relCode', 'varchar(255) ', 1);
--- CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1);
--- CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1);
--- CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', '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_bussiness_type', 'vailDispatch', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', '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', 'vailDispatch', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'inStock', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'actionType', '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', 'thrCheckEnable', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'actionType', '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', 'thrCheckEnable', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaEd', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckWebNew', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckUdims', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaUn', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPc', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPdaEd', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckSp', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckUdims', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckChange', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckPc', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckBalance', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckSp', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckCopy', '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('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_delivery_detail', 'batchNo', 'varchar(255) ', 1);
---
+CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1);
--- CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'batchNo', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'expireDate', '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', 'batchNo', 'varchar(255) ', 1);
--- CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'arrivalCount', 'int ', 1);
+CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'productDate', 'varchar(255) ', 1);
--- CALL Pro_Temp_ColumnWork('pur_arrival', 'supId', '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_returned_detail', 'batchNo', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('pur_arrival', 'supId', '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_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('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', 'targetBusAction', 'varchar(255)', 1);
--- CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'auditStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busBeforeTime', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busAuditStatus', '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_change', 'auditStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'busAuditStatus', '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', 'auditStatus', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busAuditStatus', 'tinyint', 1);
--- CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', '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', 'arrivalTime', 'datetime', 1);
 CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1);