From e6cf46a50c11fb57a7b4f640af981c68a488de68 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 27 May 2023 10:51:01 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 34 ++++++++++--------- .../inv/InvInnerOrderPrintController.java | 12 ++++--- .../com/glxp/api/req/auth/PCLoginRequest.java | 1 - 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index 3cabb78d..f63903b0 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -80,8 +80,7 @@ public class BasicOrderPrintController { public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) { - - String name=getStatusName(filterOrderPrintRequest.getStatus()); + String name = getStatusName(filterOrderPrintRequest.getStatus()); SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); if (sysPdfTemplateRelevanceCodeEntity != null) { SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(sysPdfTemplateRelevanceCodeEntity.getTemplateId() + ""); @@ -101,7 +100,7 @@ public class BasicOrderPrintController { @PostMapping("/udiwms/pdf/template/order/file") public void printSupCertProduction(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderPrintRequest.getTemplateId()); - String name=getStatusName(filterOrderPrintRequest.getStatus()); + String name = getStatusName(filterOrderPrintRequest.getStatus()); SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); //打印单号标签 Map data = new HashMap<>(1); @@ -203,20 +202,20 @@ public class BasicOrderPrintController { data.put("data", list); String param = JSON.toJSONString(data); - JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf"); + JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf"); } - public String getStatusName(Integer type){ - String name=""; - if(type==3){ - name="ScanCodeVerification"; - }else if(type==5){ - name="ScanCodeCheck"; - }else if(type==10){ - name="ScanCode"; - }else if(type==7){ - name="ScanCodeAlready"; + public String getStatusName(Integer type) { + String name = ""; + if (type == 3) { + name = "ScanCodeVerification"; + } else if (type == 5) { + name = "ScanCodeCheck"; + } else if (type == 10) { + name = "ScanCode"; + } else if (type == 7) { + name = "ScanCodeAlready"; } return name; } @@ -228,7 +227,7 @@ public class BasicOrderPrintController { @RequestBody FilterOrderPrintRequest filterOrderPrintRequest) throws Exception { //查询模板文件是否存在 - SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(filterOrderPrintRequest.getLabelId()+""); + SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(filterOrderPrintRequest.getLabelId() + ""); if (null == sysPdfTemplateRelevanceStatemenEntity) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); } @@ -273,7 +272,10 @@ public class BasicOrderPrintController { Map 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() + "#" + obj.getWarehouseCode() + "#" + obj.getDeptCode(); + 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()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 28380a50..66a0a627 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/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 { @@ -280,8 +282,8 @@ public class InvInnerOrderPrintController { } - Map map=new HashMap<>(); - map.put("data",printEntities); + Map map = new HashMap<>(); + map.put("data", printEntities); String param = JSON.toJSONString(map); JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf"); diff --git a/src/main/java/com/glxp/api/req/auth/PCLoginRequest.java b/src/main/java/com/glxp/api/req/auth/PCLoginRequest.java index dd63ab7a..910d2014 100644 --- a/src/main/java/com/glxp/api/req/auth/PCLoginRequest.java +++ b/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; } From 5b2ad5b348bd08661fd2b545d0c06a9d111e6fdb Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 28 May 2023 19:55:03 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/constant/ConstantStatus.java | 102 +++++++++--------- .../controller/inout/IoOrderController.java | 35 +++++- .../glxp/api/entity/inout/IoCodeEntity.java | 3 +- .../service/inout/IoCheckInoutService.java | 8 ++ 4 files changed, 94 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 517bf383..e2edb7cd 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/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; //有业务单拣货(有无三期) - } 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 7d5596ec..668a8925 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -45,6 +45,8 @@ import java.util.Arrays; import java.util.Date; import java.util.List; +import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS; + @Slf4j @RestController @@ -183,6 +185,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 orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo()); @@ -210,7 +217,6 @@ public class IoOrderController extends BaseController { } } - IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); ioAddInoutService.dealBusProcess(orderEntity, addOrderRequest.getFromVailPi()); return ResultVOUtils.success("提交成功！"); } @@ -220,6 +226,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 orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo()); @@ -227,7 +237,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 +283,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 orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo()); List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo()); @@ -295,7 +309,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 +317,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 +325,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 +344,10 @@ public class IoOrderController extends BaseController { //校验单据是否已完成 IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); + BaseResponse tempResponse = checkSubmitEnable(orderEntity); + if (tempResponse != null) + return tempResponse; + List orderDetailBizEntities = orderDetailBizService.findByOrderId(addOrderRequest.getBillNo()); List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(addOrderRequest.getBillNo()); diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java index 95686f2a..2580bf71 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java +++ b/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) { diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 9a5dfe02..b1d54d82 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/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; @@ -42,6 +43,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.util.*; +import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS; + /** * 校验出入库服务 */ @@ -127,6 +130,11 @@ public class IoCheckInoutService { //过滤非未校验或校验异常 if (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); From 24057e1458d673d02e42a3fcef7c2bd58c5b22aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 29 May 2023 16:24:02 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/inout/IoOrderDetailCodeEntity.java | 4 +- .../api/service/inout/IoAddInoutService.java | 1 + .../impl/IoOrderDetailCodeServiceImpl.java | 2 +- .../mapper/inout/IoOrderDetailCodeDao.xml | 3 +- src/main/resources/schemas/schema_v2.1.sql | 774 +++++++++--------- 5 files changed, 394 insertions(+), 390 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java index b92d17d8..fae6b90f 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index d3b114ce..4e256710 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -331,6 +331,7 @@ public class IoAddInoutService { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("count", orderDetailCodeEntity.getCount()).set("reCount", orderDetailCodeEntity.getReCount()); + orderDetailCodeEntity.setUpdateTime(new Date()); orderDetailCodeDao.updateCount(orderDetailCodeEntity); isUpdate = true; break; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 07b00d69..95394ffb 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -40,7 +40,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { @Override public List findByOrderId(String orderId) { - return ioOrderDetailCodeDao.selectList(new QueryWrapper().eq("orderIdFk", orderId)); + return ioOrderDetailCodeDao.selectList(new QueryWrapper().eq("orderIdFk", orderId).orderByDesc("updateTime")); } @Override diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml index 57553e2a..5512df08 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml @@ -33,7 +33,8 @@ update io_order_detail_code set count = #{count}, - reCount = #{reCount} + reCount = #{reCount}, + updateTime = #{updateTime} where id = #{id} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index c8389810..0136c620 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,389 +1,389 @@ -# # 字段新增 （表名，字段名，字段类型，修改方式（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); -# -# 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); +# 字段新增 （表名，字段名，字段类型，修改方式（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); + +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'); @@ -393,5 +393,5 @@ INSERT ignore INTO `sys_pdf_template_relevance_statemen`(`id`, `templateId`, `cu 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); From 8e1bd4621c143400baffbb94657fb7118b938fa1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 29 May 2023 17:55:42 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=AE=A1=E6=A0=B8UDI?= =?UTF-8?q?=E7=A0=81=E5=90=8E=E9=9D=A2=E5=8A=A0GS1=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 4 ++++ .../inout/IoOrderReviewController.java | 20 +++++++++++++++---- .../inout/impl/IoOrderServiceImpl.java | 1 + 3 files changed, 21 insertions(+), 4 deletions(-) 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 668a8925..27826c7f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -395,6 +395,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()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index ecf03798..020e1d1f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -327,13 +327,15 @@ 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))) { + String checkCode = checkOrderCodesBean.getCode(); + if (checkCode.endsWith("\u001D")) { + checkCode = checkCode.replace("\u001D", ""); + } + if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) { if (checkOrderCodesBean.getStatus() == Constant.DB_CHECK_ED && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) { return Constant.CHECK_REPEAT; @@ -351,8 +353,18 @@ public class IoOrderReviewController extends BaseController { public IoCodeEntity isExit(List 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; } } 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 b426efe3..b1d62bd0 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 @@ -276,6 +276,7 @@ public class IoOrderServiceImpl implements IoOrderService { } } + return 0; } From 69ea52be42785c4c8f2ce7fc523bb656315c7e9e Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 30 May 2023 16:58:12 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E9=97=AE=E9=A2=98=EF=BC=8C=E5=90=AF=E7=94=A8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=8D=95=E5=85=83=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 2 +- .../inout/IoOrderReviewController.java | 2 +- .../impl/InvInnerOrderPrintServiceImpl.java | 6 ++-- .../glxp/api/util/udi/UdiCalCountUtil.java | 33 +++++++++++++------ 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index f63903b0..ac6661e8 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -273,7 +273,7 @@ public class BasicOrderPrintController { bizData.put("index", i); bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode()); String udiCode = "#" + obj.getNameCode() + "#" + obj.getProduceDate() + "#" + obj.getExpireDate() + - "#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + obj.getWarehouseCode() + "#" + obj.getDeptCode(); + "#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + "#"; udiCode = udiCode.replaceAll("#null", "#"); bizData.put("udiCode", udiCode); bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 020e1d1f..7056ceef 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -336,7 +336,7 @@ public class IoOrderReviewController extends BaseController { checkCode = checkCode.replace("\u001D", ""); } if (checkCode.toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) { - if (checkOrderCodesBean.getStatus() == Constant.DB_CHECK_ED + if (IntUtil.value(checkOrderCodesBean.getStatus()) == Constant.DB_CHECK_ED && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) { return Constant.CHECK_REPEAT; } 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 3152c3cd..f4c4b866 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 @@ -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 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); diff --git a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java index 6af1ec10..28b71af0 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java +++ b/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 { + return udiRelevanceResponse.getBhzxxsbzsl(); } - } else { - actCount = udiRelevanceResponse.getBhzxxsbzsl(); } - - return actCount; } public int getActCount(IoCodeTempEntity codeTempEntity) { From 842fb00813160673aaee983d891620665eebbe7d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 31 May 2023 10:01:55 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 20 +++++++++ .../api/req/inv/FilterInvoiceRequest.java | 41 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 src/main/java/com/glxp/api/req/inv/FilterInvoiceRequest.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 0bdadd55..8d995a24 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/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; @@ -653,6 +656,23 @@ public class IoOrderDetailBizController extends BaseController { } + + + @GetMapping("/udiwms/inout/biz/parseInvoice") + public BaseResponse parseInvoice(String code) { + List 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 list) { String billNo = null; diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvoiceRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvoiceRequest.java new file mode 100644 index 00000000..c7a86962 --- /dev/null +++ b/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; + +} From e3ad9e47f6c16db74ea3eb2146ae463e97c5618d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 31 May 2023 10:52:26 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AEbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/inout/IoCheckInoutService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index b1d54d82..ea428065 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -128,7 +128,8 @@ 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); From ae1be7bbf39a35f71db7fd16ef664515baa12339 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 3 Jun 2023 17:57:17 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 118 +++++++++++++++++- .../api/req/inout/AddOrderChangeRequest.java | 27 ++++ .../service/inout/IoCheckInoutService.java | 20 +-- 3 files changed, 153 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/inout/AddOrderChangeRequest.java 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 27826c7f..6144db73 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/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,8 @@ 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; @@ -683,4 +689,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 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 supplementCodes = new ArrayList<>(); + + List products = addOrderChangeRequest.getProducts(); + List orderDetailBizEntities = orderDetailBizService.findByOrderId(originOrder.getBillNo()); + // 计算出两个集合之间产品批次号组成的差异 + List 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(); + } + } diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderChangeRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderChangeRequest.java new file mode 100644 index 00000000..9c190c0d --- /dev/null +++ b/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 products; + + +} diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index ea428065..aa69a6ca 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -304,16 +304,20 @@ public class IoCheckInoutService { orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); } orderDetailResultService.deleteByOrderId(orderEntity.getBillNo()); + if (!orderDetailBizService.isExit(orderEntity.getBillNo())) { + orderDetailCodeEntities.forEach(orderDetailCodeEntity -> + { + //生成业务单据 + IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); + BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); + orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount()); + orderDetailBizEntity.setId(null); + orderDetailBizService.insert(orderDetailBizEntity); + }); + + } orderDetailCodeEntities.forEach(orderDetailCodeEntity -> { - //生成业务单据 - IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); - orderDetailBizEntity.setCount(orderDetailCodeEntity.getReCount()); - orderDetailBizEntity.setId(null); - orderDetailBizService.insert(orderDetailBizEntity); - - //生成单据结果 IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity(); BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity); From b9edabf12608dd7e58f616e51df855dd6cc8520e Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 3 Jun 2023 22:41:38 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index a577f7f6..741c099a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -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(); From f20c17083df47194bd12bb76ff044a17d3d36b99 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 7 Jun 2023 12:52:06 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=AE=A1=E7=AE=97=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderController.java | 7 ++----- .../inout/IoOrderDetailResultController.java | 16 ++++++++-------- src/main/java/com/glxp/api/util/IntUtil.java | 7 +++++++ 3 files changed, 17 insertions(+), 13 deletions(-) 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 6144db73..760f9d2e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -157,13 +157,12 @@ public class IoOrderController extends BaseController { List 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())); + if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) { + amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getReCount()).multiply(ioOrderDetailCodeRespons.getPrice())); } } ioOrderResponse.setAllAmount(amount); - } @@ -305,8 +304,6 @@ public class IoOrderController extends BaseController { if (checkInoutService.checkManual(addOrderRequest.getBillNo())) { if (CollUtil.isNotEmpty(orderDetailBizEntities)) { String errMsg = checkInoutService.bizOrderCheck(orderDetailBizEntities, orderDetailCodeEntities); - - if (StrUtil.isNotEmpty(errMsg)) { return ResultVOUtils.error(500, errMsg); } 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 653ebcab..404839ae 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -192,8 +192,8 @@ public class IoOrderDetailResultController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/resultDetail/filterOrderPrint") - public BaseResponse filterOrderPrint(@RequestBody FilterOrderDetailResultRequest filterOrderDetailResultRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException { - List ioOrderDetailResultResponseList=new ArrayList<>(); + public BaseResponse filterOrderPrint(@RequestBody FilterOrderDetailResultRequest filterOrderDetailResultRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException { + List ioOrderDetailResultResponseList = new ArrayList<>(); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailResultRequest.getTemplateId()); //打印单号标签 Map data = new HashMap<>(1); @@ -201,9 +201,9 @@ public class IoOrderDetailResultController extends BaseController { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 //按选入打印 - if(filterOrderDetailResultRequest.getList() != null && filterOrderDetailResultRequest.getList().size()>0){ - ioOrderDetailResultResponseList =filterOrderDetailResultRequest.getList(); - }else{ + if (filterOrderDetailResultRequest.getList() != null && filterOrderDetailResultRequest.getList().size() > 0) { + ioOrderDetailResultResponseList = filterOrderDetailResultRequest.getList(); + } else { //按查询打印 FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setVueType(filterOrderDetailResultRequest.getActionType()); @@ -223,7 +223,7 @@ public class IoOrderDetailResultController extends BaseController { } } } - int i=1; + int i = 1; for (IoOrderDetailResultResponse ioOrderDetailResultResponse : ioOrderDetailResultResponseList) { //组装数据 Map ioOrderDetailResultData = new HashMap<>(); @@ -240,7 +240,7 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("spec", ioOrderDetailResultResponse.getSpec() == null ? ' ' : ioOrderDetailResultResponse.getSpec()); ioOrderDetailResultData.put("price", ioOrderDetailResultResponse.getPrice() == null ? ' ' : ioOrderDetailResultResponse.getPrice()); ioOrderDetailResultData.put("count", ioOrderDetailResultResponse.getCount()); - ioOrderDetailResultData.put("reCount",ioOrderDetailResultResponse.getReCount()); + ioOrderDetailResultData.put("reCount", ioOrderDetailResultResponse.getReCount()); ioOrderDetailResultData.put("inCount", ioOrderDetailResultResponse.getInCount()); ioOrderDetailResultData.put("acceptCount", ioOrderDetailResultResponse.getAcceptCount()); ioOrderDetailResultData.put("fromCorpName", ioOrderDetailResultResponse.getFromCorpName() == null ? ' ' : ioOrderDetailResultResponse.getFromCorpName()); @@ -252,7 +252,7 @@ public class IoOrderDetailResultController extends BaseController { } String param = JSON.toJSONString(list); - JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf"); + JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/util/IntUtil.java b/src/main/java/com/glxp/api/util/IntUtil.java index 3971e233..aa0be398 100644 --- a/src/main/java/com/glxp/api/util/IntUtil.java +++ b/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; + } } From 0a393fc1ae9364ee2912b4d9b96ce683d3312569 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 7 Jun 2023 14:03:29 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=AE=A1=E7=AE=97=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderDetailBizController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 8d995a24..2f075b86 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -657,7 +657,6 @@ public class IoOrderDetailBizController extends BaseController { } - @GetMapping("/udiwms/inout/biz/parseInvoice") public BaseResponse parseInvoice(String code) { List list = Arrays.asList(code.split(",")); @@ -671,8 +670,6 @@ public class IoOrderDetailBizController extends BaseController { } - - @PostMapping("/udiwms/inout/biz/updateorderBiz") public BaseResponse updateorderBiz(@RequestBody List list) { String billNo = null; @@ -699,8 +696,8 @@ public class IoOrderDetailBizController extends BaseController { public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) { List ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest); for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { - if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) { - ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice())); + if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) { + ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getReCount()).multiply(ioOrderDetailCodeRespons.getPrice())); } String msg = ""; IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest(); From e7e5cac0bb6bf930c83d0c023701630c6ce4cb91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 7 Jun 2023 17:08:46 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 6 +- .../com/glxp/api/dao/inout/IoOrderDao.java | 2 + .../api/dao/inout/IoOrderDetailBizDao.java | 2 + .../inout/IoOrderDetailBizService.java | 2 + .../api/service/inout/IoOrderService.java | 2 + .../impl/IoOrderDetailBizServiceImpl.java | 11 + .../inout/impl/IoOrderServiceImpl.java | 11 + .../mybatis/mapper/inout/IoOrderDao.xml | 235 +++++++++++++++--- .../mapper/inout/IoOrderDetailBizDao.xml | 24 ++ 9 files changed, 250 insertions(+), 45 deletions(-) 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 6144db73..b1bbd080 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -146,7 +146,7 @@ public class IoOrderController extends BaseController { if (!customerId.equals("110")) { filterOrderRequest.setFromCorp(customerId); } - List list = orderService.getfilterList(filterOrderRequest); + List list = orderService.getfilterOrderList(filterOrderRequest); for (IoOrderResponse ioOrderResponse : list) { if (ioOrderResponse.getCheckStatus() == null) { @@ -154,7 +154,7 @@ public class IoOrderController extends BaseController { } FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest(); filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo()); - List ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest); + List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(filterOrderDetailCodeRequest); BigDecimal amount = new BigDecimal(0.00); for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) { @@ -162,8 +162,6 @@ public class IoOrderController extends BaseController { } } ioOrderResponse.setAllAmount(amount); - - } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index b2cfe5dc..ad9882b8 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -22,6 +22,8 @@ public interface IoOrderDao extends BaseMapperPlus getfilterList(FilterOrderRequest filterOrderRequest); + List getfilterOrderList(FilterOrderRequest filterOrderRequest); + /** * 查询单据实体列表 * diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index b4e93ab5..d183c89e 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -23,6 +23,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); IoOrderInvoiceResponse selectByinvoiceId(Long id); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index a8853daf..c85b5250 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -38,6 +38,8 @@ public interface IoOrderDetailBizService { List getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); + List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); + IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk); List checkOrderList(String orderId); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 3c117440..203651bf 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -56,6 +56,8 @@ public interface IoOrderService { List getfilterList(FilterOrderRequest filterOrderRequest); + List getfilterOrderList(FilterOrderRequest filterOrderRequest); + /** * 查询单据列表 * 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 1c27807a..70ced51f 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 @@ -132,6 +132,17 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest); } + @Override + public List 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 ew = new QueryWrapper<>(); 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 b1d62bd0..f75079d0 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 @@ -546,6 +546,17 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.getfilterList(filterOrderRequest); } + @Override + public List 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 filterOrderList(FilterOrderRequest filterOrderRequest) { if (null == filterOrderRequest) { diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 0d4bb3f2..fc6e2c55 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -2,85 +2,88 @@ select * from io_order @@ -407,4 +412,152 @@ from io_order where billNo = #{billNo} + + + + + + + + + diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 122998d2..cf3d5258 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -111,4 +111,28 @@ + + + From d52bb00a184432812096646998360680eb4f9b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 7 Jun 2023 17:28:13 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/inout/IoOrderDao.xml | 185 +++++++++--------- 1 file changed, 89 insertions(+), 96 deletions(-) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index fc6e2c55..e1e10206 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -2,88 +2,85 @@ - select io.*, - (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName, - (select name from auth_dept ad where ad.code = io.deptCode) deptName, - (select name from auth_warehouse aw where aw.code = io.invCode) invName, - (select employeeName from auth_user au where au.id = io.createUser) createUserName, - (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, - (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, - (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName, - (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, - (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 - and io_order_detail_code.regStatus = 1 - ) AS allCout, - (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 + SELECT + io.*, + bus.NAME AS billTypeName, + ad.NAME AS deptName, + aw.NAME AS invName, + bc.NAME AS fromCorpName, + COUNT(IF(dc.regStatus = 1, 1, NULL)) AS allCount, + COUNT(IF(dc.regStatus = 0, 1, NULL)) AS partCount + 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 - AND id = #{id} + AND io.id = #{id} AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like concat('%', #{corpName}, '%') - AND action = #{action} + AND io.action = #{action} - AND mainAction = #{mainAction} + AND io.mainAction = #{mainAction} - AND billNo like concat('%', #{billNo}, '%') + AND io.billNo like concat('%', #{billNo}, '%') - AND corpOrderId = #{corpOrderId} + AND io.corpOrderId = #{corpOrderId} - AND fromCorp = #{fromCorp} + AND io.fromCorp = #{fromCorp} - AND deptCode = #{deptCode} + AND io.deptCode = #{deptCode} - AND invCode = #{invCode} + AND io.invCode = #{invCode} - AND busType = #{busType} + AND io.busType = #{busType} - AND inCodeStatus = #{inCodeStatus} + AND io.inCodeStatus = #{inCodeStatus} - AND relKey = #{relKey} + AND io.relKey = #{relKey} - AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') + AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') - AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d') + AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d') - AND `action` in + AND io.`action` in #{item} - AND fromType in + AND io.fromType in #{item} - AND status in + AND io.status in #{item} - AND dealStatus in + AND io.dealStatus in #{item} @@ -511,48 +503,49 @@ - AND status = #{status} + AND io.status = #{status} - AND orderType = #{orderType} + AND io.orderType = #{orderType} - AND (`action` in + AND (io.`action` in #{item} - and status = 10) + and io.status = 10) and ( - `action` in + io.`action` in #{item} - and status = 7 + and io.status = 7 ) - AND ((`action` in + AND ((io.`action` in #{item} - and status = 10) + and io.status = 10) or ( - `action` in + io.`action` in #{item} - and status = 7) + and io.status = 7) ) - order by createTime desc + GROUP BY io.id + order by io.createTime desc From 79df891647d8104f397ac205a119e2f5f43bedc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 7 Jun 2023 18:01:55 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 2 +- .../mybatis/mapper/inout/IoOrderDetailBizDao.xml | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index e1e10206..f7b8142f 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -417,7 +417,7 @@ ad.NAME AS deptName, aw.NAME AS invName, bc.NAME AS fromCorpName, - COUNT(IF(dc.regStatus = 1, 1, NULL)) AS allCount, + COUNT(IF(dc.regStatus = 1, 1, NULL)) AS allCout, COUNT(IF(dc.regStatus = 0, 1, NULL)) AS partCount FROM io_order io diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index cf3d5258..6da20521 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -50,12 +50,10 @@ @@ -331,7 +330,7 @@ ]]> - order by createTime desc + @@ -545,7 +544,15 @@ GROUP BY io.id - order by io.createTime desc + + + order by ${orderBy} ${sort} + + + order by updateTime desc + + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index acf4c3d0..d7e487e0 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -102,5 +102,14 @@ AND createUser = #{createUser} + + + order by ${orderBy} ${sort} + + + order by pur_order.updateTime desc + + + From 8733e63cd57871d6db9549593976fb11b4cae22b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 8 Jun 2023 10:10:06 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderDetailBizController.java | 5 ++++- .../java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 8d995a24..73df7af8 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -575,6 +575,7 @@ public class IoOrderDetailBizController extends BaseController { FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest(); filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); + filterOrderDetailBizRequest.setBatchNo(ioOrderInvoiceEntity.getBatchNo()); ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk()); @@ -583,9 +584,11 @@ public class IoOrderDetailBizController extends BaseController { List list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest); if (list.size() == 0) { ioOrderDetailBizEntity.setRegStatus(false); + }else{ + ioOrderDetailBizEntity.setRegStatus(true); } orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); - return ResultVOUtils.success(); + return ResultVOUtils.success(list); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java index adca1dd9..c7eacf2d 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java +++ b/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) From 8198a354583ef476cd3551080d29ea7d88027715 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 8 Jun 2023 15:03:26 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inout/IoCheckInoutService.java | 8 + src/main/resources/schemas/schema_v2.1.sql | 806 +++++++++--------- 2 files changed, 420 insertions(+), 394 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index aa69a6ca..2cfdc022 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -10,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; @@ -69,6 +70,9 @@ public class IoCheckInoutService { private final IoOrderDetailBizService orderDetailBizService; @Resource IoOrderDetailResultService orderDetailResultService; + @Resource + IoOrderDetailCodeDao orderDetailCodeDao; + @Resource InvPreinDetailService invPreinDetailService; @Resource @@ -415,6 +419,7 @@ public class IoCheckInoutService { if (checkCount(bizEntity, codeEntity) == null) { bizEntity.setCheckSuccess(true); codeEntity.setCheckSuccess(true); + codeEntity.setPrice(bizEntity.getPrice()); } break; } @@ -443,6 +448,8 @@ public class IoCheckInoutService { orderDetailResultService.insert(orderDetailResultEntity); } + orderDetailCodeDao.updateBatchById(orderDetailCodeEntities); + //临时表转正式表 List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { @@ -464,6 +471,7 @@ public class IoCheckInoutService { } } + //业务单正向校验 public String bizNoPiCheck(List orderDetailBizEntities, IoOrderEntity orderEntity) { diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 0136c620..2421a141 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -1,397 +1,415 @@ -# 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除） - - +# # 字段新增 （表名，字段名，字段类型，修改方式（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); - -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('basic_udirel', 'zdcfsycs', 'int', 1); -CALL Pro_Temp_ColumnWork('io_order_detail_code', 'updateTime', 'datetime', 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('basic_udirel', 'zdcfsycs', 'int', 1); +# CALL Pro_Temp_ColumnWork('io_order_detail_code', 'updateTime', 'datetime', 1); +# From d67ef1050c626c9b60def58cc7075cf45ff7a13f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 8 Jun 2023 15:24:26 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E6=97=B6=20=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=AF=E6=9C=AA=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 10 ++++++--- .../glxp/api/req/inout/InvoiceRequest.java | 21 +++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/inout/InvoiceRequest.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 6800fcd2..5a6de8ee 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -674,10 +674,14 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/biz/updateorderBiz") - public BaseResponse updateorderBiz(@RequestBody List list) { + public BaseResponse updateorderBiz(@RequestBody InvoiceRequest invoiceRequest) { String billNo = null; - for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : list) { - ioOrderDetailBizEntity.setRegStatus(true); + for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : invoiceRequest.getList()) { + if("key".equals(invoiceRequest.getKey())){ + ioOrderDetailBizEntity.setRegStatus(false); + }else{ + ioOrderDetailBizEntity.setRegStatus(true); + } orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); billNo = ioOrderDetailBizEntity.getOrderIdFk(); } diff --git a/src/main/java/com/glxp/api/req/inout/InvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/InvoiceRequest.java new file mode 100644 index 00000000..60c44044 --- /dev/null +++ b/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 list; + private String key; + + + +} From f4771d3382d7cf1871239147711a9845e2eb2070 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 8 Jun 2023 15:34:16 +0800 Subject: [PATCH 19/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inout/IoOrderDetailBizController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 5a6de8ee..f6ea1988 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -576,9 +576,11 @@ public class IoOrderDetailBizController extends BaseController { 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 list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest); From 3ac25d320a2b8484013878d19e4f3378bc7f4009 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 8 Jun 2023 16:30:53 +0800 Subject: [PATCH 20/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderDetailBizController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index f6ea1988..0860edec 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -573,6 +573,9 @@ 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()); @@ -584,13 +587,14 @@ public class IoOrderDetailBizController extends BaseController { ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().longValue()); ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId() + ""); List list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest); + List ioOrderInvoiceResponses = orderDetailBizService.filterListInv(filterOrderDetailBizRequest1); if (list.size() == 0) { ioOrderDetailBizEntity.setRegStatus(false); }else{ ioOrderDetailBizEntity.setRegStatus(true); } orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); - return ResultVOUtils.success(list); + return ResultVOUtils.success(ioOrderInvoiceResponses); } From c57e232dfbf1b0e3617f5f741f609d413623efea Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 8 Jun 2023 18:22:51 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 11 ++----- .../service/inout/IoChangeInoutService.java | 1 - .../service/inout/IoCheckInoutService.java | 8 ++++- .../service/inout/IoOrderInvoiceService.java | 4 +++ .../inout/impl/IoOrderInvoiceServiceImpl.java | 30 +++++++++++++++++++ .../mapper/inout/IoOrderDetailBizDao.xml | 24 +++++++-------- .../mapper/inout/IoOrderInvoiceMapper.xml | 12 +++----- 7 files changed, 59 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 0860edec..5f78b08a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -590,7 +590,7 @@ public class IoOrderDetailBizController extends BaseController { List ioOrderInvoiceResponses = orderDetailBizService.filterListInv(filterOrderDetailBizRequest1); if (list.size() == 0) { ioOrderDetailBizEntity.setRegStatus(false); - }else{ + } else { ioOrderDetailBizEntity.setRegStatus(true); } orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); @@ -683,12 +683,7 @@ public class IoOrderDetailBizController extends BaseController { public BaseResponse updateorderBiz(@RequestBody InvoiceRequest invoiceRequest) { String billNo = null; for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : invoiceRequest.getList()) { - if("key".equals(invoiceRequest.getKey())){ - ioOrderDetailBizEntity.setRegStatus(false); - }else{ - ioOrderDetailBizEntity.setRegStatus(true); - } - orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity); + ioOrderInvoiceService.updateRegStatus(ioOrderDetailBizEntity); billNo = ioOrderDetailBizEntity.getOrderIdFk(); } IoOrderEntity orderEntity = orderService.findByBillNo(billNo); @@ -707,7 +702,7 @@ public class IoOrderDetailBizController extends BaseController { */ @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList") public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) { - List ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest); + List ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest); for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) { if (ioOrderDetailCodeRespons.getReCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) { ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getReCount()).multiply(ioOrderDetailCodeRespons.getPrice())); diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 6748597f..b9b4c649 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/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); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 2cfdc022..28a84ce7 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -350,6 +350,9 @@ public class IoCheckInoutService { checkThird(orderEntity); } + @Resource + IoOrderInvoiceService orderInvoiceService; + //一次校验完成 public void checkFirstFinish(IoOrderEntity orderEntity) { @@ -420,6 +423,7 @@ public class IoCheckInoutService { bizEntity.setCheckSuccess(true); codeEntity.setCheckSuccess(true); codeEntity.setPrice(bizEntity.getPrice()); + orderInvoiceService.updateRegStatus(codeEntity); } break; } @@ -448,7 +452,7 @@ public class IoCheckInoutService { orderDetailResultService.insert(orderDetailResultEntity); } - orderDetailCodeDao.updateBatchById(orderDetailCodeEntities); +// orderDetailCodeDao.updateBatchById(orderDetailCodeEntities); //临时表转正式表 List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); @@ -1029,4 +1033,6 @@ public class IoCheckInoutService { } return bizEntity.getCoName() + "数量不匹配！"; } + + } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java index ed597467..74dc0e40 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderInvoiceService.java @@ -2,6 +2,7 @@ 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; @@ -20,5 +21,8 @@ public interface IoOrderInvoiceService extends IService { List selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest); + // 更新发票状态 + boolean updateRegStatus(IoOrderDetailCodeEntity orderDetailCodeEntity); + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java index 1e626ac5..b3b0a0dd 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java @@ -1,10 +1,13 @@ package com.glxp.api.service.inout.impl; +import cn.hutool.core.collection.CollUtil; 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 org.springframework.beans.BeanUtils; @@ -14,6 +17,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 +26,8 @@ import java.util.List; public class IoOrderInvoiceServiceImpl extends ServiceImpl implements IoOrderInvoiceService { @Resource IoOrderInvoiceMapper ioOrderInvoiceMapper; + @Resource + IoOrderDetailCodeDao orderDetailCodeDao; @Override public List findByBillNo(String orderIdFk) { @@ -51,4 +57,28 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl 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 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; + } } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 6da20521..90dec082 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -50,10 +50,10 @@ - + select * + from io_order_invoice + where id = #{id} select io_order_detail_code.*, - (select count(*) - FROM io_order_invoice - where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount + (select count(*) + FROM io_order_invoice + where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount from io_order_detail_code @@ -126,11 +128,7 @@ AND batchNo = #{batchNo} - - AND bp.cpmctymc like concat('%', #{productName}, '%') - group by io_order_detail_code.id - diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml index f60f7cf2..3cc52948 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml @@ -12,15 +12,11 @@ select io.*, - (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName, - (select name from auth_dept ad where ad.code = io.deptCode) deptName, - (select name from auth_warehouse aw where aw.code = io.invCode) invName, - (select employeeName from auth_user au where au.id = io.createUser) createUserName, - (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, - (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, - (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName, - (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, - (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 name from basic_bussiness_type bus where bus.action = io.action) billTypeName, + (select name from auth_dept ad where ad.code = io.deptCode) deptName, + (select name from auth_warehouse aw where aw.code = io.invCode) invName, + (select employeeName from auth_user au where au.id = io.createUser) createUserName, + (select employeeName from auth_user au2 where au2.id = io.updateUser) updateUserName, + (select employeeName from auth_user au3 where au3.id = io.reviewUser) reviewUserName, + (select employeeName from auth_user au4 where au4.id = io.checkUser) checkUserName, + (select name from auth_dept ad2 where ad2.code = io.fromDeptCode) fromDeptName, + (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 from io_order as io @@ -21,7 +21,7 @@ AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like - concat('%', #{corpName}, '%') + concat('%', #{corpName}, '%') AND action = #{action} @@ -109,12 +109,12 @@ and ( - `action` in + `action` in #{item} and status = 7 - ) + ) @@ -123,13 +123,13 @@ #{item} and status = 10) - or ( - `action` in + or ( + `action` in #{item} and status = 7) - ) + ) @@ -138,23 +138,27 @@ - - - @@ -410,28 +410,24 @@ - - - - - - diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 90dec082..ef29a18a 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -113,10 +113,7 @@