UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增集采校验功能

Browse Source
busUser
anthonywj 2 years ago
parent 02685af1e4
commit 5e1c7b5fdb
13 changed files with 1019 additions and 574 deletions
Show Stats Download Patch File Download Diff File

15
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -827,7 +827,7 @@ public class WareHouseController {
} }
//产品是否可以以使用单元入库 //产品是否可以以使用单元入库
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode(), unitFk); List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode(), unitFk);
if (udiRelevanceResponses.size() == 1) { if (udiRelevanceResponses.size() >= 1) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
if (udiRelevanceResponse == null) { if (udiRelevanceResponse == null) {
return ResultVOUtils.error(500, "该产品信息未维护！"); return ResultVOUtils.error(500, "该产品信息未维护！");
@ -835,6 +835,19 @@ public class WareHouseController {
return ResultVOUtils.error(500, "该产品不允许以使用单元入库！"); 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; int actCount = 0;
if (udiRelevanceResponse.getIsUseDy() == 1 && udiRelevanceResponse.getDiType() != 2) { if (udiRelevanceResponse.getIsUseDy() == 1 && udiRelevanceResponse.getDiType() != 2) {

1
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java
Unescape Escape View File

@ -39,4 +39,5 @@ public class BussinessLocalTypeEntity {
private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示 private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示
} }

3
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java
Unescape Escape View File

@ -74,4 +74,7 @@ public class BussinessTypeEntity {
private boolean checkCopy; private boolean checkCopy;
private boolean secCheckCopy; private boolean secCheckCopy;
private boolean vailDispatch; //校验是否可配送
private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品
} }

3
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiRelevanceEntity.java
Unescape Escape View File

@ -35,6 +35,9 @@ public class UdiRelevanceEntity {
private String price; private String price;
private String modifyTime; //修改时间 private String modifyTime; //修改时间
private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品
public Integer getLockStatus() { public Integer getLockStatus() {
if (lockStatus == null) if (lockStatus == null)
return 1; return 1;

2
api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java
Unescape Escape View File

@ -61,4 +61,6 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String relId; private String relId;
private String companyName; private String companyName;
private String supId;
} }

3
api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiRelevanceRequest.java
Unescape Escape View File

@ -38,5 +38,8 @@ public class UdiRelevanceRequest {
private Boolean useMuti; //是否多次使用 private Boolean useMuti; //是否多次使用
private Integer useNum; //最小包装单元可使用次数 private Integer useNum; //最小包装单元可使用次数
private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品
} }

2
api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java
Unescape Escape View File

@ -78,4 +78,6 @@ public class BussinessTypResponse {
private boolean checkSelect; //判断多选框是否勾选 private boolean checkSelect; //判断多选框是否勾选
private boolean checkSp; private boolean checkSp;
private boolean vailDispatch;
private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品
} }

3
api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -89,6 +89,9 @@ public class UdiRelevanceResponse {
private Integer useNum; //最小包装单元可使用次数 private Integer useNum; //最小包装单元可使用次数
private Integer pid; //用来存父id private Integer pid; //用来存父id
private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品
//产品代理商 //产品代理商
private String cpdls; private String cpdls;

32
api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.sale.admin.thread; package com.glxp.sale.admin.thread;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.db.sql.Order; import cn.hutool.db.sql.Order;
import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantStatus;
@ -704,6 +705,32 @@ public class InvProductsTrService {
for (String corpName : filterSupMaps.keySet()) { for (String corpName : filterSupMaps.keySet()) {
List<WarehouseEntity> temps; List<WarehouseEntity> temps;
temps = filterSupMaps.get(corpName); temps = filterSupMaps.get(corpName);
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { //只有补采购入时才需要拆弹
List<WarehouseEntity> buildArray = new ArrayList<>();
//开始过滤集采非集采产品
for (WarehouseEntity warehouseEntity : temps) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(warehouseEntity.getRelId());
if (udiRelevanceEntity.isGroupBuy()) {
List<WarehouseEntity> 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 {
buildOrderEntity(orderEntity, bussinessChangeTypeEntity, temps, bussinessTypeEntity);
}
}
}
public void buildOrderEntity(OrderEntity orderEntity, BussinessChangeTypeEntity bussinessChangeTypeEntity, List<WarehouseEntity> temps, BussinessTypeEntity bussinessTypeEntity) {
OrderEntity outOrder = new OrderEntity(); OrderEntity outOrder = new OrderEntity();
BeanUtils.copyProperties(orderEntity, outOrder); BeanUtils.copyProperties(orderEntity, outOrder);
outOrder.setSupplementNo(null);//补单需置空 outOrder.setSupplementNo(null);//补单需置空
@ -717,7 +744,7 @@ public class InvProductsTrService {
outOrder.setFromType(ConstantStatus.FROM_CHANGE); outOrder.setFromType(ConstantStatus.FROM_CHANGE);
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
outOrder.setId(orderNo); outOrder.setId(orderNo);
outOrder.setFromCorpId(corpName); outOrder.setFromCorpId(temps.get(0).getFromCorpId());
outOrder.setFromCorp(temps.get(0).getFromCorp()); outOrder.setFromCorp(temps.get(0).getFromCorp());
// BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction()); // BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction());
if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) { if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) {
@ -758,9 +785,6 @@ public class InvProductsTrService {
} }
}
//生成寄售转入单据 //生成寄售转入单据
public void buildNorPreInOrder(BussinessChangeTypeEntity public void buildNorPreInOrder(BussinessChangeTypeEntity
bussinessChangeTypeEntity, List<WarehouseEntity> useInList, OrderEntity orderEntity) { bussinessChangeTypeEntity, List<WarehouseEntity> useInList, OrderEntity orderEntity) {

2
api-admin/src/main/resources/application-dev.properties
Unescape Escape View File

@ -1,7 +1,7 @@
# \u751F\u4EA7\u73AF\u5883 # \u751F\u4EA7\u73AF\u5883
server.port=9996 server.port=9996
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver 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.username=root
spring.datasource.password=123456 spring.datasource.password=123456
spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.connection-timeout=60000

389
api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
Unescape Escape View File

@ -2,26 +2,63 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.sale.admin.dao.basic.BussinessTypeDao"> <mapper namespace="com.glxp.sale.admin.dao.basic.BussinessTypeDao">
<select id="filterList" parameterType="com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest" <select id="filterList" parameterType="com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity"> resultType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
SELECT SELECT basic_bussiness_type.id,
basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name, basic_bussiness_type.action,
basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction, basic_bussiness_type.vailDispatch,
basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable, basic_bussiness_type.vailGroupBuy,
basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc, basic_bussiness_type.name,
basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,basic_bussiness_type.codeFillCheck, basic_bussiness_type.enable,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.remark,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, basic_bussiness_type.mainAction,
basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.thirdSysFk,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bussiness_type.localAction,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, basic_bussiness_type.secCheckEnable,
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne, basic_bussiness_type.checkUdims,
basic_bussiness_type.secCheckBalacne, defaultUnit,basic_bustype_origin.action basic_bussiness_type.checkPdaEd,
thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix basic_bussiness_type.checkPdaUn,
localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll, basic_bussiness_type.checkPc,
checkCopy,secCheckCopy basic_bussiness_type.checkWebNew,
FROM basic_bussiness_type LEFT JOIN basic_bustype_local basic_bussiness_type.checkChange,
basic_bussiness_type.codeFillCheck,
basic_bussiness_type.secCheckUdims,
basic_bussiness_type.secCheckPdaEd,
basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew,
basic_bussiness_type.secCheckChange,
basic_bussiness_type.ullageFill,
basic_bussiness_type.scanPreIn,
basic_bussiness_type.vailInv,
basic_bustype_local.name localName,
basic_bussiness_type.checkEnable,
basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,
basic_bussiness_type.genUnit,
basic_bussiness_type.innerOrder,
basic_bustype_local.spUse,
corpType,
basic_bussiness_type.storageCode,
basic_bussiness_type.checkBalacne,
basic_bussiness_type.secCheckBalacne,
defaultUnit,
basic_bustype_origin.action
thirdAction,
basic_bustype_origin.thirdSys,
basic_bussiness_type.useDyCount,
basic_bussiness_type.expireTip,
basic_bussiness_type.prefix,
basic_bustype_local.prefix
localPrefix,
basic_bustype_local.preIn,
basic_bussiness_type.defaultSubInv,
basic_bussiness_type.defaultInv,
orderVisibleType,
supplementAll,
checkCopy,
secCheckCopy
FROM basic_bussiness_type
LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action on basic_bussiness_type.localAction = basic_bustype_local.action
left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
<where> <where>
@ -44,7 +81,7 @@
AND basic_bustype_local.spUse = #{spUse} AND basic_bustype_local.spUse = #{spUse}
</if> </if>
</where> </where>
GROUP BY basic_bussiness_type.id GROUP BY basic_bussiness_type.id, basic_bussiness_type.updateTime
order by basic_bussiness_type.updateTime desc order by basic_bussiness_type.updateTime desc
</select> </select>
@ -66,14 +103,10 @@
<if test="enabled != ''and enabled != null"> <if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable = #{enabled} AND basic_bussiness_type.enable = #{enabled}
</if> </if>
<if test="advanceType != ''and advanceType != null">
AND basic_bustype_local.advanceType =#{advanceType}
</if>
<if test="spUse != ''and spUse != null">
AND basic_bustype_local.spUse =#{spUse}
</if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
</where> </where>
</select> </select>
@ -82,13 +115,25 @@
<select id="filterJoinList" parameterType="com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest" <select id="filterJoinList" parameterType="com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest"
resultType="com.glxp.sale.admin.res.basic.BussinessTypResponse"> resultType="com.glxp.sale.admin.res.basic.BussinessTypResponse">
select basic_bussiness_type.*, select basic_bussiness_type.*,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.name localName,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,defaultUnit, basic_bussiness_type.checkEnable,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.expireTip, basic_bustype_local.advanceType,
basic_bustype_local.prefix localPrefix ,basic_bustype_local.preIn,orderVisibleType,supplementAll from basic_bustype_local.changeEnable,
basic_bussiness_type LEFT JOIN basic_bussiness_type.genUnit,
basic_bussiness_type.innerOrder,
defaultUnit,
basic_bustype_local.spUse,
basic_bussiness_type.storageCode,
basic_bussiness_type.expireTip,
basic_bustype_local.prefix localPrefix,
basic_bustype_local.preIn,
orderVisibleType,
supplementAll
from basic_bussiness_type
LEFT JOIN
basic_third_sys on basic_bussiness_type.thirdSysFk = basic_third_sys on basic_bussiness_type.thirdSysFk =
basic_third_sys.thirdId LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = basic_third_sys.thirdId
LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction =
basic_bustype_local.action basic_bustype_local.action
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
@ -123,32 +168,69 @@
basic_bussiness_type.action &lt;&gt; #{action,jdbcType=VARCHAR} basic_bussiness_type.action &lt;&gt; #{action,jdbcType=VARCHAR}
</foreach> </foreach>
</if> </if>
</where> </where>
</select> </select>
<select id="filterAllByUser" parameterType="com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest" <select id="filterAllByUser" parameterType="com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity"> resultType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
SELECT SELECT basic_bussiness_type.id,
basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name, basic_bussiness_type.action,
basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction, basic_bussiness_type.name,
basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable, basic_bussiness_type.enable,
basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc, basic_bussiness_type.remark,
basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,basic_bussiness_type.codeFillCheck, basic_bussiness_type.mainAction,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.thirdSysFk,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, basic_bussiness_type.localAction,
basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.secCheckEnable,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bussiness_type.checkUdims,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, basic_bussiness_type.checkPdaEd,
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,defaultUnit, basic_bussiness_type.checkPdaUn,
basic_bussiness_type.secCheckBalacne,basic_bustype_origin.action basic_bussiness_type.checkPc,
thirdAction,basic_bustype_origin.thirdSys,useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix basic_bussiness_type.checkWebNew,
localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll, basic_bussiness_type.checkChange,
checkCopy,secCheckCopy basic_bussiness_type.codeFillCheck,
FROM basic_bussiness_type LEFT JOIN basic_bustype_local basic_bussiness_type.secCheckUdims,
basic_bussiness_type.secCheckPdaEd,
basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew,
basic_bussiness_type.secCheckChange,
basic_bussiness_type.ullageFill,
basic_bussiness_type.scanPreIn,
basic_bussiness_type.vailInv,
basic_bustype_local.name localName,
basic_bussiness_type.checkEnable,
basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,
basic_bussiness_type.genUnit,
basic_bussiness_type.innerOrder,
basic_bussiness_type.vailDispatch,
basic_bussiness_type.vailGroupBuy,
basic_bustype_local.spUse,
corpType,
basic_bussiness_type.storageCode,
basic_bussiness_type.checkBalacne,
defaultUnit,
basic_bussiness_type.secCheckBalacne,
basic_bustype_origin.action
thirdAction,
basic_bustype_origin.thirdSys,
useDyCount,
basic_bussiness_type.expireTip,
basic_bussiness_type.prefix,
basic_bustype_local.prefix
localPrefix,
basic_bustype_local.preIn,
basic_bussiness_type.defaultSubInv,
basic_bussiness_type.defaultInv,
orderVisibleType,
supplementAll,
checkCopy,
secCheckCopy
FROM basic_bussiness_type
LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action on basic_bussiness_type.localAction = basic_bustype_local.action
left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action INNER JOIN inv_warehouse_bussiness_type
on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
INNER JOIN inv_warehouse_sub on inv_warehouse_sub.`code` = inv_warehouse_bussiness_type.code INNER JOIN inv_warehouse_sub on inv_warehouse_sub.`code` = inv_warehouse_bussiness_type.code
INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code` INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code`
INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` = inv_warehouse_user.`code` INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` = inv_warehouse_user.`code`
@ -182,11 +264,8 @@
<if test="userId != ''and userId != null"> <if test="userId != ''and userId != null">
AND inv_bustype_user.`userId` = #{userId} AND inv_bustype_user.`userId` = #{userId}
</if> </if>
</where> </where>
group by basic_bussiness_type.action group by basic_bussiness_type.action
</select> </select>
<insert id="insertBussinessType" keyProperty="id" <insert id="insertBussinessType" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity"> parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
@ -198,10 +277,9 @@
, secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne, secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne,
secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix
,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv,orderVisibleType, checkCopy,secCheckCopy) , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy,
values secCheckCopy, vailDispatch, vailGroupBuy)
( values (#{action},
#{action},
#{name}, #{name},
#{enable}, #{enable},
#{remark}, #{remark},
@ -242,8 +320,7 @@
#{defaultInv}, #{defaultInv},
#{orderVisibleType}, #{orderVisibleType},
#{checkCopy}, #{checkCopy},
#{secCheckCopy} #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy})
)
</insert> </insert>
@ -256,11 +333,11 @@
checkEnable, genUnit, innerOrder, secCheckEnable, checkEnable, genUnit, innerOrder, secCheckEnable,
checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange checkUdims, checkPdaEd, checkPdaUn, checkPc, checkWebNew, checkChange
, secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew, , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit,
,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,defaultInv,orderVisibleType, checkCopy,secCheckCopy) useDyCount, expireTip, updateTime, prefix
values , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy,
( secCheckCopy, vailDispatch, vailGroupBuy)
#{index}, values (#{index},
#{action}, #{action},
#{name}, #{name},
#{enable}, #{enable},
@ -287,7 +364,7 @@
#{corpType}, #{corpType},
#{storageCode}, #{storageCode},
#{checkBalacne}, #{checkBalacne},
#{secCheckBalacnesecCheckBalacne}, #{secCheckBalacne},
#{supplementOrderType}, #{supplementOrderType},
#{defaultUnit}, #{defaultUnit},
#{useDyCount}, #{useDyCount},
@ -302,56 +379,146 @@
#{defaultInv}, #{defaultInv},
#{orderVisibleType}, #{orderVisibleType},
#{checkCopy}, #{checkCopy},
#{secCheckCopy} #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy})
)
</insert> </insert>
<update id="updateBussinessType" parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity"> <update id="updateBussinessType" parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
UPDATE basic_bussiness_type UPDATE basic_bussiness_type
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="action != null">action = #{action},</if> <if test="action != null">
<if test="name != null">name = #{name},</if> action = #{action},
<if test="enable != null">enable = #{enable},</if> </if>
<if test="remark != null">remark = #{remark},</if> <if test="name != null">
<if test="mainAction != null">mainAction = #{mainAction},</if> name = #{name},
<if test="localAction != null">localAction=#{localAction},</if> </if>
<if test="checkEnable != null">checkEnable=#{checkEnable},</if> <if test="enable != null">
<if test="genUnit != null">genUnit=#{genUnit},</if> enable = #{enable},
<if test="innerOrder != null">innerOrder=#{innerOrder},</if> </if>
<if test="secCheckEnable != null">secCheckEnable=#{secCheckEnable},</if> <if test="remark != null">
<if test="checkUdims != null">checkUdims=#{checkUdims},</if> remark = #{remark},
<if test="checkPdaEd != null">checkPdaEd=#{checkPdaEd},</if> </if>
<if test="checkPdaUn != null">checkPdaUn=#{checkPdaUn},</if> <if test="mainAction != null">
<if test="checkPc != null">checkPc=#{checkPc},</if> mainAction = #{mainAction},
<if test="checkWebNew != null">checkWebNew=#{checkWebNew},</if> </if>
<if test="checkChange != null">checkChange=#{checkChange},</if> <if test="localAction != null">
<if test="secCheckUdims != null">secCheckUdims=#{secCheckUdims},</if> localAction=#{localAction},
<if test="secCheckPdaEd != null">secCheckPdaEd=#{secCheckPdaEd},</if> </if>
<if test="secCheckPdaUn != null">secCheckPdaUn=#{secCheckPdaUn},</if> <if test="checkEnable != null">
<if test="secCheckPc != null">secCheckPc=#{secCheckPc},</if> checkEnable=#{checkEnable},
<if test="secCheckWebNew != null">secCheckWebNew=#{secCheckWebNew},</if> </if>
<if test="secCheckChange != null">secCheckChange=#{secCheckChange},</if> <if test="genUnit != null">
<if test="checkBalacne != null">checkBalacne=#{checkBalacne},</if> genUnit=#{genUnit},
<if test="secCheckBalacne != null">secCheckBalacne=#{secCheckBalacne},</if> </if>
<if test="index != null">index=#{index},</if> <if test="innerOrder != null">
<if test="corpType != null">corpType=#{corpType},</if> innerOrder=#{innerOrder},
<if test="storageCode != null">storageCode=#{storageCode},</if> </if>
<if test="supplementOrderType != null">supplementOrderType=#{supplementOrderType},</if> <if test="secCheckEnable != null">
<if test="defaultUnit != null">defaultUnit=#{defaultUnit},</if> secCheckEnable=#{secCheckEnable},
<if test="useDyCount != null">useDyCount=#{useDyCount},</if> </if>
<if test="expireTip != null">expireTip=#{expireTip},</if> <if test="checkUdims != null">
<if test="updateTime != null">updateTime=#{updateTime},</if> checkUdims=#{checkUdims},
<if test="ullageFill != null">ullageFill=#{ullageFill},</if> </if>
<if test="scanPreIn != null">scanPreIn=#{scanPreIn},</if> <if test="checkPdaEd != null">
<if test="vailInv != null">vailInv=#{vailInv},</if> checkPdaEd=#{checkPdaEd},
<if test="prefix != null">prefix=#{prefix},</if> </if>
<if test="codeFillCheck != null">codeFillCheck=#{codeFillCheck},</if> <if test="checkPdaUn != null">
<if test="defaultSubInv != null">defaultSubInv=#{defaultSubInv},</if> checkPdaUn=#{checkPdaUn},
<if test="defaultInv != null">defaultInv=#{defaultInv},</if> </if>
<if test="orderVisibleType != null">orderVisibleType=#{orderVisibleType},</if> <if test="checkPc != null">
<if test="checkCopy != null">checkCopy=#{checkCopy},</if> checkPc=#{checkPc},
<if test="secCheckCopy != null">secCheckCopy=#{secCheckCopy},</if> </if>
<if test="checkWebNew != null">
checkWebNew=#{checkWebNew},
</if>
<if test="checkChange != null">
checkChange=#{checkChange},
</if>
<if test="secCheckUdims != null">
secCheckUdims=#{secCheckUdims},
</if>
<if test="secCheckPdaEd != null">
secCheckPdaEd=#{secCheckPdaEd},
</if>
<if test="secCheckPdaUn != null">
secCheckPdaUn=#{secCheckPdaUn},
</if>
<if test="secCheckPc != null">
secCheckPc=#{secCheckPc},
</if>
<if test="secCheckWebNew != null">
secCheckWebNew=#{secCheckWebNew},
</if>
<if test="secCheckChange != null">
secCheckChange=#{secCheckChange},
</if>
<if test="checkBalacne != null">
checkBalacne=#{checkBalacne},
</if>
<if test="secCheckBalacne != null">
secCheckBalacne=#{secCheckBalacne},
</if>
<if test="index != null">
index=#{index},
</if>
<if test="corpType != null">
corpType=#{corpType},
</if>
<if test="storageCode != null">
storageCode=#{storageCode},
</if>
<if test="supplementOrderType != null">
supplementOrderType=#{supplementOrderType},
</if>
<if test="defaultUnit != null">
defaultUnit=#{defaultUnit},
</if>
<if test="useDyCount != null">
useDyCount=#{useDyCount},
</if>
<if test="expireTip != null">
expireTip=#{expireTip},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="ullageFill != null">
ullageFill=#{ullageFill},
</if>
<if test="scanPreIn != null">
scanPreIn=#{scanPreIn},
</if>
<if test="vailInv != null">
vailInv=#{vailInv},
</if>
<if test="prefix != null">
prefix=#{prefix},
</if>
<if test="codeFillCheck != null">
codeFillCheck=#{codeFillCheck},
</if>
<if test="defaultSubInv != null">
defaultSubInv=#{defaultSubInv},
</if>
<if test="defaultInv != null">
defaultInv=#{defaultInv},
</if>
<if test="orderVisibleType != null">
orderVisibleType=#{orderVisibleType},
</if>
<if test="checkCopy != null">
checkCopy=#{checkCopy},
</if>
<if test="secCheckCopy != null">
secCheckCopy=#{secCheckCopy},
</if>
<if test="vailDispatch != null">
vailDispatch=#{vailDispatch},
</if>
<if test="vailGroupBuy != null">
vailGroupBuy=#{vailGroupBuy},
</if>
thirdSysFk=#{thirdSysFk}, thirdSysFk=#{thirdSysFk},
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}

462
api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -2,36 +2,81 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.sale.admin.dao.basic.UdiRelevanceDao"> <mapper namespace="com.glxp.sale.admin.dao.basic.UdiRelevanceDao">
<select id="filterUdiRelevance" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest" <select id="filterUdiRelevance" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.res.basic.UdiRelevanceResponse"> resultType="com.glxp.sale.admin.res.basic.UdiRelevanceResponse">
select select basic_udirel.id,
basic_udirel.id, basic_udirel.thirdId,
basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdName,
basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.isUseDy,
basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.thirdId1,
basic_udirel.manufactory,basic_udirel.measname,basic_udirel.ybbm,basic_udirel.sptm, basic_udirel.thirdId2,
basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus,basic_udirel.udplatCode, basic_udirel.thirdId3,
basic_udirel.isAdavence,basic_udirel.mainId,basic_products.allowNoBatch, 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.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_udirel.price, basic_udirel.price,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_products.nameCode,
basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.packRatio,
basic_products.bhxjcpbm,basic_products.bzcj, basic_products.packLevel,
basic_products.addType,basic_products.deviceRecordKey, basic_products.bhxjsl,
basic_products.cpmctymc,basic_products.cplb, basic_products.bhzxxsbzsl,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_products.zxxsbzbhsydysl,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, basic_products.bhxjcpbm,
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, basic_products.bzcj,
basic_products.diType,basic_products.productType,basic_products.scbssfbhph, 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.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.cpdls, basic_products.cpdls,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid basic_products.scbssfbhsxrq,
,basic_products.basicPrductRemak1 basic_products.cpms,
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 basic_udirel.supName,
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,basic_products.hchzsb 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 FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
@ -72,7 +117,9 @@
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
<if test="mainId != '' and mainId != null"> <if test="mainId != '' and mainId != null">
AND mainId = #{mainId} AND mainId = #{mainId}
@ -91,38 +138,85 @@
</if> </if>
</where> </where>
ORDER BY modifyTime DESC ORDER BY modifyTime DESC
</select> </select>
<select id="filterUdiJoinSup" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest" <select id="filterUdiJoinSup" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.res.basic.UdiRelevanceResponse"> resultType="com.glxp.sale.admin.res.basic.UdiRelevanceResponse">
select select basic_udirel.id,
basic_udirel.id, basic_udirel.thirdId,
basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdName,
basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.isUseDy,
basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.thirdId1,
basic_udirel.manufactory,basic_udirel.measname,basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.price, basic_udirel.thirdId2,
basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus,basic_udirel.udplatCode, basic_udirel.thirdId3,
basic_udirel.isAdavence,basic_udirel.mainId,basic_products.allowNoBatch, 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.price,
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.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_products.nameCode,
basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.packRatio,
basic_products.bhxjcpbm,basic_products.bzcj, basic_products.packLevel,
basic_products.addType,basic_products.deviceRecordKey, basic_products.bhxjsl,
basic_products.cpmctymc,basic_products.cplb, basic_products.bhzxxsbzsl,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_products.zxxsbzbhsydysl,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, basic_products.bhxjcpbm,
basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber, basic_products.bzcj,
basic_products.diType,basic_products.productType,basic_products.scbssfbhph, 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.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.cpdls, basic_products.cpdls,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk, basic_products.scbssfbhsxrq,
customer_info.companyName,basic_products.originUuid,basic_products.basicPrductRemak1 basic_products.cpms,
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 basic_udirel.supName,
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 company_product_relevance.unitFk,
customer_info.companyName,
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 FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
@ -169,7 +263,9 @@
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
<if test="mainId != '' and mainId != null"> <if test="mainId != '' and mainId != null">
AND mainId = #{mainId} AND mainId = #{mainId}
@ -187,38 +283,90 @@
AND nameCode = #{uniqueNameCode} AND nameCode = #{uniqueNameCode}
</if> </if>
</where> </where>
</select> </select>
<select id="filterUdiGp" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest" <select id="filterUdiGp" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.res.basic.UdiRelevanceResponse"> resultType="com.glxp.sale.admin.res.basic.UdiRelevanceResponse">
select select basic_udirel.id,
basic_udirel.id, basic_udirel.thirdId,
basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdName,
basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.isUseDy,
basic_udirel.ybbm,basic_udirel.sptm,basic_udirel.isDisable, basic_udirel.isLock,basic_udirel.lockStatus, basic_udirel.thirdId1,
basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.thirdId2,
basic_udirel.manufactory,basic_udirel.measname,basic_udirel.udplatCode,basic_products.allowNoBatch, basic_udirel.thirdId3,
basic_products.allowNoExpire,basic_products.allowNoProduct, basic_udirel.thirdId4,
basic_udirel.ybbm,
basic_udirel.sptm,
basic_udirel.isDisable,
basic_udirel.isLock,
basic_udirel.lockStatus,
basic_udirel.thirdName1,
basic_udirel.thirdName2,
basic_udirel.thirdName3,
basic_udirel.thirdName4,
basic_udirel.manufactory,
basic_udirel.measname,
basic_udirel.udplatCode,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
basic_udirel.price, basic_udirel.price,
basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl, basic_products.nameCode,
basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj, basic_products.packRatio,
basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb, basic_products.packLevel,
basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc, basic_products.bhxjsl,
basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_products.bhzxxsbzsl,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, basic_products.zxxsbzbhsydysl,
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, 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_udirel.mainId,
basic_udirel.mainName,
basic_udirel.isAdavence,
basic_udirel.dispatch,
basic_udirel.groupBuy,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.cpdls, basic_products.cpdls,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc, basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_udirel.supName,
basic_products.originUuid,
basic_products.spmc,
basic_products.basicPrductRemak1 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.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6
,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
basic_products.hchzsb
FROM basic_products FROM basic_products
right JOIN basic_udirel right JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
<if test="supId != null and supId != ''">
left join company_product_relevance on basic_udirel.id = company_product_relevance.udiRlIdFk
</if>
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -276,19 +424,24 @@
AND basic_products.originUuid is NULL AND basic_products.originUuid is NULL
</if> </if>
<if test="filterType != null and filterType == 3"> <if test="filterType != null and filterType == 3">
AND (mainId is NULL or mainId = '') and basic_products.originUuid <![CDATA[<>]]> '' AND (mainId is NULL or mainId = '')
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 4"> <if test="filterType != null and filterType == 4">
AND thirdId1 is NULL and basic_products.originUuid <![CDATA[<>]]> '' AND thirdId1 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 5"> <if test="filterType != null and filterType == 5">
AND thirdId2 is NULL and basic_products.originUuid <![CDATA[<>]]> '' AND thirdId2 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 6"> <if test="filterType != null and filterType == 6">
AND thirdId3 is NULL and basic_products.originUuid <![CDATA[<>]]> '' AND thirdId3 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 7"> <if test="filterType != null and filterType == 7">
AND thirdId4 is NULL and basic_products.originUuid <![CDATA[<>]]> '' AND thirdId4 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if> </if>
<if test="filterType != null and filterType == 10"> <if test="filterType != null and filterType == 10">
@ -304,14 +457,17 @@
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND basic_udirel.id = #{id} AND basic_udirel.id = #{id}
</if> </if>
<if test="supId != null and supId != ''">
AND company_product_relevance.customerId = #{supId}
</if>
</where> </where>
ORDER BY modifyTime DESC ORDER BY modifyTime DESC
</select> </select>
<select id="selectByUuid" parameterType="java.lang.String" <select id="selectByUuid" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select *
FROM basic_udirel
<where> <where>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND uuid = #{uuid} AND uuid = #{uuid}
@ -322,7 +478,9 @@
<select id="selectByOrigiUuid" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest" <select id="selectByOrigiUuid" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
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
<where> <where>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}
@ -365,7 +523,8 @@
</select> </select>
<select id="selectByThirdId" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest" <select id="selectByThirdId" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select *
FROM basic_udirel
<where> <where>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND thirdId = #{thirdId} AND thirdId = #{thirdId}
@ -391,7 +550,8 @@
<select id="filterEntity" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest" <select id="filterEntity" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select *
FROM basic_udirel
<where> <where>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND thirdId = #{thirdId} AND thirdId = #{thirdId}
@ -415,7 +575,9 @@
AND mainId = #{mainId} AND mainId = #{mainId}
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
</where> </where>
</select> </select>
@ -427,12 +589,10 @@
INTO basic_udirel INTO basic_udirel
(id, (id,
thirdId, thirdName, uuid, isUseDy, updateTime, thirdId, thirdName, uuid, isUseDy, updateTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1, thirdId2, thirdId3, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, manufactory, measname,
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime ybbm, sptm, isDisable, isLock
) , mainId, mainName, lockStatus, udplatCode, isAdavence, supName, price, modifyTime, dispatch, groupBuy)
values values (#{id},
(
#{id},
#{thirdId}, #{thirdId},
#{thirdName}, #{thirdName},
#{uuid}, #{uuid},
@ -459,8 +619,7 @@
#{isAdavence}, #{isAdavence},
#{supName}, #{supName},
#{price}, #{price},
#{modifyTime} #{modifyTime}, #{dispatch}, #{groupBuy})
)
</insert> </insert>
@ -471,12 +630,11 @@
INTO basic_udirel INTO basic_udirel
(id, (id,
thirdId, thirdName, uuid, isUseDy, updateTime, thirdId, thirdName, uuid, isUseDy, updateTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1, thirdId2, thirdId3, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, manufactory, measname,
ybbm, sptm, isDisable, isLock
, mainId, mainName, lockStatus, udplatCode, isAdavence, supName, price, modifyTime , mainId, mainName, lockStatus, udplatCode, isAdavence, supName, price, modifyTime
) , dispatch, groupBuy)
values values (#{id},
(
#{id},
#{thirdId}, #{thirdId},
#{thirdName}, #{thirdName},
#{uuid}, #{uuid},
@ -503,8 +661,7 @@
#{isAdavence}, #{isAdavence},
#{supName}, #{supName},
#{price}, #{price},
#{modifyTime} #{modifyTime}, #{dispatch}, #{groupBuy})
)
</insert> </insert>
<delete id="deleteById" parameterType="Map"> <delete id="deleteById" parameterType="Map">
@ -513,7 +670,8 @@
WHERE id = #{id} WHERE id = #{id}
</delete> </delete>
<delete id="deleteByIds" parameterType="java.util.List"> <delete id="deleteByIds" parameterType="java.util.List">
DELETE FROM basic_udirel WHERE id in DELETE
FROM basic_udirel WHERE id in
<foreach collection="ids" item="item" open="(" separator="," close=")"> <foreach collection="ids" item="item" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
@ -527,34 +685,93 @@
<update id="updateUdiRelevance" parameterType="com.glxp.sale.admin.req.basic.UdiRelevanceRequest"> <update id="updateUdiRelevance" parameterType="com.glxp.sale.admin.req.basic.UdiRelevanceRequest">
UPDATE basic_udirel UPDATE basic_udirel
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="thirdId != null">thirdId=#{thirdId},</if> <if test="thirdId != null">
<if test="thirdName != null">thirdName=#{thirdName},</if> thirdId=#{thirdId},
<if test="uuid != null">uuid=#{uuid},</if> </if>
<if test="isUseDy != null">isUseDy=#{isUseDy},</if> <if test="thirdName != null">
<if test="thirdId1 != null">thirdId1=#{thirdId1},</if> thirdName=#{thirdName},
<if test="thirdId2 != null">thirdId2=#{thirdId2},</if> </if>
<if test="thirdId3 != null">thirdId3=#{thirdId3},</if> <if test="uuid != null">
<if test="thirdId4 != null">thirdId4=#{thirdId4},</if> uuid=#{uuid},
<if test="thirdName1 != null">thirdName1=#{thirdName1},</if> </if>
<if test="thirdName2 != null">thirdName2=#{thirdName2},</if> <if test="isUseDy != null">
<if test="thirdName3 != null">thirdName3=#{thirdName3},</if> isUseDy=#{isUseDy},
<if test="thirdName4 != null">thirdName4=#{thirdName4},</if> </if>
<if test="manufactory != null">manufactory=#{manufactory},</if> <if test="thirdId1 != null">
<if test="measname != null">measname=#{measname},</if> thirdId1=#{thirdId1},
<if test="ybbm != null">ybbm=#{ybbm},</if> </if>
<if test="sptm != null">sptm=#{sptm},</if> <if test="thirdId2 != null">
<if test="updateTime != null">updateTime=#{updateTime},</if> thirdId2=#{thirdId2},
<if test="modifyTime != null">modifyTime=#{modifyTime},</if> </if>
<if test="isDisable != null">isDisable=#{isDisable},</if> <if test="thirdId3 != null">
<if test="isLock != null">isLock=#{isLock},</if> thirdId3=#{thirdId3},
<if test="mainId != null">mainId=#{mainId},</if> </if>
<if test="lockStatus != null">lockStatus=#{lockStatus},</if> <if test="thirdId4 != null">
<if test="mainName != null">mainName=#{mainName},</if> thirdId4=#{thirdId4},
<if test="udplatCode != null">udplatCode=#{udplatCode},</if> </if>
<if test="isAdavence != null">isAdavence=#{isAdavence},</if> <if test="thirdName1 != null">
<if test="supName != null">supName=#{supName},</if> thirdName1=#{thirdName1},
<if test="price != null">price=#{price},</if> </if>
<if test="thirdName2 != null">
thirdName2=#{thirdName2},
</if>
<if test="thirdName3 != null">
thirdName3=#{thirdName3},
</if>
<if test="thirdName4 != null">
thirdName4=#{thirdName4},
</if>
<if test="manufactory != null">
manufactory=#{manufactory},
</if>
<if test="measname != null">
measname=#{measname},
</if>
<if test="ybbm != null">
ybbm=#{ybbm},
</if>
<if test="sptm != null">
sptm=#{sptm},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="modifyTime != null">
modifyTime=#{modifyTime},
</if>
<if test="isDisable != null">
isDisable=#{isDisable},
</if>
<if test="isLock != null">
isLock=#{isLock},
</if>
<if test="mainId != null">
mainId=#{mainId},
</if>
<if test="lockStatus != null">
lockStatus=#{lockStatus},
</if>
<if test="mainName != null">
mainName=#{mainName},
</if>
<if test="udplatCode != null">
udplatCode=#{udplatCode},
</if>
<if test="isAdavence != null">
isAdavence=#{isAdavence},
</if>
<if test="supName != null">
supName=#{supName},
</if>
<if test="price != null">
price=#{price},
</if>
<if test="dispatch != null">
dispatch=#{dispatch},
</if>
<if test="groupBuy != null">
groupBuy=#{groupBuy},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -579,7 +796,8 @@
<insert id="importUdiRelevance" parameterType="java.util.List"> <insert id="importUdiRelevance" parameterType="java.util.List">
replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, thirdId1, thirdId2, thirdId3, replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, thirdId1, thirdId2, thirdId3,
thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime) measname, isDisable, mainId, mainName, udplatCode, supName, price, modifyTime
, dispatch, groupBuy)
values values
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=","> <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
(#{item.id}, (#{item.id},
@ -603,7 +821,7 @@
#{item.isDisable}, #{item.isDisable},
#{item.mainId}, #{item.mainId},
#{item.mainName}, #{item.mainName},
#{item.udplatCode},#{item.supName},#{item.price},#{item.modifyTime}) #{item.udplatCode}, #{item.supName}, #{item.price}, #{item.modifyTime}, #{item.dispatch}, #{item.groupBuy})
</foreach> </foreach>
</insert> </insert>
</mapper> </mapper>

16
api-admin/src/main/resources/schemas/schema_v2.2.sql
Unescape Escape View File

@ -1,7 +1,13 @@
INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark) INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark)
VALUES VALUES (16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据');
(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据');
INSERT ignore INTO system_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain ) INSERT ignore INTO system_param_config (id, parentId, paramName, paramKey, paramValue, paramStatus, paramType,
VALUES paramExplain)
( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' ); 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);

Write Preview
Loading…
Cancel
Save