From 5e1c7b5fdb4d17fe28678e2f0885235e4707a781 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 24 Feb 2023 09:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9B=86=E9=87=87=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/WareHouseController.java | 15 +- .../basic/BussinessLocalTypeEntity.java | 1 + .../entity/basic/BussinessTypeEntity.java | 3 + .../entity/basic/UdiRelevanceEntity.java | 3 + .../admin/req/basic/FilterUdiInfoRequest.java | 2 + .../admin/req/basic/UdiRelevanceRequest.java | 3 + .../admin/res/basic/BussinessTypResponse.java | 2 + .../admin/res/basic/UdiRelevanceResponse.java | 3 + .../admin/thread/InvProductsTrService.java | 120 +-- .../main/resources/application-dev.properties | 4 +- .../mybatis/mapper/basic/BussinessTypeDao.xml | 661 +++++++++------ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 758 +++++++++++------- .../main/resources/schemas/schema_v2.2.sql | 18 +- 13 files changed, 1019 insertions(+), 574 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 7c48dfd..0f2a63c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -827,7 +827,7 @@ public class WareHouseController { } //产品是否可以以使用单元入库 List udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode(), unitFk); - if (udiRelevanceResponses.size() == 1) { + if (udiRelevanceResponses.size() >= 1) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0); if (udiRelevanceResponse == null) { return ResultVOUtils.error(500, "该产品信息未维护！"); @@ -835,6 +835,19 @@ public class WareHouseController { return ResultVOUtils.error(500, "该产品不允许以使用单元入库！"); } + if (bussinessTypeEntity.isVailDispatch() && !udiRelevanceResponse.isDispatch()) { + return ResultVOUtils.error(500, "该产品不可配送，请联系院方！"); + } + + if (bussinessTypeEntity.getVailGroupBuy() == 1 && !udiRelevanceResponse.isGroupBuy()) { //只采集集采产品 + return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入集采产品！"); + } + + if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) { //只采集非集采产品 + return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "单只允许录入非集采产品！"); + } + + //计算实际数量 int actCount = 0; if (udiRelevanceResponse.getIsUseDy() == 1 && udiRelevanceResponse.getDiType() != 2) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java index d6348ba..915a374 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java @@ -39,4 +39,5 @@ public class BussinessLocalTypeEntity { private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示 + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java index 54abf07..d76d21b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java @@ -74,4 +74,7 @@ public class BussinessTypeEntity { private boolean checkCopy; private boolean secCheckCopy; + + private boolean vailDispatch; //校验是否可配送 + private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品 } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java index 5651ee7..6d9335c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java @@ -35,6 +35,9 @@ public class UdiRelevanceEntity { private String price; private String modifyTime; //修改时间 + private boolean dispatch; //是否可配送 + private boolean groupBuy; //是否集采产品 + public Integer getLockStatus() { if (lockStatus == null) return 1; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java index 7e743b8..67c0126 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java @@ -61,4 +61,6 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String relId; private String companyName; + private String supId; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiRelevanceRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiRelevanceRequest.java index fd0803a..4933edb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiRelevanceRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiRelevanceRequest.java @@ -38,5 +38,8 @@ public class UdiRelevanceRequest { private Boolean useMuti; //是否多次使用 private Integer useNum; //最小包装单元可使用次数 + private boolean dispatch; //是否可配送 + private boolean groupBuy; //是否集采产品 + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java index 818823d..e08ad31 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java @@ -78,4 +78,6 @@ public class BussinessTypResponse { private boolean checkSelect; //判断多选框是否勾选 private boolean checkSp; + private boolean vailDispatch; + private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品 } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index 812fffe..eb6f338 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -89,6 +89,9 @@ public class UdiRelevanceResponse { private Integer useNum; //最小包装单元可使用次数 private Integer pid; //用来存父id + private boolean dispatch; //是否可配送 + private boolean groupBuy; //是否集采产品 + //产品代理商 private String cpdls; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index a0edf60..61610c5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.thread; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.db.sql.Order; import com.glxp.sale.admin.constant.ConstantStatus; @@ -704,60 +705,83 @@ public class InvProductsTrService { for (String corpName : filterSupMaps.keySet()) { List temps; temps = filterSupMaps.get(corpName); - OrderEntity outOrder = new OrderEntity(); - BeanUtils.copyProperties(orderEntity, outOrder); - outOrder.setSupplementNo(null);//补单需置空 - outOrder.setActDate(DateUtil.getBeforeDay(fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime())); - outOrder.setCreateTime(outOrder.getActDate()); - outOrder.setAction(bussinessChangeTypeEntity.getScAction()); - outOrder.setMainAction(ConstantType.TYPE_PUT); - outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); - outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); - outOrder.setErpFk(null); - outOrder.setFromType(ConstantStatus.FROM_CHANGE); - String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); - outOrder.setId(orderNo); - outOrder.setFromCorpId(corpName); - outOrder.setFromCorp(temps.get(0).getFromCorp()); -// BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction()); - if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) { - outOrder.setFromSubInvCode(bussinessChangeTypeEntity.getDefaultSubInv()); - } - outOrder.setCorpOrderId(CustomUtil.getId() + "x"); - outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); - outOrder.setInvStorageCode(orderEntity.getLocStorageCode()); - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); - if ("1".equals(systemParamConfigEntity.getParamValue())) { - outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { //只有补采购入时才需要拆弹 + List buildArray = new ArrayList<>(); + //开始过滤集采非集采产品 + for (WarehouseEntity warehouseEntity : temps) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId()); + if (udiRelevanceEntity.isGroupBuy()) { + List single = new ArrayList<>(); + single.add(warehouseEntity); + buildOrderEntity(orderEntity, bussinessChangeTypeEntity, single, bussinessTypeEntity); + } else { + buildArray.add(warehouseEntity); + } + } + if (CollUtil.isNotEmpty(buildArray)) + buildOrderEntity(orderEntity, bussinessChangeTypeEntity, buildArray, bussinessTypeEntity); } else { - outOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); + buildOrderEntity(orderEntity, bussinessChangeTypeEntity, temps, bussinessTypeEntity); } - //互填单号 - orderEntity.setUllageSupNo(outOrder.getId()); - orderEntity.setUpdateTime(new Date()); - orderService.updateOrder(orderEntity); - outOrder.setOriginUllageSupNo(orderEntity.getId()); - outOrder.setCreateUser(null); - outOrder.setReviewUser(null); - outOrder.setPreCheck(false); - outOrder.setReceiveStatus(0); - orderService.insertOrder(outOrder); - for (WarehouseEntity warehouseEntity : temps) { - warehouseEntity.setOrderId(outOrder.getId()); - warehouseEntity.setId(null); - warehouseEntity.setFromCorp(outOrder.getFromCorp()); - warehouseEntity.setFromCorpId(outOrder.getFromCorpId()); - warehouseEntity.setLocStorageCode(outOrder.getLocStorageCode()); - warehouseEntity.setInvWarehouseCode(outOrder.getInvWarehouseCode()); - warehouseEntity.setAction(bussinessChangeTypeEntity.getScAction()); - warehouseEntity.setMainAction(ConstantType.TYPE_PUT); - } - codesTempService.insertCodesTemp(temps); } + } + public void buildOrderEntity(OrderEntity orderEntity, BussinessChangeTypeEntity bussinessChangeTypeEntity, List temps, BussinessTypeEntity bussinessTypeEntity) { + OrderEntity outOrder = new OrderEntity(); + BeanUtils.copyProperties(orderEntity, outOrder); + outOrder.setSupplementNo(null);//补单需置空 + outOrder.setActDate(DateUtil.getBeforeDay(fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime())); + outOrder.setCreateTime(outOrder.getActDate()); + outOrder.setAction(bussinessChangeTypeEntity.getScAction()); + outOrder.setMainAction(ConstantType.TYPE_PUT); + outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); + outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); + outOrder.setErpFk(null); + outOrder.setFromType(ConstantStatus.FROM_CHANGE); + String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); + outOrder.setId(orderNo); + outOrder.setFromCorpId(temps.get(0).getFromCorpId()); + outOrder.setFromCorp(temps.get(0).getFromCorp()); +// BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction()); + if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) { + outOrder.setFromSubInvCode(bussinessChangeTypeEntity.getDefaultSubInv()); + } + outOrder.setCorpOrderId(CustomUtil.getId() + "x"); + outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); + outOrder.setInvStorageCode(orderEntity.getLocStorageCode()); + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); + if ("1".equals(systemParamConfigEntity.getParamValue())) { + outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + } else { + outOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); + } + + //互填单号 + orderEntity.setUllageSupNo(outOrder.getId()); + orderEntity.setUpdateTime(new Date()); + orderService.updateOrder(orderEntity); + outOrder.setOriginUllageSupNo(orderEntity.getId()); + outOrder.setCreateUser(null); + outOrder.setReviewUser(null); + outOrder.setPreCheck(false); + outOrder.setReceiveStatus(0); + orderService.insertOrder(outOrder); + for (WarehouseEntity warehouseEntity : temps) { + warehouseEntity.setOrderId(outOrder.getId()); + warehouseEntity.setId(null); + warehouseEntity.setFromCorp(outOrder.getFromCorp()); + warehouseEntity.setFromCorpId(outOrder.getFromCorpId()); + warehouseEntity.setLocStorageCode(outOrder.getLocStorageCode()); + warehouseEntity.setInvWarehouseCode(outOrder.getInvWarehouseCode()); + warehouseEntity.setAction(bussinessChangeTypeEntity.getScAction()); + warehouseEntity.setMainAction(ConstantType.TYPE_PUT); + } + codesTempService.insertCodesTemp(temps); } @@ -1163,4 +1187,4 @@ public class InvProductsTrService { return time; } -} \ No newline at end of file +} diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 4998567..d06debe 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,7 +1,7 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9996 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_yxz?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 @@ -35,4 +35,4 @@ spring.redis.password= spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +spring.redis.jedis.pool.min-idle=0 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 365f5f2..3c36f6d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -2,49 +2,86 @@ - @@ -55,25 +92,21 @@ FROM basic_bussiness_type - AND basic_bussiness_type.name LIKE concat('%',#{name},'%') + AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') - AND basic_bussiness_type.action LIKE concat('%',#{action},'%') + AND basic_bussiness_type.action LIKE concat('%', #{action}, '%') - AND basic_bussiness_type.mainAction LIKE concat('%',#{mainAction},'%') + AND basic_bussiness_type.mainAction LIKE concat('%', #{mainAction}, '%') - AND basic_bussiness_type.enable =#{enabled} - - - AND basic_bustype_local.advanceType =#{advanceType} + AND basic_bussiness_type.enable = #{enabled} - - AND basic_bustype_local.spUse =#{spUse} - - - = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') + ]]> @@ -82,276 +115,410 @@ replace - INTO basic_bussiness_type - (`action`,`name`,enable,remark,mainAction,localAction,thirdSysFk, - checkEnable,genUnit,innerOrder,secCheckEnable, - checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange - ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, - secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne, - secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix - ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv,orderVisibleType, checkCopy,secCheckCopy) - values - ( - #{action}, - #{name}, - #{enable}, - #{remark}, - #{mainAction}, - #{localAction}, - #{thirdSysFk}, - #{checkEnable}, - #{genUnit}, - #{innerOrder}, - #{secCheckEnable}, - #{checkUdims}, - #{checkPdaEd}, - #{checkPdaUn}, - #{checkPc}, - #{checkWebNew}, - #{checkChange}, - #{secCheckUdims}, - #{secCheckPdaEd}, - #{secCheckPdaUn}, - #{secCheckPc}, - #{secCheckWebNew}, - #{secCheckChange}, - #{corpType}, - #{storageCode}, - #{checkBalacne}, - #{secCheckBalacne}, - #{supplementOrderType}, - #{defaultUnit}, - #{useDyCount}, - #{expireTip}, - #{updateTime}, - #{prefix}, - #{ullageFill}, - #{scanPreIn}, - #{vailInv}, - #{codeFillCheck}, - #{defaultSubInv}, - #{defaultInv}, - #{orderVisibleType}, - #{checkCopy}, - #{secCheckCopy} - ) + INTO basic_bussiness_type + (`action`, `name`, enable, remark, mainAction, localAction, thirdSysFk, + checkEnable, genUnit, innerOrder, secCheckEnable, + checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange + , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, + secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne, + secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix + , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy, + secCheckCopy, vailDispatch, vailGroupBuy) + values (#{action}, + #{name}, + #{enable}, + #{remark}, + #{mainAction}, + #{localAction}, + #{thirdSysFk}, + #{checkEnable}, + #{genUnit}, + #{innerOrder}, + #{secCheckEnable}, + #{checkUdims}, + #{checkPdaEd}, + #{checkPdaUn}, + #{checkPc}, + #{checkWebNew}, + #{checkChange}, + #{secCheckUdims}, + #{secCheckPdaEd}, + #{secCheckPdaUn}, + #{secCheckPc}, + #{secCheckWebNew}, + #{secCheckChange}, + #{corpType}, + #{storageCode}, + #{checkBalacne}, + #{secCheckBalacne}, + #{supplementOrderType}, + #{defaultUnit}, + #{useDyCount}, + #{expireTip}, + #{updateTime}, + #{prefix}, + #{ullageFill}, + #{scanPreIn}, + #{vailInv}, + #{codeFillCheck}, + #{defaultSubInv}, + #{defaultInv}, + #{orderVisibleType}, + #{checkCopy}, + #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}) insert - ignore + ignore INTO basic_bussiness_type - (`index`,action,name,enable,remark,mainAction,localAction,thirdSysFk, - checkEnable,genUnit,innerOrder,secCheckEnable, - checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange - ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, - secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix - ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv,orderVisibleType, checkCopy,secCheckCopy) - values - ( - #{index}, - #{action}, - #{name}, - #{enable}, - #{remark}, - #{mainAction}, - #{localAction}, - #{thirdSysFk}, - #{checkEnable}, - #{genUnit}, - #{innerOrder}, - #{secCheckEnable}, - #{checkUdims}, - #{checkPdaEd}, - #{checkPdaUn}, - #{checkPc}, - #{checkWebNew}, - #{checkChange}, - #{secCheckUdims}, - #{secCheckPdaEd}, - #{secCheckPdaUn}, - #{secCheckPc}, - #{secCheckWebNew}, - #{secCheckChange}, - #{corpType}, - #{storageCode}, - #{checkBalacne}, - #{secCheckBalacnesecCheckBalacne}, - #{supplementOrderType}, - #{defaultUnit}, - #{useDyCount}, - #{expireTip}, - #{updateTime}, - #{prefix}, - #{ullageFill}, - #{scanPreIn}, - #{vailInv}, - #{codeFillCheck}, - #{defaultSubInv}, - #{defaultInv}, - #{orderVisibleType}, - #{checkCopy}, - #{secCheckCopy} - ) + (`index`, action, name, enable, remark, mainAction, localAction, thirdSysFk, + checkEnable, genUnit, innerOrder, secCheckEnable, + checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange + , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, + secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit, + useDyCount, expireTip, updateTime, prefix + , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy, + secCheckCopy, vailDispatch, vailGroupBuy) + values (#{index}, + #{action}, + #{name}, + #{enable}, + #{remark}, + #{mainAction}, + #{localAction}, + #{thirdSysFk}, + #{checkEnable}, + #{genUnit}, + #{innerOrder}, + #{secCheckEnable}, + #{checkUdims}, + #{checkPdaEd}, + #{checkPdaUn}, + #{checkPc}, + #{checkWebNew}, + #{checkChange}, + #{secCheckUdims}, + #{secCheckPdaEd}, + #{secCheckPdaUn}, + #{secCheckPc}, + #{secCheckWebNew}, + #{secCheckChange}, + #{corpType}, + #{storageCode}, + #{checkBalacne}, + #{secCheckBalacne}, + #{supplementOrderType}, + #{defaultUnit}, + #{useDyCount}, + #{expireTip}, + #{updateTime}, + #{prefix}, + #{ullageFill}, + #{scanPreIn}, + #{vailInv}, + #{codeFillCheck}, + #{defaultSubInv}, + #{defaultInv}, + #{orderVisibleType}, + #{checkCopy}, + #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}) UPDATE basic_bussiness_type - action = #{action}, - name = #{name}, - enable = #{enable}, - remark = #{remark}, - mainAction = #{mainAction}, - localAction=#{localAction}, - checkEnable=#{checkEnable}, - genUnit=#{genUnit}, - innerOrder=#{innerOrder}, - secCheckEnable=#{secCheckEnable}, - checkUdims=#{checkUdims}, - checkPdaEd=#{checkPdaEd}, - checkPdaUn=#{checkPdaUn}, - checkPc=#{checkPc}, - checkWebNew=#{checkWebNew}, - checkChange=#{checkChange}, - secCheckUdims=#{secCheckUdims}, - secCheckPdaEd=#{secCheckPdaEd}, - secCheckPdaUn=#{secCheckPdaUn}, - secCheckPc=#{secCheckPc}, - secCheckWebNew=#{secCheckWebNew}, - secCheckChange=#{secCheckChange}, - checkBalacne=#{checkBalacne}, - secCheckBalacne=#{secCheckBalacne}, - index=#{index}, - corpType=#{corpType}, - storageCode=#{storageCode}, - supplementOrderType=#{supplementOrderType}, - defaultUnit=#{defaultUnit}, - useDyCount=#{useDyCount}, - expireTip=#{expireTip}, - updateTime=#{updateTime}, - ullageFill=#{ullageFill}, - scanPreIn=#{scanPreIn}, - vailInv=#{vailInv}, - prefix=#{prefix}, - codeFillCheck=#{codeFillCheck}, - defaultSubInv=#{defaultSubInv}, - defaultInv=#{defaultInv}, - orderVisibleType=#{orderVisibleType}, - checkCopy=#{checkCopy}, - secCheckCopy=#{secCheckCopy}, + + action = #{action}, + + + name = #{name}, + + + enable = #{enable}, + + + remark = #{remark}, + + + mainAction = #{mainAction}, + + + localAction=#{localAction}, + + + checkEnable=#{checkEnable}, + + + genUnit=#{genUnit}, + + + innerOrder=#{innerOrder}, + + + secCheckEnable=#{secCheckEnable}, + + + checkUdims=#{checkUdims}, + + + checkPdaEd=#{checkPdaEd}, + + + checkPdaUn=#{checkPdaUn}, + + + checkPc=#{checkPc}, + + + checkWebNew=#{checkWebNew}, + + + checkChange=#{checkChange}, + + + secCheckUdims=#{secCheckUdims}, + + + secCheckPdaEd=#{secCheckPdaEd}, + + + secCheckPdaUn=#{secCheckPdaUn}, + + + secCheckPc=#{secCheckPc}, + + + secCheckWebNew=#{secCheckWebNew}, + + + secCheckChange=#{secCheckChange}, + + + checkBalacne=#{checkBalacne}, + + + secCheckBalacne=#{secCheckBalacne}, + + + index=#{index}, + + + corpType=#{corpType}, + + + storageCode=#{storageCode}, + + + supplementOrderType=#{supplementOrderType}, + + + defaultUnit=#{defaultUnit}, + + + useDyCount=#{useDyCount}, + + + expireTip=#{expireTip}, + + + updateTime=#{updateTime}, + + + ullageFill=#{ullageFill}, + + + scanPreIn=#{scanPreIn}, + + + vailInv=#{vailInv}, + + + prefix=#{prefix}, + + + codeFillCheck=#{codeFillCheck}, + + + defaultSubInv=#{defaultSubInv}, + + + defaultInv=#{defaultInv}, + + + orderVisibleType=#{orderVisibleType}, + + + checkCopy=#{checkCopy}, + + + secCheckCopy=#{secCheckCopy}, + + + vailDispatch=#{vailDispatch}, + + + vailGroupBuy=#{vailGroupBuy}, + + thirdSysFk=#{thirdSysFk}, WHERE id = #{id} @@ -389,8 +556,8 @@ select name, action from basic_bussiness_type where mainAction = #{mainAction} - and ( supplementOrderType is null - or supplementOrderType = '') + and (supplementOrderType is null + or supplementOrderType = '') and corpType = 1 @@ -398,10 +565,10 @@ select supplementOrderType from basic_bussiness_type where action = (select action - from io_order - where id = (select orderIdFk - from stock_order - where billNo = #{stockOrderBillNo})) + from io_order + where id = (select orderIdFk + from stock_order + where billNo = #{stockOrderBillNo})) - select - basic_udirel.id, - basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, - basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, - basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, - basic_udirel.manufactory,basic_udirel.measname,basic_udirel.ybbm,basic_udirel.sptm, - basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus,basic_udirel.udplatCode, - basic_udirel.isAdavence,basic_udirel.mainId,basic_products.allowNoBatch, - basic_products.allowNoExpire, - basic_products.allowNoProduct, - basic_udirel.price, - basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, - basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, - basic_products.bhxjcpbm,basic_products.bzcj, - basic_products.addType,basic_products.deviceRecordKey, - basic_products.cpmctymc,basic_products.cplb, - basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, - basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, - basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, - basic_products.diType,basic_products.productType,basic_products.scbssfbhph, - basic_products.scbssfbhxlh, - basic_products.scbssfbhscrq, - basic_products.cpdls, - basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid - ,basic_products.basicPrductRemak1 - ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 - ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,basic_products.hchzsb + select basic_udirel.id, + basic_udirel.thirdId, + basic_udirel.thirdName, + basic_udirel.isUseDy, + basic_udirel.thirdId1, + basic_udirel.thirdId2, + basic_udirel.thirdId3, + basic_udirel.thirdId4, + basic_udirel.thirdName1, + basic_udirel.thirdName2, + basic_udirel.thirdName3, + basic_udirel.thirdName4, + basic_udirel.manufactory, + basic_udirel.measname, + basic_udirel.ybbm, + basic_udirel.sptm, + basic_udirel.isDisable, + basic_udirel.isLock, + basic_udirel.lockStatus, + basic_udirel.udplatCode, + basic_udirel.isAdavence, + basic_udirel.mainId, + basic_udirel.dispatch, + basic_udirel.groupBuy, + basic_products.allowNoBatch, + basic_products.allowNoExpire, + basic_products.allowNoProduct, + basic_udirel.price, + basic_products.nameCode, + basic_products.packRatio, + basic_products.packLevel, + basic_products.bhxjsl, + basic_products.bhzxxsbzsl, + basic_products.zxxsbzbhsydysl, + basic_products.bhxjcpbm, + basic_products.bzcj, + basic_products.addType, + basic_products.deviceRecordKey, + basic_products.cpmctymc, + basic_products.cplb, + basic_products.flbm, + basic_products.ggxh, + basic_products.qxlb, + basic_products.tyshxydm, + basic_products.ylqxzcrbarmc, + basic_products.zczbhhzbapzbh, + basic_products.ylqxzcrbarywmc, + basic_products.sydycpbs, + basic_products.uuid, + basic_products.sjcpbm, + basic_products.versionNumber, + basic_products.diType, + basic_products.productType, + basic_products.scbssfbhph, + basic_products.scbssfbhxlh, + basic_products.scbssfbhscrq, + basic_products.cpdls, + basic_products.scbssfbhsxrq, + basic_products.cpms, + basic_udirel.supName, + basic_products.originUuid + , + basic_products.basicPrductRemak1 + , + basic_products.basicPrductRemak2, + basic_products.basicPrductRemak3, + basic_products.basicPrductRemak4, + basic_products.basicPrductRemak5, + basic_products.basicPrductRemak6 + , + basic_products.basicPrductRemak7, + basic_products.basicPrductRemak8, + basic_products.hchzsb FROM basic_udirel - inner JOIN basic_products - ON basic_products.uuid = basic_udirel.uuid + inner JOIN basic_products + ON basic_products.uuid = basic_udirel.uuid - AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%') + AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') - AND supName LIKE concat('%',#{supName},'%') + AND supName LIKE concat('%', #{supName}, '%') - AND cpmctymc LIKE concat('%',#{cpmctymc},'%') + AND cpmctymc LIKE concat('%', #{cpmctymc}, '%') - AND nameCode LIKE concat(#{nameCode},'%') + AND nameCode LIKE concat(#{nameCode}, '%') - AND thirdId LIKE concat(#{thirdId},'%') + AND thirdId LIKE concat(#{thirdId}, '%') AND basic_udirel.uuid = #{uuid} @@ -60,8 +105,8 @@ AND basic_udirel.udplatCode = #{udplatCode} - - AND basic_products.diType= #{diType} + + AND basic_products.diType = #{diType} @@ -69,19 +114,21 @@ - AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh},'%') + AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') - - = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') + ]]> AND mainId = #{mainId} - or basic_products.cpmctymc LIKE concat('%',#{unionFilterStr},'%') - or basic_products.ylqxzcrbarmc LIKE concat('%',#{unionFilterStr},'%') - or basic_products.ggxh LIKE concat('%',#{unionFilterStr},'%') - or basic_products.zczbhhzbapzbh LIKE concat('%',#{unionFilterStr},'%') + or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%') + or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%') + or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%') + or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%') AND isAdavence = #{isAdavence} @@ -91,59 +138,106 @@ ORDER BY modifyTime DESC - - select * from basic_udirel INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid + select * + from basic_udirel + INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid AND basic_udirel.uuid = #{uuid} @@ -365,7 +523,8 @@ - select * FROM basic_udirel + select * + FROM basic_udirel AND thirdId = #{thirdId} @@ -414,8 +574,10 @@ AND mainId = #{mainId} - - = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') + ]]> @@ -424,87 +586,82 @@ replace - INTO basic_udirel + INTO basic_udirel (id, - thirdId,thirdName,uuid,isUseDy,updateTime, - thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock - ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime - ) - values - ( - #{id}, - #{thirdId}, - #{thirdName}, - #{uuid}, - #{isUseDy}, - #{updateTime}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{thirdName1}, - #{thirdName2}, - #{thirdName3}, - #{thirdName4}, - #{manufactory}, - #{measname}, - #{ybbm}, - #{sptm}, - #{isDisable}, - #{isLock}, - #{mainId}, - #{mainName}, - #{lockStatus}, - #{udplatCode}, - #{isAdavence}, - #{supName}, - #{price}, - #{modifyTime} - ) + thirdId, thirdName, uuid, isUseDy, updateTime, + thirdId1, thirdId2, thirdId3, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, manufactory, measname, + ybbm, sptm, isDisable, isLock + , mainId, mainName, lockStatus, udplatCode, isAdavence, supName, price, modifyTime, dispatch, groupBuy) + values (#{id}, + #{thirdId}, + #{thirdName}, + #{uuid}, + #{isUseDy}, + #{updateTime}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{manufactory}, + #{measname}, + #{ybbm}, + #{sptm}, + #{isDisable}, + #{isLock}, + #{mainId}, + #{mainName}, + #{lockStatus}, + #{udplatCode}, + #{isAdavence}, + #{supName}, + #{price}, + #{modifyTime}, #{dispatch}, #{groupBuy}) insert - ignore + ignore INTO basic_udirel (id, - thirdId,thirdName,uuid,isUseDy,updateTime, - thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock - ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime - ) - values - ( - #{id}, - #{thirdId}, - #{thirdName}, - #{uuid}, - #{isUseDy}, - #{updateTime}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{thirdName1}, - #{thirdName2}, - #{thirdName3}, - #{thirdName4}, - #{manufactory}, - #{measname}, - #{ybbm}, - #{sptm}, - #{isDisable}, - #{isLock}, - #{mainId}, - #{mainName}, - #{lockStatus}, - #{udplatCode}, - #{isAdavence}, - #{supName}, - #{price}, - #{modifyTime} - ) + thirdId, thirdName, uuid, isUseDy, updateTime, + thirdId1, thirdId2, thirdId3, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, manufactory, measname, + ybbm, sptm, isDisable, isLock + , mainId, mainName, lockStatus, udplatCode, isAdavence, supName, price, modifyTime + , dispatch, groupBuy) + values (#{id}, + #{thirdId}, + #{thirdName}, + #{uuid}, + #{isUseDy}, + #{updateTime}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{manufactory}, + #{measname}, + #{ybbm}, + #{sptm}, + #{isDisable}, + #{isLock}, + #{mainId}, + #{mainName}, + #{lockStatus}, + #{udplatCode}, + #{isAdavence}, + #{supName}, + #{price}, + #{modifyTime}, #{dispatch}, #{groupBuy}) @@ -513,7 +670,8 @@ WHERE id = #{id} - DELETE FROM basic_udirel WHERE id in + DELETE + FROM basic_udirel WHERE id in #{item} @@ -527,34 +685,93 @@ UPDATE basic_udirel - thirdId=#{thirdId}, - thirdName=#{thirdName}, - uuid=#{uuid}, - isUseDy=#{isUseDy}, - thirdId1=#{thirdId1}, - thirdId2=#{thirdId2}, - thirdId3=#{thirdId3}, - thirdId4=#{thirdId4}, - thirdName1=#{thirdName1}, - thirdName2=#{thirdName2}, - thirdName3=#{thirdName3}, - thirdName4=#{thirdName4}, - manufactory=#{manufactory}, - measname=#{measname}, - ybbm=#{ybbm}, - sptm=#{sptm}, - updateTime=#{updateTime}, - modifyTime=#{modifyTime}, - isDisable=#{isDisable}, - isLock=#{isLock}, - mainId=#{mainId}, - lockStatus=#{lockStatus}, - mainName=#{mainName}, - udplatCode=#{udplatCode}, - isAdavence=#{isAdavence}, - supName=#{supName}, - price=#{price}, - + + thirdId=#{thirdId}, + + + thirdName=#{thirdName}, + + + uuid=#{uuid}, + + + isUseDy=#{isUseDy}, + + + thirdId1=#{thirdId1}, + + + thirdId2=#{thirdId2}, + + + thirdId3=#{thirdId3}, + + + thirdId4=#{thirdId4}, + + + thirdName1=#{thirdName1}, + + + thirdName2=#{thirdName2}, + + + thirdName3=#{thirdName3}, + + + thirdName4=#{thirdName4}, + + + manufactory=#{manufactory}, + + + measname=#{measname}, + + + ybbm=#{ybbm}, + + + sptm=#{sptm}, + + + updateTime=#{updateTime}, + + + modifyTime=#{modifyTime}, + + + isDisable=#{isDisable}, + + + isLock=#{isLock}, + + + mainId=#{mainId}, + + + lockStatus=#{lockStatus}, + + + mainName=#{mainName}, + + + udplatCode=#{udplatCode}, + + + isAdavence=#{isAdavence}, + + + supName=#{supName}, + + + price=#{price}, + + + dispatch=#{dispatch}, + + + groupBuy=#{groupBuy}, + WHERE id = #{id} @@ -578,32 +795,33 @@ replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, thirdId1, thirdId2, thirdId3, - thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, - measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime) + thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, + measname, isDisable, mainId, mainName, udplatCode, supName, price, modifyTime + , dispatch, groupBuy) values (#{item.id}, - #{item.thirdId}, - #{item.thirdName}, - #{item.uuid}, - #{item.isUseDy}, - #{item.updateTime}, - #{item.thirdId1}, - #{item.thirdId2}, - #{item.thirdId3}, - #{item.thirdId4}, - #{item.thirdName1}, - #{item.thirdName2}, - #{item.thirdName3}, - #{item.thirdName4}, - #{item.ybbm}, - #{item.sptm}, - #{item.manufactory}, - #{item.measname}, - #{item.isDisable}, - #{item.mainId}, - #{item.mainName}, - #{item.udplatCode},#{item.supName},#{item.price},#{item.modifyTime}) + #{item.thirdId}, + #{item.thirdName}, + #{item.uuid}, + #{item.isUseDy}, + #{item.updateTime}, + #{item.thirdId1}, + #{item.thirdId2}, + #{item.thirdId3}, + #{item.thirdId4}, + #{item.thirdName1}, + #{item.thirdName2}, + #{item.thirdName3}, + #{item.thirdName4}, + #{item.ybbm}, + #{item.sptm}, + #{item.manufactory}, + #{item.measname}, + #{item.isDisable}, + #{item.mainId}, + #{item.mainName}, + #{item.udplatCode}, #{item.supName}, #{item.price}, #{item.modifyTime}, #{item.dispatch}, #{item.groupBuy}) - \ No newline at end of file + diff --git a/api-admin/src/main/resources/schemas/schema_v2.2.sql b/api-admin/src/main/resources/schemas/schema_v2.2.sql index 72664ff..2f7caa5 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.2.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.2.sql @@ -1,7 +1,13 @@ -INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark) -VALUES -(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据'); +INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark) +VALUES (16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据'); -INSERT ignore INTO system_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain ) -VALUES - ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' ); \ No newline at end of file +INSERT ignore INTO system_param_config (id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, + paramExplain) +VALUES (20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否'); + + + +CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);