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

新增集采校验功能

Browse Source
busUser
anthonywj 2 years ago
parent 1ae4180e7f
commit 29a4ec2060
14 changed files with 1019 additions and 588 deletions
Show Stats Download Patch File Download Diff File

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

@ -830,7 +830,7 @@ public class WareHouseController {
}
//产品是否可以以使用单元入库
List<UdiRelevanceResponse> 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, "该产品信息未维护！");
@ -838,6 +838,18 @@ 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) {

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

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

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

@ -68,6 +68,9 @@ public class UdiRelevanceEntity {
//产品描述
private String cpms;
private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品
public Integer getLockStatus() {
if (lockStatus == null)
return 1;

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

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

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

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

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

@ -79,4 +79,8 @@ public class BussinessTypResponse {
private boolean checkSelect; //判断多选框是否勾选
private boolean secCheckSp; //自助平台同步
private boolean vailDispatch;
private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品
}

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

@ -91,6 +91,9 @@ public class UdiRelevanceResponse {
private Integer useNum; //最小包装单元可使用次数
private Integer pid; //用来存父id
private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

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

@ -1,5 +1,6 @@
package com.glxp.api.admin.thread;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
@ -697,10 +698,36 @@ public class InvProductsTrService {
for (String corpName : filterSupMaps.keySet()) {
List<WarehouseEntity> temps;
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();
BeanUtils.copyProperties(orderEntity, outOrder);
outOrder.setSupplementNo(null);//补单需置空
outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime()));
outOrder.setActDate(DateUtil.getBeforeDay(fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
outOrder.setCreateTime(outOrder.getActDate());
outOrder.setAction(bussinessChangeTypeEntity.getScAction());
outOrder.setMainAction(ConstantType.TYPE_PUT);
@ -710,17 +737,15 @@ public class InvProductsTrService {
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.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.getInvStorageCode());
outOrder.setInvStorageCode(orderEntity.getLocStorageCode());
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
if ("1".equals(systemParamConfigEntity.getParamValue())) {
@ -753,9 +778,6 @@ public class InvProductsTrService {
}
}
//生成寄售转入单据
public void buildNorPreInOrder(BussinessChangeTypeEntity
bussinessChangeTypeEntity, List<WarehouseEntity> useInList, OrderEntity orderEntity) {
@ -1144,4 +1166,17 @@ public class InvProductsTrService {
} else return false;
}
String fromDate(OrderEntity orderEntity) {
String time = "";
if (orderEntity.getAuditTime() != null) {
time = DateUtil.formatDateTime(orderEntity.getAuditTime());
} else {
time = orderEntity.getActDate();
}
return time;
}
}

9
api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java
Unescape Escape View File

@ -133,10 +133,19 @@ public class ThrProductsDlService {
int page = 1;
int limit = 50;
int errCount = 1; //设置允许容错五次，
int lastPage = 0;
while (page != -1) {
FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest();
BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest);
page = getInvmandoc(thrProductsImportLogEntity, page, limit, piDetailEntity.getValue(), filterErpGoodsRequest.getThirdSys(), filterErpGoodsRequest);
if (page == -1 && errCount < 6) {
page = lastPage + 1;
errCount++;
} else {
lastPage = page;
}
}
FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest();
filterUdiIpLogRequest.setGenKey(genKey);

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

@ -1,6 +1,6 @@
server.port=9992
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?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/udiwms_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

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

@ -2,27 +2,65 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.basic.BussinessTypeDao">
<select id="filterList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
SELECT
basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name,
basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable,
basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew,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,
SELECT basic_bussiness_type.id,
basic_bussiness_type.action,
basic_bussiness_type.vailDispatch,
basic_bussiness_type.vailGroupBuy,
basic_bussiness_type.name,
basic_bussiness_type.enable,
basic_bussiness_type.remark,
basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk,
basic_bussiness_type.localAction,
basic_bussiness_type.secCheckEnable,
basic_bussiness_type.checkUdims,
basic_bussiness_type.checkPdaEd,
basic_bussiness_type.checkPdaUn,
basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew,
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.entrutSpms,
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.outTospms,
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
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.outTospms,
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
left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
<where>
@ -45,7 +83,7 @@
AND basic_bustype_local.spUse = #{spUse}
</if>
</where>
GROUP BY basic_bussiness_type.id
GROUP BY basic_bussiness_type.id, basic_bussiness_type.updateTime
order by basic_bussiness_type.updateTime desc
</select>
@ -67,14 +105,10 @@
<if test="enabled != ''and enabled != null">
AND basic_bussiness_type.enable = #{enabled}
</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 != ''">
<![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>
</where>
</select>
@ -82,13 +116,25 @@
<select id="filterJoinList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
resultType="com.glxp.api.admin.res.basic.BussinessTypResponse">
select basic_bussiness_type.*,
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,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_bustype_local.name localName,
basic_bussiness_type.checkEnable,
basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,
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.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
<where>
<if test="name != ''and name != null">
@ -126,29 +172,67 @@
<select id="filterAllByUser" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
SELECT
basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name,
basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,basic_bussiness_type.secCheckEnable,
basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,
SELECT basic_bussiness_type.id,
basic_bussiness_type.action,
basic_bussiness_type.name,
basic_bussiness_type.enable,
basic_bussiness_type.remark,
basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk,
basic_bussiness_type.localAction,
basic_bussiness_type.secCheckEnable,
basic_bussiness_type.checkUdims,
basic_bussiness_type.checkPdaEd,
basic_bussiness_type.checkPdaUn,
basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,basic_bussiness_type.entrutSpms,
basic_bussiness_type.checkWebNew,
basic_bussiness_type.checkChange,
basic_bussiness_type.entrutSpms,
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.outTospms,
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,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
basic_bussiness_type.secCheckUdims,
basic_bussiness_type.secCheckPdaEd,
basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew,
basic_bussiness_type.secCheckChange,
basic_bussiness_type.outTospms,
basic_bussiness_type.ullageFill,
basic_bussiness_type.scanPreIn,
basic_bussiness_type.vailInv,
basic_bussiness_type.vailDispatch,
basic_bussiness_type.vailGroupBuy,
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,
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
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 on inv_warehouse_sub.parentId = inv_warehouse.`code`
INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` = inv_warehouse_user.`code`
@ -182,11 +266,8 @@
<if test="userId != ''and userId != null">
AND inv_bustype_user.`userId` = #{userId}
</if>
</where>
group by basic_bussiness_type.action
</select>
<insert id="insertBussinessType" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
@ -198,10 +279,9 @@
, secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne,
secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix
,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType,checkCopy,secCheckCopy)
values
(
#{action},
, ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, outTospms, entrutSpms, defaultInv,
orderVisibleType, checkCopy, secCheckCopy, vailDispatch, vailGroupBuy)
values (#{action},
#{name},
#{enable},
#{remark},
@ -243,8 +323,7 @@
#{entrutSpms},
#{defaultInv},
#{orderVisibleType},
#{checkCopy},#{secCheckCopy}
)
#{checkCopy}, #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy})
</insert>
@ -257,11 +336,11 @@
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,outTospms,entrutSpms,defaultInv,orderVisibleType, checkCopy,secCheckCopy)
values
(
#{index},
secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit,
useDyCount, expireTip, updateTime, prefix
, ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, outTospms, entrutSpms, defaultInv,
orderVisibleType, checkCopy, secCheckCopy, vailDispatch, vailGroupBuy)
values (#{index},
#{action},
#{name},
#{enable},
@ -288,7 +367,7 @@
#{corpType},
#{storageCode},
#{checkBalacne},
#{secCheckBalacnesecCheckBalacne},
#{secCheckBalacne},
#{supplementOrderType},
#{defaultUnit},
#{useDyCount},
@ -303,63 +382,159 @@
#{outTospms},
#{entrutSpms},
#{defaultInv},
#{orderVisibleType}, #{checkCopy},#{secCheckCopy}
)
#{orderVisibleType}, #{checkCopy}, #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy})
</insert>
<update id="updateBussinessType" parameterType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
UPDATE basic_bussiness_type
<trim prefix="set" suffixOverrides=",">
<if test="action != null">action = #{action},</if>
<if test="name != null">name = #{name},</if>
<if test="enable != null">enable = #{enable},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="mainAction != null">mainAction = #{mainAction},</if>
<if test="localAction != null">localAction=#{localAction},</if>
<if test="checkEnable != null">checkEnable=#{checkEnable},</if>
<if test="genUnit != null">genUnit=#{genUnit},</if>
<if test="innerOrder != null">innerOrder=#{innerOrder},</if>
<if test="secCheckEnable != null">secCheckEnable=#{secCheckEnable},</if>
<if test="checkUdims != null">checkUdims=#{checkUdims},</if>
<if test="checkPdaEd != null">checkPdaEd=#{checkPdaEd},</if>
<if test="checkPdaUn != null">checkPdaUn=#{checkPdaUn},</if>
<if test="checkPc != null">checkPc=#{checkPc},</if>
<if test="checkWebNew != null">checkWebNew=#{checkWebNew},</if>
<if test="checkChange != null">checkChange=#{checkChange},</if>
<if test="checkSp != null">checkSp=#{checkSp},</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="secCheckSp != null">secCheckSp=#{secCheckSp},</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="action != null">
action = #{action},
</if>
<if test="name != null">
name = #{name},
</if>
<if test="enable != null">
enable = #{enable},
</if>
<if test="remark != null">
remark = #{remark},
</if>
<if test="mainAction != null">
mainAction = #{mainAction},
</if>
<if test="localAction != null">
localAction=#{localAction},
</if>
<if test="checkEnable != null">
checkEnable=#{checkEnable},
</if>
<if test="genUnit != null">
genUnit=#{genUnit},
</if>
<if test="innerOrder != null">
innerOrder=#{innerOrder},
</if>
<if test="secCheckEnable != null">
secCheckEnable=#{secCheckEnable},
</if>
<if test="checkUdims != null">
checkUdims=#{checkUdims},
</if>
<if test="checkPdaEd != null">
checkPdaEd=#{checkPdaEd},
</if>
<if test="checkPdaUn != null">
checkPdaUn=#{checkPdaUn},
</if>
<if test="checkPc != null">
checkPc=#{checkPc},
</if>
<if test="checkWebNew != null">
checkWebNew=#{checkWebNew},
</if>
<if test="checkChange != null">
checkChange=#{checkChange},
</if>
<if test="checkSp != null">
checkSp=#{checkSp},
</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="secCheckSp != null">
secCheckSp=#{secCheckSp},
</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="outTospms != null">outTospms=#{outTospms},
<if test="outTospms != null">
outTospms=#{outTospms},
</if>
<if test="entrutSpms != null">entrutSpms=#{entrutSpms},</if>
<if test="orderVisibleType != null">orderVisibleType=#{orderVisibleType},</if>
<if test="checkCopy != null">checkCopy=#{checkCopy},</if>
<if test="secCheckCopy != null">secCheckCopy=#{secCheckCopy},</if>
<if test="entrutSpms != null">
entrutSpms=#{entrutSpms},
</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},
</trim>

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

@ -4,33 +4,79 @@
<mapper namespace="com.glxp.api.admin.dao.basic.UdiRelevanceDao">
<select id="filterUdiRelevance" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.res.basic.UdiRelevanceResponse">
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,
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.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.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
@ -119,6 +165,8 @@
basic_udirel.udplatCode,
basic_udirel.isAdavence,
basic_udirel.mainId,
basic_udirel.dispatch,
basic_udirel.groupBuy,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
basic_products.allowNoProduct,
@ -167,7 +215,8 @@
basic_products.basicPrductRemak6
,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
basic_products.basicPrductRemak8,
basic_products.hchzsb
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
@ -289,6 +338,8 @@
basic_products.diType,
basic_udirel.mainId,
basic_udirel.mainName,
basic_udirel.dispatch,
basic_udirel.groupBuy,
basic_udirel.isAdavence,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
@ -308,7 +359,8 @@
basic_products.basicPrductRemak6
,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
basic_products.basicPrductRemak8,
basic_products.hchzsb
FROM basic_products
right JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
@ -548,12 +600,10 @@
INTO basic_udirel
(id,
thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price
)
values
(
#{id},
thirdId1, thirdId2, thirdId3, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, manufactory, measname,
ybbm, sptm, isDisable, isLock
, mainId, mainName, lockStatus, udplatCode, isAdavence, supName, price, dispatch, groupBuy)
values (#{id},
#{thirdId},
#{thirdName},
#{uuid},
@ -579,8 +629,7 @@
#{lockStatus},
#{udplatCode},
#{isAdavence},
#{supName},#{price}
)
#{supName}, #{price}, #{dispatch}, #{groupBuy})
</insert>
<insert id="insertUdiRelevanceignore" keyProperty="id"
@ -590,12 +639,10 @@
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},
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},
@ -621,8 +668,7 @@
#{udplatCode},
#{isAdavence},
#{supName},
#{price},#{modifyTime}
)
#{price}, #{modifyTime}, #{dispatch}, #{groupBuy})
</insert>
<delete id="deleteById" parameterType="Map">
@ -747,9 +793,11 @@
</select>
<insert id="importUdiRelevance" parameterType="java.util.List">
replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2, thirdId3,
replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, modifyTime, thirdId1, thirdId2,
thirdId3,
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
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
(#{item.id},
@ -774,7 +822,7 @@
#{item.isDisable},
#{item.mainId},
#{item.mainName},
#{item.udplatCode}, #{item.supName}, #{item.price}, #{modifyTime})
#{item.udplatCode}, #{item.supName}, #{item.price}, #{item.modifyTime}, #{item.dispatch}, #{item.groupBuy})
</foreach>
</insert>
</mapper>

265
api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
Unescape Escape View File

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.business.StockOrderDao">
<select id="listStockOrder" parameterType="com.glxp.api.admin.req.business.StockOrderQueryRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
SELECT *
@ -14,14 +13,12 @@
<select id="listStockOrderNoDealWith" parameterType="com.glxp.api.admin.req.business.StockOrderQueryRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
select *
from stock_order
INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
where `status` = '101'
group by stock_order.id
ORDER BY id DESC
</select>
<insert id="insertStockOrder" useGeneratedKeys="true" keyProperty="id"
@ -50,33 +47,87 @@
<update id="updateById" parameterType="com.glxp.api.admin.entity.business.StockOrderEntity">
UPDATE stock_order
<trim prefix="set" suffixOverrides=",">
<if test="billNo != null">billNo=#{billNo},</if>
<if test="billdate != null">billdate=#{billdate},</if>
<if test="corpId != null">corpId=#{corpId},</if>
<if test="corpName != null">corpName=#{corpName},</if>
<if test="billType != null">billType=#{billType},</if>
<if test="billFlag != null">billFlag=#{billFlag},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
<if test="status != null">status=#{status},</if>
<if test="statusInfo != null">statusInfo=#{statusInfo},</if>
<if test="type != null">type=#{type},</if>
<if test="sourceType != null">sourceType=#{sourceType},</if>
<if test="printStatus != null">printStatus=#{printStatus},</if>
<if test="unitIdFk != null">unitIdFk=#{unitIdFk},</if>
<if test="customerId != null">customerId=#{customerId},</if>
<if test="thirdOrderFk != null">thirdOrderFk=#{thirdOrderFk},</if>
<if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if>
<if test="totalPrice != null">totalPrice=#{totalPrice},</if>
<if test="locStorageCode != null">locStorageCode=#{locStorageCode},</if>
<if test="supplementNo != null">supplementNo=#{supplementNo},</if>
<if test="createUser != null">createUser=#{createUser},</if>
<if test="reviewUser != null">reviewUser=#{reviewUser},</if>
<if test="entrustEnd != null">entrustEnd=#{entrustEnd},</if>
<if test="auditTime != null">auditTime=#{auditTime},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
<if test="fromSubInvCode != null">fromSubInvCode=#{fromSubInvCode},</if>
<if test="dept != null">dept=#{dept},</if>
<if test="billNo != null">
billNo=#{billNo},
</if>
<if test="billdate != null">
billdate=#{billdate},
</if>
<if test="corpId != null">
corpId=#{corpId},
</if>
<if test="corpName != null">
corpName=#{corpName},
</if>
<if test="billType != null">
billType=#{billType},
</if>
<if test="billFlag != null">
billFlag=#{billFlag},
</if>
<if test="thirdSysFk != null">
thirdSysFk=#{thirdSysFk},
</if>
<if test="status != null">
status=#{status},
</if>
<if test="statusInfo != null">
statusInfo=#{statusInfo},
</if>
<if test="type != null">
type=#{type},
</if>
<if test="sourceType != null">
sourceType=#{sourceType},
</if>
<if test="printStatus != null">
printStatus=#{printStatus},
</if>
<if test="unitIdFk != null">
unitIdFk=#{unitIdFk},
</if>
<if test="customerId != null">
customerId=#{customerId},
</if>
<if test="thirdOrderFk != null">
thirdOrderFk=#{thirdOrderFk},
</if>
<if test="orderIdFk != null">
orderIdFk=#{orderIdFk},
</if>
<if test="totalPrice != null">
totalPrice=#{totalPrice},
</if>
<if test="locStorageCode != null">
locStorageCode=#{locStorageCode},
</if>
<if test="supplementNo != null">
supplementNo=#{supplementNo},
</if>
<if test="createUser != null">
createUser=#{createUser},
</if>
<if test="reviewUser != null">
reviewUser=#{reviewUser},
</if>
<if test="entrustEnd != null">
entrustEnd=#{entrustEnd},
</if>
<if test="auditTime != null">
auditTime=#{auditTime},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="invWarehouseCode != null">
invWarehouseCode=#{invWarehouseCode},
</if>
<if test="fromSubInvCode != null">
fromSubInvCode=#{fromSubInvCode},
</if>
<if test="dept != null">
dept=#{dept},
</if>
</trim>
WHERE id = #{id}
</update>
@ -106,9 +157,15 @@
<select id="filterListOr" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
SELECT stock_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bustype_local.name
billTypeName,iws2.name fromSubInvName,auth_dept.name deptName,auth_user.employeeName reviewUserName FROM
stock_order
SELECT stock_order.*,
inv_warehouse.name invName,
iws.name subInvName,
basic_bustype_local.name
billTypeName,
iws2.name fromSubInvName,
auth_dept.name deptName,
auth_user.employeeName reviewUserName
FROM stock_order
left join basic_bustype_local on stock_order.billType = basic_bustype_local.action
LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub ON stock_order.locStorageCode = inv_warehouse.`code`
@ -128,10 +185,14 @@
and billdate = #{billdate}
</if>
<if test="startDate != null and startDate != ''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d')>= DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]>
<![CDATA[
and DATE_FORMAT(billdate, '%Y-%m-%d') >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
]]>
</if>
<if test="endDate != null and endDate != ''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d') ]]>
<![CDATA[
and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
]]>
</if>
<if test="corpId != '' and corpId != null">
and corpId = #{corpId}
@ -199,18 +260,26 @@
and reviewUser = #{reviewUser}
</if>
<if test="startTime != null and startTime != ''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d')>= DATE_FORMAT(#{startTime}, '%Y-%m-%d') ]]>
<![CDATA[
and DATE_FORMAT(billdate, '%Y-%m-%d') >= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]>
<![CDATA[
and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
]]>
</if>
<if test="startDate != null and startDate != ''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d')>= DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]>
<![CDATA[
and DATE_FORMAT(billdate, '%Y-%m-%d') >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
]]>
</if>
<if test="endDate != null and endDate != ''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d') ]]>
<![CDATA[
and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
]]>
</if>
<if test="userId != null">
@ -219,13 +288,13 @@
</where>
group by stock_order.id
ORDER BY stock_order.updateTime DESC, id DESC
</select>
<select id="filterEntrust" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
SELECT stock_order.* FROM stock_order
SELECT stock_order.*
FROM stock_order
INNER JOIN basic_entrust_accept on locStorageCode = basic_entrust_accept.curInv
<where>
<if test="status != '' and status != null">
@ -245,7 +314,8 @@
<select id="findOne" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
SELECT * FROM stock_order
SELECT *
FROM stock_order
<where>
<if test="id != '' and id != null">
and id = #{id}
@ -283,16 +353,41 @@
<select id="listOrderPrint" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderPrintEntity">
SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName,
stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate,
stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
stock_order_detail.price,inv_warehouse.name locInv,inv_warehouse_sub.name subInv,basic_products.spmc,
basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName,basic_products.basicPrductRemak1
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,
thr_products.code thrCode,thr_products.name thrName,thr_products.measname thrMeasname,thr_products.spec thrSpec,
thr_products.registerNo thrRegisterNo,thr_products.manufactory thrManufactory
SELECT stock_order.*,
stock_order_detail.productId,
stock_order_detail.productName,
stock_order_detail.spec,
stock_order_detail.batchNo,
stock_order_detail.productDate,
stock_order_detail.expireDate,
stock_order_detail.count,
stock_order_detail.sweepCount,
stock_order_detail.ylqxzcrbarmc,
stock_order_detail.manufactory,
stock_order_detail.zczbhhzbapzbh,
stock_order_detail.price,
inv_warehouse.name locInv,
inv_warehouse_sub.name subInv,
basic_products.spmc,
basic_products.cpms,
basic_udirel.measname,
auth_dept.`name` deptName,
basic_products.basicPrductRemak1
,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6
,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
thr_products.code thrCode,
thr_products.name thrName,
thr_products.measname thrMeasname,
thr_products.spec thrSpec,
thr_products.registerNo thrRegisterNo,
thr_products.manufactory thrManufactory
FROM stock_order
INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk
@ -324,7 +419,6 @@
invWarehouseCode is null or
invWarehouseCode = '')
</if>
</where>
group by stock_order_detail.id
</select>
@ -332,15 +426,42 @@
<select id="listCodePrint" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderPrintEntity">
select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc,
basic_products.cpms,io_codes.nameCode,io_codes.relId,basic_products.basicPrductRemak1
,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,
thr_products.code thrCode,thr_products.name thrName,thr_products.measname thrMeasname,thr_products.spec thrSpec,
thr_products.registerNo thrRegisterNo,thr_products.manufactory thrManufactory
select io_codes.code udiCode,
basic_udirel.id productId,
basic_products.cpmctymc productName,
basic_products.ggxh
spec,
io_codes.batchNo,
io_codes.produceDate productDate,
io_codes.expireDate,
io_codes.serialNo,
io_codes.count,
basic_products.ylqxzcrbarmc,
basic_udirel.manufactory,
basic_udirel.measname,
basic_products.zczbhhzbapzbh,
inv_warehouse.name locInv,
inv_warehouse_sub.name subInv,
basic_products.spmc,
basic_products.cpms,
io_codes.nameCode,
io_codes.relId,
basic_products.basicPrductRemak1
,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
basic_products.basicPrductRemak4,
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6
,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
thr_products.code thrCode,
thr_products.name thrName,
thr_products.measname thrMeasname,
thr_products.spec thrSpec,
thr_products.registerNo thrRegisterNo,
thr_products.manufactory thrManufactory
from io_codes
INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
@ -351,7 +472,6 @@
<if test="orderId != '' and orderId != null">
and io_codes.orderId = #{orderId}
</if>
</where>
group by io_codes.id
</select>
@ -415,19 +535,24 @@
</select>
<select id="selectUploadList" resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
select t1.* from stock_order t1 left join io_order t2 on t1.billNo = t2.erpFk
select t1.*
from stock_order t1
left join io_order t2 on t1.billNo = t2.erpFk
<where>
t2.erpFk is not null
and t1.orderIdFk = t2.id
<if test="request.billNo != null and request.billNo != ''">
AND ((t1.billNo like concat('%', #{request.billNo}, '%') and t2.erpFk like concat('%',
#{request.billNo}, '%')) or t2.thirdBillNo like concat('%',#{request.billNo},'%'))
#{request.billNo},
'%')) or
t2.thirdBillNo like concat('%', #{request.billNo}, '%'))
</if>
<if test="request.submitStatus != null">
AND t2.exportStatus = #{request.submitStatus}
</if>
<if test="request.orderStatus != null">
AND t1.status = #{request.orderStatus} and t1.status != 1
AND t1.status = #{request.orderStatus}
and t1.status != 1
</if>
<if test="request.billType != null and request.billType != ''">
AND t1.billType = #{request.billType}
@ -442,10 +567,14 @@
AND t1.corpName like concat('%', #{request.corpName}, '%')
</if>
<if test="request.startTime != null and request.startTime != ''">
<![CDATA[ and DATE_FORMAT(t1.billdate, '%Y-%m-%d')>= DATE_FORMAT(#{request.startTime}, '%Y-%m-%d') ]]>
<![CDATA[
and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >= DATE_FORMAT(#{request.startTime}, '%Y-%m-%d')
]]>
</if>
<if test="request.endTime != null and request.endTime != ''">
<![CDATA[ and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <= DATE_FORMAT(#{request.endTime}, '%Y-%m-%d') ]]>
<![CDATA[
and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <= DATE_FORMAT(#{request.endTime}, '%Y-%m-%d')
]]>
</if>
</where>
order by t1.billdate desc

11
api-admin/src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -7,11 +7,16 @@ CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint', 1);
CALL Pro_Temp_ColumnWork('stock_order_remak', 'zczbhhzbapzbh', 'varchar(255)', 1);
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);
-- 新增数据
INSERT
ignore INTO sys_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain )
VALUES
( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' );
ignore
INTO sys_param_config (id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain)
VALUES (20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否');
-- 创建表时必须 create table if not exists 表名
Write Preview
Loading…
Cancel
Save