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

预验收带回与不带回功能

Browse Source
busUser
anthonywj 2 years ago
parent 4dc36c2abb
commit 3c5fcbb407
11 changed files with 601 additions and 434 deletions
Show Stats Download Patch File Download Diff File

3
api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvPreInProductDetailDao.java
Unescape Escape View File

@ -35,4 +35,7 @@ public interface InvPreInProductDetailDao {
* @param orderIdFk 扫码单据ID * @param orderIdFk 扫码单据ID
*/ */
boolean deleteByOrderId(String orderIdFk); boolean deleteByOrderId(String orderIdFk);
boolean deleteByCode(String orderIdFk, String originCode);
} }

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

@ -39,5 +39,5 @@ public class BussinessLocalTypeEntity {
private boolean codeFillCheck; private boolean codeFillCheck;
private boolean supplementAll; //是否全量补单 0:禁止补单，1：缺量补单，2。全量补单 private boolean supplementAll; //是否全量补单 0:禁止补单，1：缺量补单，2。全量补单
private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示 private int orderVisibleType; //订单详情展示方式：0：根据批次号展示，1:根据条码展示
private boolean preInBack; //预验收带回
} }

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

@ -77,4 +77,6 @@ public class BussinessTypeEntity {
private boolean vailDispatch; //校验是否可配送 private boolean vailDispatch; //校验是否可配送
private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品 private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品
private boolean preInBack; //预验收带回
} }

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

@ -82,5 +82,6 @@ public class BussinessTypResponse {
private boolean vailDispatch; private boolean vailDispatch;
private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品 private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品
private boolean preInBack; //预验收带回
} }

5
api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java
Unescape Escape View File

@ -10,6 +10,8 @@ import java.util.List;
public interface InvPreInProductDetailService { public interface InvPreInProductDetailService {
List<InvProductDetailEntity> findByOriginCode(String code); List<InvProductDetailEntity> findByOriginCode(String code);
InvProductDetailEntity findByCode(String orderId, String code);
List<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest); List<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest);
List<InvProductDetailJoinResponse> filterJoinInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest); List<InvProductDetailJoinResponse> filterJoinInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest);
@ -33,4 +35,7 @@ public interface InvPreInProductDetailService {
InvProductDetailEntity statInvPreInDetail(String code); InvProductDetailEntity statInvPreInDetail(String code);
boolean deleteByOrderIdFk(String orderIdFk); boolean deleteByOrderIdFk(String orderIdFk);
boolean deleteByCode(String orderIdFk, String originCode);
} }

17
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java
Unescape Escape View File

@ -35,6 +35,19 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
return invProductDetailEntities; return invProductDetailEntities;
} }
@Override
public InvProductDetailEntity findByCode(String orderId, String code) {
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setOriginCode(code);
filterInvProductDetailRequest.setOrderIdFk(orderId);
List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
if (CollUtil.isNotEmpty(invProductDetailEntities)) {
return invProductDetailEntities.get(0);
}
return null;
}
@Override @Override
public List<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) { public List<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) {
if (filterInvProductDetailRequest == null) { if (filterInvProductDetailRequest == null) {
@ -137,4 +150,8 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
return invPreInProductDetailDao.deleteByOrderId(orderIdFk); return invPreInProductDetailDao.deleteByOrderId(orderIdFk);
} }
@Override
public boolean deleteByCode(String orderIdFk, String originCode) {
return invPreInProductDetailDao.deleteByCode(orderIdFk, originCode);
}
} }

44
api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -913,6 +913,7 @@ public class IoTransInoutService {
preInOrder.put(invProductDetailEntities.get(0).getOrderIdFk(), invProductDetailEntities.get(0).getOrderIdFk()); preInOrder.put(invProductDetailEntities.get(0).getOrderIdFk(), invProductDetailEntities.get(0).getOrderIdFk());
} }
} }
boolean isBreak = false;
if (preInOrder.size() > 0) { if (preInOrder.size() > 0) {
String preInBillNo = ""; String preInBillNo = "";
for (String key : preInOrder.keySet()) { for (String key : preInOrder.keySet()) {
@ -920,12 +921,51 @@ public class IoTransInoutService {
OrderEntity preInEntity = orderService.findById(key); OrderEntity preInEntity = orderService.findById(key);
preInEntity.setPreOutBillNo(orderEntity.getId()); preInEntity.setPreOutBillNo(orderEntity.getId());
orderService.updateOrder(preInEntity); orderService.updateOrder(preInEntity);
invPreInProductService.deleteByOrderIdFk(preInEntity.getId()); if (bussinessTypeEntity.isPreInBack()) { //预验收带回
invPreInProductDetailService.deleteByOrderIdFk(preInEntity.getId()); invPreInProductService.deleteByOrderIdFk(preInEntity.getId());
invPreInProductDetailService.deleteByOrderIdFk(preInEntity.getId());
} else {
for (WarehouseEntity codeEntity : codeList) {
if (StrUtil.isEmpty(codeEntity.getSerialNo())) {
InvProductDetailEntity invPreinDetailEntity = invPreInProductDetailService.findByCode(key, codeEntity.getCode());
if (invPreinDetailEntity != null) {
int count = 0;
if (invPreinDetailEntity.getCount() < codeEntity.getCount()) {
count = 0;
} else {
count = invPreinDetailEntity.getCount() - codeEntity.getCount();
}
if (count >= 0) {
isBreak = true;
if (count == 0) {
invPreInProductDetailService.deleteByCode(key, codeEntity.getCode());
} else {
invPreinDetailEntity.setCount(count);
invPreInProductDetailService.updateInvProduct(invPreinDetailEntity);
}
int reCount = invPreinDetailEntity.getCount() - codeEntity.getCount();
if (reCount == 0) {
invPreInProductDetailService.deleteByCode(key, codeEntity.getCode());
} else {
invPreinDetailEntity.setCount(reCount);
invPreInProductDetailService.updateInvProduct(invPreinDetailEntity);
}
}
}
} else {
invPreInProductDetailService.deleteByCode(key, codeEntity.getCode());
}
}
}
} }
orderEntity.setPreInBillNo(preInBillNo.substring(1)); orderEntity.setPreInBillNo(preInBillNo.substring(1));
orderService.updateOrder(orderEntity); orderService.updateOrder(orderEntity);
} }
} }
} }

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

