From 0e2cc461365de473f5c2a8f7c8e0f323d771d0e3 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 21 Mar 2023 22:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B5=81=E7=A8=8B=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/constant/ConstantStatus.java | 2 + .../basic/BasicBussinessTypeController.java | 2 +- .../basic/BasicInCodeController.java | 25 ++- .../basic/UdiRelevanceController.java | 11 +- .../controller/inout/IoOrderController.java | 5 +- .../inout/IoOrderDetailResultController.java | 14 +- .../glxp/api/entity/inout/IoOrderEntity.java | 5 + .../api/entity/inv/InvPreinDetailEntity.java | 6 + .../req/basic/FilterBussinessTypeRequest.java | 1 + .../inout/FilterOrderDetailResultRequest.java | 3 + .../inout/IoOrderDetailResultResponse.java | 5 + .../glxp/api/res/inout/IoOrderResponse.java | 2 + .../glxp/api/res/inv/InvProductResponse.java | 5 +- .../impl/IoOrderDetailBizServiceImpl.java | 6 +- .../inout/impl/IoOrderServiceImpl.java | 2 +- .../impl/InvInnerOrderPrintServiceImpl.java | 27 ++-- .../mapper/basic/BasicBussinessTypeDao.xml | 8 + .../mybatis/mapper/basic/UdiRlSupDao.xml | 2 +- .../mapper/inout/IoOrderDetailResultDao.xml | 23 +-- .../mybatis/mapper/inv/invProductDao.xml | 1 + src/main/resources/schemas/schema_v2.1.sql | 150 +++++++++--------- 21 files changed, 182 insertions(+), 123 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 74cd1b43..d9b5d021 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/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; //带票 diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index d4ef8636..c739bd49 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/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 bussinessTypeEntities; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java b/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java index 2547ae79..228049c2 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java +++ b/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 ioOrderEntityList=ioOrderService.filterList(filterOrderRequest); + List ioOrderEntityList = ioOrderService.filterList(filterOrderRequest); PageInfo pageInfo = new PageInfo<>(ioOrderEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -60,7 +59,7 @@ public class BasicInCodeController { @GetMapping("/udiwms/stock/order/detail/filter") public BaseResponse filterStockOrderDetail(FilterOrderDetailBizRequest filterOrderDetailBizRequest) { - List ioOrderDetailBizResponseList=ioOrderDetailBizService.filterList(filterOrderDetailBizRequest); + List ioOrderDetailBizResponseList = ioOrderDetailBizService.filterList(filterOrderDetailBizRequest); PageInfo pageInfo = new PageInfo<>(ioOrderDetailBizResponseList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -70,17 +69,17 @@ public class BasicInCodeController { } @PostMapping("/udiwms/stock/order/addOrderPrint") - public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques){ - - if(invInnerOrderprintReques.getOrderIdFk()!=null){ - Boolean falg=invInnerOrderPrintService.addInCodeList(invInnerOrderprintReques.getOrderIdFk(),invInnerOrderprintReques.isChack()); - if(!falg){ - return ResultVOUtils.error(999,"生成失败！"); - } - }else{ - return ResultVOUtils.error(999,"参数错误！"); + public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) { + + if (invInnerOrderprintReques.getOrderIdFk() != null) { + Boolean falg = invInnerOrderPrintService.addInCodeList(invInnerOrderprintReques.getOrderIdFk(), invInnerOrderprintReques.isChack()); + if (!falg) { + return ResultVOUtils.error(999, "生成失败！"); + } + } else { + return ResultVOUtils.error(999, "参数错误！"); } - return ResultVOUtils.success(); + return ResultVOUtils.success(); } } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 705623fa..328e14fb 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/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()) { -// filterUdiRelRequest.setUnitFk(null); -// } else { -// filterUdiRelRequest.setUnitFk(getCustomerId()); -// } + if (isHosUser()) { + filterUdiRelRequest.setUnitFk(null); + } else { + filterUdiRelRequest.setUnitFk(getCustomerId()); + } udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiRelRequest); if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 0025ac19..6b3afade 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/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.setStatuses(Arrays.asList(7,5,8)); + filterOrderRequest.setDealStatuses(Arrays.asList(2, 3)); + 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") diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 660e3746..4021dffd 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/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 list = orderDetailResultService.filterOrderList(orderDetailResultRequest); + +// for (IoOrderDetailResultResponse orderDetailResultResponse : list) { +// if(orderDetailResultResponse.get) +// } PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 0039597a..e2ec5ebf 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/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; //内部码生成状态 + } diff --git a/src/main/java/com/glxp/api/entity/inv/InvPreinDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvPreinDetailEntity.java index f5101807..6d9ee65c 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvPreinDetailEntity.java +++ b/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; + } diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 7223648b..4c23bf4b 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index cc4d1a7a..303bdb1c 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index a01323e4..2c079da3 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index d7ce1c54..c047b9e7 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/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; /** diff --git a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java index c7ae59fc..2f4d1b13 100644 --- a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java @@ -19,7 +19,10 @@ public class InvProductResponse { * 产品名称 */ private String cpmctymc; - + /** + * 计量单位 + */ + private String measname; /** * 耗材字典ID */ diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index f68ef356..66fc00fa 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/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){ - ew.isNull("nameCode"); - } +// if(chack){ +// ew.isNull("nameCode"); +// } List ioOrderDetailBizEntityList=ioOrderDetailBizDao.selectList(ew); return ioOrderDetailBizEntityList; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 89f99858..693eed94 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/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: diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 95d154e0..9d2cea45 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/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 ew = new QueryWrapper<>(); ew.eq("orderIdFk", orderIdFk); invInnerOrderPrintDao.delete(ew); - - List ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderIdAndNameCode(orderIdFk,check); - if(ioOrderDetailBizEntityList.size()==0){ + IoOrderEntity orderEntity = orderService.findByBillNo(orderIdFk); + List ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderIdAndNameCode(orderIdFk, check); + 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; } -} \ No newline at end of file +} diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 72a3ed23..91138ecb 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -12,6 +12,10 @@ AND bu.action like concat('%', #{action}, '%') + + + AND bu.inStock = #{inStock} + AND bu.advanceType = #{advanceType} @@ -237,6 +241,10 @@ AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') + + + AND basic_bussiness_type.inStock = #{inStock} + AND basic_bussiness_type.action = #{action} diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 9270f7e8..46859be4 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/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 diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 534686eb..db4506b4 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -24,14 +24,12 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 5cf0434a..0b2e3bf1 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/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, diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index b5600b7c..1c90a31a 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,77 +1,81 @@ --- -- 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） --- 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('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('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_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('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_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); +# 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） +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('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('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_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('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_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', 'arrivalTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1); + +CALL Pro_Temp_ColumnWork('inv_prein_detail', 'status', 'tinyint', 1);