@ -2,125 +2,144 @@
<!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.api.admin.dao.basic.BussinessLocalTypeDao"> <mapper namespace="com.glxp.api.admin.dao.basic.BussinessLocalTypeDao">
<select id="filterList" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest" <select id="filterList" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.* ,basic_bussiness_type.mainAction ,basic_bustype_origin.name originName from SELECT basic_bustype_local.*, basic_bussiness_type.mainAction, basic_bustype_origin.name originName
basic_bustype_local from basic_bustype_local
LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action LEFT JOIN basic_bussiness_type 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>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.name LIKE concat('%', #{name}, '%')
</if> </if>
<if test="action != ''and action != null"> <if test="action != ''and action != null">
AND action LIKE concat(#{action},'%') AND action LIKE concat(#{action}, '%')
</if> </if>
<if test="originAction != ''and originAction != null"> <if test="originAction != ''and originAction != null">
AND originAction =#{originAction} AND originAction = #{originAction}
</if> </if>
<if test="spUse != ''and spUse != null"> <if test="spUse != ''and spUse != null">
AND spUse =#{spUse} AND spUse = #{spUse}
</if> </if>
</where> </where>
order by basic_bustype_local.updateTime desc order by basic_bustype_local.updateTime desc
</select> </select>
<select id="filterUnBind" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest" <select id="filterUnBind" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
select basic_bustype_local.* from basic_bustype_local select basic_bustype_local.*
LEFT JOIN basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction from basic_bustype_local
LEFT JOIN basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
<where> <where>
localAction is NULL localAction is NULL
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.name LIKE concat('%', #{name}, '%')
</if> </if>
<if test="action != ''and action != null"> <if test="action != ''and action != null">
AND action LIKE concat('%',#{action},'%') AND action LIKE concat('%', #{action}, '%')
</if> </if>
<if test="originAction != ''and originAction != null"> <if test="originAction != ''and originAction != null">
AND originAction =#{originAction} AND originAction = #{originAction}
</if> </if>
</where> </where>
</select> </select>
<select id="filterAllList" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest" <select id="filterAllList" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
SELECT * from basic_bustype_local SELECT *
from basic_bustype_local
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.name LIKE concat('%', #{name}, '%')
</if> </if>
<if test="action != ''and action != null"> <if test="action != ''and action != null">
AND action LIKE concat(#{action},'%') AND action LIKE concat(#{action}, '%')
</if> </if>
<if test="originAction != ''and originAction != null"> <if test="originAction != ''and originAction != null">
AND originAction =#{originAction} AND originAction = #{originAction}
</if> </if>
<if test="spUse != ''and spUse != null"> <if test="spUse != ''and spUse != null">
AND basic_bustype_local.spUse =#{spUse} AND basic_bustype_local.spUse = #{spUse}
</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>
<select id="filterJoin" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest" <select id="filterJoin" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action SELECT basic_bustype_local.id,
localAction,originAction, basic_bustype_local.name localName,
basic_bussiness_type.name , basic_bustype_local.action
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable, localAction,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction originAction,
,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,basic_bustype_local.preIn, basic_bussiness_type.name,
basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.action,
basic_bussiness_type.codeFillCheck basic_bussiness_type.checkEnable,
, basic_bustype_local.supplementAll,basic_bussiness_type.orderVisibleType basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,
basic_bustype_local.spUse,
basic_bussiness_type.storageCode,
basic_bussiness_type.corpType,
basic_bussiness_type.mainAction
,
basic_bussiness_type.prefix,
basic_bustype_local.prefix localPrefix,
basic_bustype_local.preIn,
basic_bustype_local.preInBack,
basic_bussiness_type.ullageFill,
basic_bussiness_type.scanPreIn,
basic_bussiness_type.vailInv,
basic_bussiness_type.codeFillCheck
,
basic_bustype_local.supplementAll,
basic_bussiness_type.orderVisibleType
FROM basic_bustype_local FROM basic_bustype_local
inner join basic_bussiness_type inner join basic_bussiness_type
on basic_bustype_local.action = basic_bussiness_type.localAction on basic_bustype_local.action = basic_bussiness_type.localAction
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.name LIKE concat('%', #{name}, '%')
</if> </if>
<if test="action != ''and action != null"> <if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%') AND basic_bustype_local.action LIKE concat(#{action}, '%')
</if> </if>
<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="spUse != ''and spUse != null"> <if test="spUse != ''and spUse != null">
AND basic_bustype_local.spUse =#{spUse} AND basic_bustype_local.spUse = #{spUse}
</if> </if>
</where> </where>
group by basic_bussiness_type.action group by basic_bussiness_type.action
</select> </select>
<select id="filterJoinOrigin" parameterType="com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest" <select id="filterJoinOrigin" parameterType="com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest"
resultType="com.glxp.api.admin.res.basic.BussinessOriginTypeResponse"> resultType="com.glxp.api.admin.res.basic.BussinessOriginTypeResponse">
select select basic_bussiness_type.action,
basic_bussiness_type.action,basic_bussiness_type.`name`, basic_bussiness_type.`name`,
basic_bussiness_type.localAction,basic_bustype_local.`name` localName, basic_bussiness_type.localAction,
basic_bustype_origin.action originAction,basic_bustype_origin.name originName, basic_bustype_local.`name` localName,
thirdSys,thirdSysName,basic_bustype_origin.`enable` originEnable basic_bustype_origin.action originAction,
basic_bustype_origin.name originName,
thirdSys,
thirdSysName,
basic_bustype_origin.`enable` originEnable
from basic_bussiness_type from basic_bussiness_type
left JOIN basic_bustype_local on basic_bussiness_type.localAction = basic_bustype_local.action 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 left JOIN basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
<where> <where>
<if test="action != ''and action != null"> <if test="action != ''and action != null">
AND basic_bussiness_type.action =#{action} AND basic_bussiness_type.action = #{action}
</if> </if>
<if test="localAction != ''and localAction != null"> <if test="localAction != ''and localAction != null">
AND basic_bustype_local.action =#{localAction} AND basic_bustype_local.action = #{localAction}
</if> </if>
<if test="thirdAction != ''and thirdAction != null"> <if test="thirdAction != ''and thirdAction != null">
AND basic_bustype_origin.action =#{thirdAction} AND basic_bustype_origin.action = #{thirdAction}
</if> </if>
</where> </where>
GROUP BY basic_bussiness_type.id GROUP BY basic_bussiness_type.id
@ -128,51 +147,50 @@
<select id="filterJoinByUser" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest" <select id="filterJoinByUser" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
SELECT SELECT basic_bustype_local.id,
basic_bustype_local.id, basic_bustype_local.NAME localName,
basic_bustype_local.NAME localName, basic_bustype_local.action localAction,
basic_bustype_local.action localAction, originAction,
originAction, basic_bussiness_type.NAME,
basic_bussiness_type.NAME, basic_bussiness_type.action,
basic_bussiness_type.action, basic_bussiness_type.checkEnable,
basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
basic_bustype_local.advanceType, basic_bustype_local.changeEnable,
basic_bustype_local.changeEnable, basic_bustype_local.spUse,
basic_bustype_local.spUse, basic_bussiness_type.storageCode,
basic_bussiness_type.storageCode, basic_bussiness_type.corpType,
basic_bussiness_type.corpType, basic_bussiness_type.mainAction,
basic_bussiness_type.mainAction, basic_bussiness_type.defaultUnit,
basic_bussiness_type.defaultUnit, basic_bussiness_type.genUnit,
basic_bussiness_type.genUnit, basic_bussiness_type.prefix,
basic_bussiness_type.prefix, basic_bustype_local.prefix,
basic_bustype_local.prefix, basic_bustype_local.preIn,
basic_bussiness_type.ullageFill, basic_bustype_local.preInBack,
basic_bussiness_type.scanPreIn, basic_bussiness_type.ullageFill,
basic_bussiness_type.vailInv, basic_bussiness_type.scanPreIn,
basic_bussiness_type.codeFillCheck, basic_bussiness_type.vailInv,
basic_bussiness_type.prefix, basic_bussiness_type.codeFillCheck,
basic_bustype_local.prefix localPrefix, basic_bussiness_type.prefix,
basic_bussiness_type.ullageFill, basic_bustype_local.prefix localPrefix,
basic_bussiness_type.scanPreIn, basic_bussiness_type.ullageFill,
basic_bussiness_type.vailInv, basic_bussiness_type.vailInv,
basic_bussiness_type.codeFillCheck, basic_bussiness_type.codeFillCheck,
supplementAll supplementAll
FROM FROM basic_bustype_local
basic_bustype_local INNER JOIN basic_bussiness_type ON basic_bustype_local.action = basic_bussiness_type.localAction
INNER JOIN basic_bussiness_type ON basic_bustype_local.action = basic_bussiness_type.localAction INNER JOIN inv_bustype_user ON basic_bussiness_type.action = inv_bustype_user.scAction
INNER JOIN inv_bustype_user ON basic_bussiness_type.action = inv_bustype_user.scAction
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.name LIKE concat('%', #{name}, '%')
</if> </if>
<if test="action != ''and action != null"> <if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%') AND basic_bustype_local.action LIKE concat(#{action}, '%')
</if> </if>
<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="spUse != ''and spUse != null"> <if test="spUse != ''and spUse != null">
AND basic_bustype_local.spUse =#{spUse} AND basic_bustype_local.spUse = #{spUse}
</if> </if>
<if test="code != ''and code != null"> <if test="code != ''and code != null">
@ -182,7 +200,7 @@
AND inv_bustype_user.`userId` = #{userId} AND inv_bustype_user.`userId` = #{userId}
</if> </if>
<if test="type != null"> <if test="type != null">
AND inv_bustype_user.subInvCode = #{code} AND inv_bustype_user.subInvCode = #{code}
</if> </if>
</where> </where>
group by basic_bussiness_type.action group by basic_bussiness_type.action
@ -191,23 +209,37 @@
<select id="filterLeftJoin" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest" <select id="filterLeftJoin" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action SELECT basic_bustype_local.id,
localAction,originAction, basic_bustype_local.name localName,
basic_bussiness_type.name , basic_bustype_local.action
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable, localAction,
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction originAction,
,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,preIn,supplementAll basic_bussiness_type.name,
basic_bussiness_type.action,
basic_bussiness_type.checkEnable,
basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,
basic_bustype_local.spUse,
basic_bussiness_type.storageCode,
basic_bussiness_type.corpType,
basic_bussiness_type.mainAction
,
basic_bussiness_type.prefix,
basic_bustype_local.prefix localPrefix,
preIn,
basic_bustype_local.preInBack,
supplementAll
FROM basic_bustype_local FROM basic_bustype_local
LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.name LIKE concat('%', #{name}, '%')
</if> </if>
<if test="action != ''and action != null"> <if test="action != ''and action != null">
AND basic_bustype_local.action LIKE concat(#{action},'%') AND basic_bustype_local.action LIKE concat(#{action}, '%')
</if> </if>
<if test="spUse != ''and spUse != null"> <if test="spUse != ''and spUse != null">
AND spUse =#{spUse} AND spUse = #{spUse}
</if> </if>
</where> </where>
</select> </select>
@ -216,38 +248,61 @@
<insert id="insertBussinessType" keyProperty="id" <insert id="insertBussinessType" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
replace replace
INTO basic_bustype_local INTO basic_bustype_local
(action, name, remark, originAction, advanceType, changeEnable, spUse,updateTime,prefix,preIn,supplementAll) (action, name, remark, originAction, advanceType, changeEnable, spUse, updateTime, prefix, preIn,
values ( supplementAll, preInBack)
#{action}, values (#{action},
#{name}, #{name},
#{remark}, #{remark},
#{originAction}, #{originAction},
#{advanceType}, #{advanceType},
#{changeEnable}, #{changeEnable},
#{spUse}, #{spUse},
#{updateTime}, #{updateTime},
#{prefix}, #{prefix},
#{preIn}, #{preIn},
#{supplementAll} #{supplementAll}, #{preInBack})
)
</insert> </insert>
<update id="updateBusLocalType" parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> <update id="updateBusLocalType" parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
UPDATE basic_bustype_local UPDATE basic_bustype_local
<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="remark != null">remark = #{remark},</if> </if>
<if test="originAction != null">originAction = #{originAction},</if> <if test="name != null">
<if test="advanceType != null">advanceType = #{advanceType},</if> name = #{name},
<if test="changeEnable != null">changeEnable = #{changeEnable},</if> </if>
<if test="spUse != null">spUse = #{spUse},</if> <if test="remark != null">
<if test="updateTime != null">updateTime = #{updateTime},</if> remark = #{remark},
<if test="prefix != null">prefix = #{prefix},</if> </if>
<if test="preIn != null">preIn = #{preIn},</if> <if test="originAction != null">
<if test="supplementAll != null">supplementAll = #{supplementAll},</if> originAction = #{originAction},
</if>
<if test="advanceType != null">
advanceType = #{advanceType},
</if>
<if test="changeEnable != null">
changeEnable = #{changeEnable},
</if>
<if test="spUse != null">
spUse = #{spUse},
</if>
<if test="updateTime != null">
updateTime = #{updateTime},
</if>
<if test="prefix != null">
prefix = #{prefix},
</if>
<if test="preIn != null">
preIn = #{preIn},
</if>
<if test="supplementAll != null">
supplementAll = #{supplementAll},
</if>
<if test="preInBack != null">
preInBack = #{preInBack},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -269,21 +324,22 @@
select action, name select action, name
from basic_bustype_local from basic_bustype_local
where action not in ( where action not in (
select code select code
from basic_third_sys_bus_api from basic_third_sys_bus_api
); );
</select> </select>
<select id="selectPreInByOrderType" resultType="java.lang.Boolean"> <select id="selectPreInByOrderType" resultType="java.lang.Boolean">
select preIn select preIn
from basic_bustype_local from basic_bustype_local
where action = ( where action = (
select localAction from basic_bussiness_type where basic_bussiness_type.action = #{action} select localAction from basic_bussiness_type where basic_bussiness_type.action = #{action}
) )
</select> </select>
<select id="selectByName" parameterType="string" resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity"> <select id="selectByName" parameterType="string"
resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
select * select *
FROM basic_bustype_local FROM basic_bustype_local
<where> <where>
@ -293,7 +349,6 @@
<if test="id != ''and id != null"> <if test="id != ''and id != null">
AND basic_bustype_local.id != #{id} AND basic_bustype_local.id != #{id}
</if> </if>
</where> </where>
</select> </select>
</mapper> </mapper>

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

@ -5,64 +5,65 @@
<select id="filterList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest" <select id="filterList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessTypeEntity"> resultType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
SELECT basic_bussiness_type.id, SELECT basic_bussiness_type.id,
basic_bussiness_type.action, basic_bussiness_type.action,
basic_bussiness_type.vailDispatch, basic_bussiness_type.vailDispatch,
basic_bussiness_type.vailGroupBuy, basic_bussiness_type.vailGroupBuy,
basic_bussiness_type.name, basic_bussiness_type.name,
basic_bussiness_type.enable, basic_bussiness_type.enable,
basic_bussiness_type.remark, basic_bussiness_type.remark,
basic_bussiness_type.mainAction, basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk, basic_bussiness_type.thirdSysFk,
basic_bussiness_type.localAction, basic_bussiness_type.localAction,
basic_bussiness_type.secCheckEnable, basic_bussiness_type.secCheckEnable,
basic_bussiness_type.checkUdims, basic_bussiness_type.checkUdims,
basic_bussiness_type.checkPdaEd, basic_bussiness_type.checkPdaEd,
basic_bussiness_type.checkPdaUn, basic_bussiness_type.checkPdaUn,
basic_bussiness_type.checkPc, basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew, basic_bussiness_type.checkWebNew,
basic_bussiness_type.checkChange, basic_bussiness_type.checkChange,
basic_bussiness_type.codeFillCheck, basic_bussiness_type.codeFillCheck,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckUdims,
basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaEd,
basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckWebNew,
basic_bussiness_type.secCheckChange, basic_bussiness_type.secCheckChange,
basic_bussiness_type.entrutSpms, basic_bussiness_type.entrutSpms,
basic_bussiness_type.ullageFill, basic_bussiness_type.ullageFill,
basic_bussiness_type.scanPreIn, basic_bussiness_type.scanPreIn,
basic_bussiness_type.vailInv, basic_bussiness_type.vailInv,
basic_bustype_local.name localName, basic_bustype_local.name localName,
basic_bussiness_type.checkEnable, basic_bussiness_type.checkEnable,
basic_bustype_local.advanceType, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable, basic_bustype_local.changeEnable,
basic_bussiness_type.genUnit, basic_bussiness_type.genUnit,
basic_bussiness_type.innerOrder, basic_bussiness_type.innerOrder,
basic_bussiness_type.outTospms, basic_bussiness_type.outTospms,
basic_bustype_local.spUse, basic_bustype_local.spUse,
corpType, corpType,
basic_bussiness_type.storageCode, basic_bussiness_type.storageCode,
basic_bussiness_type.checkBalacne, basic_bussiness_type.checkBalacne,
basic_bussiness_type.secCheckBalacne, basic_bussiness_type.secCheckBalacne,
defaultUnit, defaultUnit,
basic_bustype_origin.action basic_bustype_origin.action
thirdAction, thirdAction,
basic_bustype_origin.thirdSys, basic_bustype_origin.thirdSys,
basic_bussiness_type.useDyCount, basic_bussiness_type.useDyCount,
basic_bussiness_type.expireTip, basic_bussiness_type.expireTip,
basic_bussiness_type.prefix, basic_bussiness_type.prefix,
basic_bustype_local.prefix basic_bustype_local.prefix
localPrefix, localPrefix,
basic_bustype_local.preIn, basic_bustype_local.preIn,
basic_bussiness_type.defaultSubInv, basic_bustype_local.preInBack,
basic_bussiness_type.defaultInv, basic_bussiness_type.defaultSubInv,
orderVisibleType, basic_bussiness_type.defaultInv,
supplementAll, orderVisibleType,
checkCopy, supplementAll,
secCheckCopy checkCopy,
secCheckCopy
FROM basic_bussiness_type FROM basic_bussiness_type
LEFT JOIN basic_bustype_local 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>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@ -116,26 +117,27 @@
<select id="filterJoinList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest" <select id="filterJoinList" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
resultType="com.glxp.api.admin.res.basic.BussinessTypResponse"> resultType="com.glxp.api.admin.res.basic.BussinessTypResponse">
select basic_bussiness_type.*, select basic_bussiness_type.*,
basic_bustype_local.name localName, basic_bustype_local.name localName,
basic_bussiness_type.checkEnable, basic_bussiness_type.checkEnable,
basic_bustype_local.advanceType, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable, basic_bustype_local.changeEnable,
basic_bussiness_type.genUnit, basic_bussiness_type.genUnit,
basic_bussiness_type.innerOrder, basic_bussiness_type.innerOrder,
defaultUnit, defaultUnit,
basic_bustype_local.spUse, basic_bustype_local.spUse,
basic_bussiness_type.storageCode, basic_bussiness_type.storageCode,
basic_bussiness_type.expireTip, basic_bussiness_type.expireTip,
basic_bustype_local.prefix localPrefix, basic_bustype_local.prefix localPrefix,
basic_bustype_local.preIn, basic_bustype_local.preIn,
orderVisibleType, basic_bustype_local.preInBack,
supplementAll orderVisibleType,
supplementAll
from basic_bussiness_type from basic_bussiness_type
LEFT JOIN LEFT JOIN
basic_third_sys on basic_bussiness_type.thirdSysFk = basic_third_sys on basic_bussiness_type.thirdSysFk =
basic_third_sys.thirdId basic_third_sys.thirdId
LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = 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">
AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@ -173,70 +175,71 @@
<select id="filterAllByUser" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest" <select id="filterAllByUser" parameterType="com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest"
resultType="com.glxp.api.admin.entity.basic.BussinessTypeEntity"> resultType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
SELECT basic_bussiness_type.id, SELECT basic_bussiness_type.id,
basic_bussiness_type.action, basic_bussiness_type.action,
basic_bussiness_type.name, basic_bussiness_type.name,
basic_bussiness_type.enable, basic_bussiness_type.enable,
basic_bussiness_type.remark, basic_bussiness_type.remark,
basic_bussiness_type.mainAction, basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk, basic_bussiness_type.thirdSysFk,
basic_bussiness_type.localAction, basic_bussiness_type.localAction,
basic_bussiness_type.secCheckEnable, basic_bussiness_type.secCheckEnable,
basic_bussiness_type.checkUdims, basic_bussiness_type.checkUdims,
basic_bussiness_type.checkPdaEd, basic_bussiness_type.checkPdaEd,
basic_bussiness_type.checkPdaUn, basic_bussiness_type.checkPdaUn,
basic_bussiness_type.checkPc, basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew, basic_bussiness_type.checkWebNew,
basic_bussiness_type.checkChange, basic_bussiness_type.checkChange,
basic_bussiness_type.entrutSpms, basic_bussiness_type.entrutSpms,
basic_bussiness_type.codeFillCheck, basic_bussiness_type.codeFillCheck,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckUdims,
basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaEd,
basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckWebNew,
basic_bussiness_type.secCheckChange, basic_bussiness_type.secCheckChange,
basic_bussiness_type.outTospms, basic_bussiness_type.outTospms,
basic_bussiness_type.ullageFill, basic_bussiness_type.ullageFill,
basic_bussiness_type.scanPreIn, basic_bussiness_type.scanPreIn,
basic_bussiness_type.vailInv, basic_bussiness_type.vailInv,
basic_bussiness_type.vailDispatch, basic_bussiness_type.vailDispatch,
basic_bussiness_type.vailGroupBuy, basic_bussiness_type.vailGroupBuy,
basic_bustype_local.name localName, basic_bustype_local.name localName,
basic_bussiness_type.checkEnable, basic_bussiness_type.checkEnable,
basic_bustype_local.advanceType, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable, basic_bustype_local.changeEnable,
basic_bussiness_type.genUnit, basic_bussiness_type.genUnit,
basic_bussiness_type.innerOrder, basic_bussiness_type.innerOrder,
basic_bustype_local.spUse, basic_bustype_local.spUse,
corpType, corpType,
basic_bussiness_type.storageCode, basic_bussiness_type.storageCode,
basic_bussiness_type.checkBalacne, basic_bussiness_type.checkBalacne,
defaultUnit, defaultUnit,
basic_bussiness_type.secCheckBalacne, basic_bussiness_type.secCheckBalacne,
basic_bustype_origin.action basic_bustype_origin.action
thirdAction, thirdAction,
basic_bustype_origin.thirdSys, basic_bustype_origin.thirdSys,
useDyCount, useDyCount,
basic_bussiness_type.expireTip, basic_bussiness_type.expireTip,
basic_bussiness_type.prefix, basic_bussiness_type.prefix,
basic_bustype_local.prefix basic_bustype_local.prefix
localPrefix, localPrefix,
basic_bustype_local.preIn, basic_bustype_local.preIn,
basic_bussiness_type.defaultSubInv, basic_bustype_local.preInBack,
basic_bussiness_type.defaultInv, basic_bussiness_type.defaultSubInv,
orderVisibleType, basic_bussiness_type.defaultInv,
supplementAll, orderVisibleType,
checkCopy, supplementAll,
secCheckCopy checkCopy,
secCheckCopy
FROM basic_bussiness_type FROM basic_bussiness_type
LEFT JOIN basic_bustype_local 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 INNER JOIN inv_warehouse_bussiness_type
on basic_bussiness_type.action = inv_warehouse_bussiness_type.action 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`
INNER JOIN inv_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction INNER JOIN inv_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction
<where> <where>
<if test="name != ''and name != null"> <if test="name != ''and name != null">
AND basic_bussiness_type.name LIKE concat('%', #{name}, '%') AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@ -272,117 +275,119 @@
<insert id="insertBussinessType" keyProperty="id" <insert id="insertBussinessType" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.BussinessTypeEntity"> parameterType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
replace replace
INTO basic_bussiness_type INTO basic_bussiness_type
(`action`, `name`, enable, remark, mainAction, localAction, thirdSysFk, (`action`, `name`, enable, remark, mainAction, localAction, thirdSysFk,
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, 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, outTospms, entrutSpms, defaultInv, , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, outTospms, entrutSpms,
orderVisibleType, checkCopy, secCheckCopy, vailDispatch, vailGroupBuy) defaultInv,
orderVisibleType, checkCopy, secCheckCopy, vailDispatch, vailGroupBuy)
values (#{action}, values (#{action},
#{name}, #{name},
#{enable}, #{enable},
#{remark}, #{remark},
#{mainAction}, #{mainAction},
#{localAction}, #{localAction},
#{thirdSysFk}, #{thirdSysFk},
#{checkEnable}, #{checkEnable},
#{genUnit}, #{genUnit},
#{innerOrder}, #{innerOrder},
#{secCheckEnable}, #{secCheckEnable},
#{checkUdims}, #{checkUdims},
#{checkPdaEd}, #{checkPdaEd},
#{checkPdaUn}, #{checkPdaUn},
#{checkPc}, #{checkPc},
#{checkWebNew}, #{checkWebNew},
#{checkChange}, #{checkChange},
#{secCheckUdims}, #{secCheckUdims},
#{secCheckPdaEd}, #{secCheckPdaEd},
#{secCheckPdaUn}, #{secCheckPdaUn},
#{secCheckPc}, #{secCheckPc},
#{secCheckWebNew}, #{secCheckWebNew},
#{secCheckChange}, #{secCheckChange},
#{corpType}, #{corpType},
#{storageCode}, #{storageCode},
#{checkBalacne}, #{checkBalacne},
#{secCheckBalacne}, #{secCheckBalacne},
#{supplementOrderType}, #{supplementOrderType},
#{defaultUnit}, #{defaultUnit},
#{useDyCount}, #{useDyCount},
#{expireTip}, #{expireTip},
#{updateTime}, #{updateTime},
#{prefix}, #{prefix},
#{ullageFill}, #{ullageFill},
#{scanPreIn}, #{scanPreIn},
#{vailInv}, #{vailInv},
#{codeFillCheck}, #{codeFillCheck},
#{defaultSubInv}, #{defaultSubInv},
#{outTospms}, #{outTospms},
#{entrutSpms}, #{entrutSpms},
#{defaultInv}, #{defaultInv},
#{orderVisibleType}, #{orderVisibleType},
#{checkCopy}, #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}) #{checkCopy}, #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy})
</insert> </insert>
<insert id="insertIgnoreBussinessType" keyProperty="id" <insert id="insertIgnoreBussinessType" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.BussinessTypeEntity"> parameterType="com.glxp.api.admin.entity.basic.BussinessTypeEntity">
insert insert
ignore ignore
INTO basic_bussiness_type INTO basic_bussiness_type
(`index`, `action`, `name`, enable, remark, mainAction, localAction, thirdSysFk, (`index`, `action`, `name`, enable, remark, mainAction, localAction, thirdSysFk,
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, secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit,
useDyCount, expireTip, updateTime, prefix useDyCount, expireTip, updateTime, prefix
, ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, outTospms, entrutSpms, defaultInv, , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, outTospms, entrutSpms,
orderVisibleType, checkCopy, secCheckCopy, vailDispatch, vailGroupBuy) defaultInv,
orderVisibleType, checkCopy, secCheckCopy, vailDispatch, vailGroupBuy)
values (#{index}, values (#{index},
#{action}, #{action},
#{name}, #{name},
#{enable}, #{enable},
#{remark}, #{remark},
#{mainAction}, #{mainAction},
#{localAction}, #{localAction},
#{thirdSysFk}, #{thirdSysFk},
#{checkEnable}, #{checkEnable},
#{genUnit}, #{genUnit},
#{innerOrder}, #{innerOrder},
#{secCheckEnable}, #{secCheckEnable},
#{checkUdims}, #{checkUdims},
#{checkPdaEd}, #{checkPdaEd},
#{checkPdaUn}, #{checkPdaUn},
#{checkPc}, #{checkPc},
#{checkWebNew}, #{checkWebNew},
#{checkChange}, #{checkChange},
#{secCheckUdims}, #{secCheckUdims},
#{secCheckPdaEd}, #{secCheckPdaEd},
#{secCheckPdaUn}, #{secCheckPdaUn},
#{secCheckPc}, #{secCheckPc},
#{secCheckWebNew}, #{secCheckWebNew},
#{secCheckChange}, #{secCheckChange},
#{corpType}, #{corpType},
#{storageCode}, #{storageCode},
#{checkBalacne}, #{checkBalacne},
#{secCheckBalacne}, #{secCheckBalacne},
#{supplementOrderType}, #{supplementOrderType},
#{defaultUnit}, #{defaultUnit},
#{useDyCount}, #{useDyCount},
#{expireTip}, #{expireTip},
#{updateTime}, #{updateTime},
#{prefix}, #{prefix},
#{ullageFill}, #{ullageFill},
#{scanPreIn}, #{scanPreIn},
#{vailInv}, #{vailInv},
#{codeFillCheck}, #{codeFillCheck},
#{defaultSubInv}, #{defaultSubInv},
#{outTospms}, #{outTospms},
#{entrutSpms}, #{entrutSpms},
#{defaultInv}, #{defaultInv},
#{orderVisibleType}, #{checkCopy}, #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}) #{orderVisibleType}, #{checkCopy}, #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy})
</insert> </insert>
@ -535,7 +540,6 @@
<if test="vailGroupBuy != null"> <if test="vailGroupBuy != null">
vailGroupBuy=#{vailGroupBuy}, vailGroupBuy=#{vailGroupBuy},
</if> </if>
thirdSysFk=#{thirdSysFk}, thirdSysFk=#{thirdSysFk},
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
@ -575,9 +579,9 @@
select name, action select name, action
from basic_bussiness_type from basic_bussiness_type
where mainAction = #{mainAction} where mainAction = #{mainAction}
and (supplementOrderType is null and (supplementOrderType is null
or supplementOrderType = '') or supplementOrderType = '')
and corpType = 1 and corpType = 1
</select> </select>
<select id="selectInoutTypebByLocalAction" resultType="java.lang.String"> <select id="selectInoutTypebByLocalAction" resultType="java.lang.String">
@ -590,10 +594,10 @@
select supplementOrderType select supplementOrderType
from basic_bussiness_type from basic_bussiness_type
where action = (select action where action = (select action
from io_order from io_order
where id = (select orderIdFk where id = (select orderIdFk
from stock_order from stock_order
where billNo = #{stockOrderBillNo})) where billNo = #{stockOrderBillNo}))
</select> </select>
<select id="selectNameByAction" resultType="java.lang.String"> <select id="selectNameByAction" resultType="java.lang.String">

139
api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml
Unescape Escape View File

@ -2,10 +2,10 @@
<!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.api.admin.dao.inventory.InvPreInProductDetailDao"> <mapper namespace="com.glxp.api.admin.dao.inventory.InvPreInProductDetailDao">
<select id="filterInvProductDetail" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest" <select id="filterInvProductDetail" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest"
resultType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity"> resultType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity">
SELECT * FROM inv_prein_product_detail SELECT *
FROM inv_prein_product_detail
<where> <where>
<if test="productIdFk != '' and productIdFk != null"> <if test="productIdFk != '' and productIdFk != null">
AND productIdFk = #{productIdFk} AND productIdFk = #{productIdFk}
@ -27,7 +27,7 @@
AND purchaseType = #{purchaseType} AND purchaseType = #{purchaseType}
</if> </if>
<if test="batchNo != '' and batchNo != null and batchNo!='empty'"> <if test="batchNo != '' and batchNo != null and batchNo != 'empty'">
AND batchNo = #{batchNo} AND batchNo = #{batchNo}
</if> </if>
<if test="batchNo == 'empty'"> <if test="batchNo == 'empty'">
@ -55,13 +55,13 @@
AND orderIdFk = #{orderIdFk} AND orderIdFk = #{orderIdFk}
</if> </if>
</where> </where>
</select> </select>
<select id="findAllCode" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest" <select id="findAllCode" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest"
resultType="java.lang.String"> resultType="java.lang.String">
SELECT originCode FROM inv_prein_product_detail SELECT originCode
FROM inv_prein_product_detail
<where> <where>
<if test="productIdFk != '' and productIdFk != null"> <if test="productIdFk != '' and productIdFk != null">
AND productIdFk = #{productIdFk} AND productIdFk = #{productIdFk}
@ -83,7 +83,7 @@
AND purchaseType = #{purchaseType} AND purchaseType = #{purchaseType}
</if> </if>
<if test="batchNo != '' and batchNo != null and batchNo!='empty'"> <if test="batchNo != '' and batchNo != null and batchNo != 'empty'">
AND batchNo = #{batchNo} AND batchNo = #{batchNo}
</if> </if>
<if test="batchNo == 'empty'"> <if test="batchNo == 'empty'">
@ -108,14 +108,14 @@
AND invWarehouseCode = #{invWarehouseCode} AND invWarehouseCode = #{invWarehouseCode}
</if> </if>
</where> </where>
</select> </select>
<select id="filterJoinInvProduct" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest" <select id="filterJoinInvProduct" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest"
resultType="com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse"> resultType="com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse">
SELECT inv_prein_product_detail.* ,io_order.fromCorp,io_order.fromCorpId FROM inv_prein_product_detail SELECT inv_prein_product_detail.*, io_order.fromCorp, io_order.fromCorpId
inner join io_order on inv_prein_product_detail.orderIdFk = io_order.id FROM inv_prein_product_detail
inner join io_order on inv_prein_product_detail.orderIdFk = io_order.id
<where> <where>
<if test="productIdFk != '' and productIdFk != null"> <if test="productIdFk != '' and productIdFk != null">
AND productIdFk = #{productIdFk} AND productIdFk = #{productIdFk}
@ -159,44 +159,39 @@
AND invWarehouseCode = #{invWarehouseCode} AND invWarehouseCode = #{invWarehouseCode}
</if> </if>
</where> </where>
</select> </select>
<insert id="insertInvProductDetail" keyProperty="id" <insert id="insertInvProductDetail" keyProperty="id"
parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity"> parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity">
insert INTO inv_prein_product_detail insert INTO inv_prein_product_detail
(code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime,
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode
, invStorageCode, invWarehouseCode) , invStorageCode, invWarehouseCode)
values (#{code}, values (#{code},
#{productIdFk}, #{orderIdFk}, #{productIdFk}, #{orderIdFk},
#{customerId}, #{mainAction}, #{action}, #{count}, #{updateTime}, #{customerId}, #{mainAction}, #{action}, #{count}, #{updateTime},
#{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk} #{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk}
, #{supId}, #{originCode}, #{invStorageCode}, #{invWarehouseCode}) , #{supId}, #{originCode}, #{invStorageCode}, #{invWarehouseCode})
</insert> </insert>
<insert id="insertInvProductDetails" keyProperty="id" <insert id="insertInvProductDetails" keyProperty="id"
parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity"> parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity">
insert INTO inv_prein_product_detail insert INTO inv_prein_product_detail
(code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime, (code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime,
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode
, invStorageCode, invWarehouseCode) , invStorageCode, invWarehouseCode)
values values
<foreach collection="invProductDetailEntitys" item="item" index="index" <foreach collection="invProductDetailEntitys" item="item" index="index"
separator=","> separator=",">
( (#{item.code},
#{item.code}, #{item.productIdFk}, #{item.orderIdFk},
#{item.productIdFk},#{item.orderIdFk}, #{item.customerId}, #{item.mainAction}, #{item.action}, #{item.count}, #{item.updateTime},
#{item.customerId},#{item.mainAction},#{item.action},#{item.count},#{item.updateTime}, #{item.purchaseType}, #{item.batchNo}, #{item.productionDate}, #{item.expireDate},
#{item.purchaseType}, #{item.batchNo}, #{item.productionDate}, #{item.expireDate}, #{item.unitFk}, #{item.stockIdFk}, #{item.supId}, #{item.originCode}, #{item.invStorageCode},
#{item.unitFk},#{item.stockIdFk},#{item.supId},#{item.originCode}, #{item.invStorageCode}, #{item.invWarehouseCode})
#{item.invWarehouseCode}
)
</foreach> </foreach>
</insert> </insert>
@ -213,8 +208,8 @@
<if test="productIdFk != '' and productIdFk != null"> <if test="productIdFk != '' and productIdFk != null">
AND productIdFk = #{productIdFk} AND productIdFk = #{productIdFk}
</if> </if>
<if test="batchNo != '' and batchNo != null and batchNo!='empty'"> <if test="batchNo != '' and batchNo != null and batchNo != 'empty'">
AND inv_prein_product_detail.batchNo like concat('%',#{batchNo},'%') AND inv_prein_product_detail.batchNo like concat('%', #{batchNo}, '%')
</if> </if>
<if test="batchNo == 'empty'"> <if test="batchNo == 'empty'">
AND batchNo is NULL AND batchNo is NULL
@ -228,6 +223,18 @@
</where> </where>
</delete> </delete>
<delete id="deleteByCode" parameterType="Map">
DELETE
FROM inv_prein_product_detail
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
</if>
<if test="originCode != '' and originCode != null">
AND originCode = #{originCode}
</if>
</where>
</delete>
<delete id="deleteByOrderId"> <delete id="deleteByOrderId">
delete delete
from inv_prein_product_detail from inv_prein_product_detail
@ -237,28 +244,61 @@
<update id="updateInvProductDetail" parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity"> <update id="updateInvProductDetail" parameterType="com.glxp.api.admin.entity.inventory.InvProductDetailEntity">
UPDATE inv_prein_product_detail UPDATE inv_prein_product_detail
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="code != null">code=#{code},</if> <if test="code != null">
<if test="productIdFk != null">productIdFk=#{productIdFk},</if> code=#{code},
<if test="customerId != null">customerId=#{customerId},</if> </if>
<if test="mainAction != null">mainAction=#{mainAction},</if> <if test="productIdFk != null">
<if test="action != null">action=#{action},</if> productIdFk=#{productIdFk},
<if test="count != null">count=#{count},</if> </if>
<if test="unitFk != null">unitFk=#{unitFk},</if> <if test="customerId != null">
<if test="purchaseType != null">purchaseType=#{purchaseType},</if> customerId=#{customerId},
<if test="batchNo != null">batchNo=#{batchNo},</if> </if>
<if test="productionDate != null">productionDate=#{productionDate},</if> <if test="mainAction != null">
<if test="expireDate != null">expireDate=#{expireDate},</if> mainAction=#{mainAction},
<if test="stockIdFk != null">stockIdFk=#{stockIdFk},</if> </if>
<if test="supId != null">supId=#{supId},</if> <if test="action != null">
<if test="originCode != null">originCode=#{originCode},</if> action=#{action},
<if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if> </if>
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if> <if test="count != null">
count=#{count},
</if>
<if test="unitFk != null">
unitFk=#{unitFk},
</if>
<if test="purchaseType != null">
purchaseType=#{purchaseType},
</if>
<if test="batchNo != null">
batchNo=#{batchNo},
</if>
<if test="productionDate != null">
productionDate=#{productionDate},
</if>
<if test="expireDate != null">
expireDate=#{expireDate},
</if>
<if test="stockIdFk != null">
stockIdFk=#{stockIdFk},
</if>
<if test="supId != null">
supId=#{supId},
</if>
<if test="originCode != null">
originCode=#{originCode},
</if>
<if test="invStorageCode != null">
invStorageCode=#{invStorageCode},
</if>
<if test="invWarehouseCode != null">
invWarehouseCode=#{invWarehouseCode},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<select id="statCount" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest" <select id="statCount" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest"
resultType="java.lang.Integer"> resultType="java.lang.Integer">
SELECT count(0) FROM inv_prein_product_detail SELECT count(0)
FROM inv_prein_product_detail
<where> <where>
<if test="productIdFk != '' and productIdFk != null"> <if test="productIdFk != '' and productIdFk != null">
AND productIdFk = #{productIdFk} AND productIdFk = #{productIdFk}
@ -288,8 +328,5 @@
AND supId = #{supId} AND supId = #{supId}
</if> </if>
</where> </where>
</select> </select>
</mapper>
</mapper>

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

@ -37,3 +37,6 @@ create table if not exists `io_code_lost` (
`nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '扫码缺失字段信息补齐表' ROW_FORMAT = DYNAMIC; ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '扫码缺失字段信息补齐表' ROW_FORMAT = DYNAMIC;
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBack', 'tinyint', 1);

Write Preview
Loading…
Cancel
Save