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

Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

Browse Source
dev_no_inv
yewj 10 months ago
parent 47fcc01651 e077eb262c
commit a394586976
3 changed files with 69 additions and 259 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
Unescape Escape View File

@ -430,7 +430,7 @@ public class IoCollectOrderController extends BaseController {
/** /**
* 单据上传 * 单据上传
* *
* @param collectOrderRequest * @param
* @return * @return
*/ */
// @PostMapping("/udiwms/basic/collect/order/upload") // @PostMapping("/udiwms/basic/collect/order/upload")
@ -441,4 +441,16 @@ public class IoCollectOrderController extends BaseController {
// return ResultVOUtils.success(); // return ResultVOUtils.success();
// } // }
@PostMapping("/udiwms/basic/collect/decideOrder")
public BaseResponse decideOrder(@RequestBody CollectOrderRequest request){
Boolean isExis = collectOrderService.decideOrder(request);
if (!isExis){
return ResultVOUtils.error("当前工位正在处理单据，无法打开当前单据");
}
return ResultVOUtils.success();
}
} }

19
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -805,4 +805,23 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
} }
public Boolean decideOrder(CollectOrderRequest request) {
List<IoCollectOrder> ioCollectOrders = collectOrderMapper.selectList(new LambdaQueryWrapper<IoCollectOrder>()
.eq(IoCollectOrder::getWorkPlaceCode, request.getWorkPlaceCode())
.eq(IoCollectOrder::getTagStatus, request.getTagStatus()));
if (ioCollectOrders.size() >0){
return false;
}
//如果有判断是否是当前单据
if (ioCollectOrders.size() == 1){
IoCollectOrder ioCollectOrder = ioCollectOrders.get(0);
if (ioCollectOrder.getBillNo().equals(request.getBillNo())){
return true;
}
return false;
}
return true;
}
} }

295
src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
Unescape Escape View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!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.dao.collect.IoCollectOrderOriginMapper"> <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderOriginMapper">
<select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
<select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
resultType="com.glxp.api.res.collect.IoCollectOrderResponse"> resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
SELECT ico.billNo, SELECT ico.billNo,
ico.busType, ico.busType,
@ -22,8 +23,8 @@
ico.splitMsg, ico.splitMsg,
ico.fromCorpName, ico.fromCorpName,
ico.tagMsg, ico.tagMsg,
sys_workplace_document.busName busTypeName, sys_workplace_document.busName busTypeName,
thr_bustype_origin.name actionName, thr_bustype_origin.name actionName,
sw.workplaceName, sw.workplaceName,
ico.id, ico.id,
ico.orderTime, ico.orderTime,
@ -93,297 +94,75 @@
) )
</if> </if>
<if test="fromType != '' and fromType != null"> <if test="fromType != '' and fromType != null">
AND fromType AND fromType LIKE concat('%', #{fromType}, '%')
LIKE </if>
concat <if test="collectCode != null and collectCode != ''">
( AND collectCode = #{collectCode}
'%'
,
#{fromType}
,
'%'
)
</if> </if>
<if test="busType != null and busType != ''"> <if test="busType != null and busType != ''">
AND busType AND busType = #{busType}
=
#{busType}
</if> </if>
<if test="tagStatus != null"> <if test="tagStatus != null">
AND tagStatus AND tagStatus = #{tagStatus}
=
#{tagStatus}
</if> </if>
<if test="workPlaceCode != null"> <if test="workPlaceCode != null">
AND ico AND ico.workPlaceCode = #{workPlaceCode}
.
workPlaceCode
=
#{workPlaceCode}
</if> </if>
<if test="chargeUser != null"> <if test="chargeUser != null">
AND sw AND sw.chargeUser = #{chargeUser}
.
chargeUser
=
#{chargeUser}
</if> </if>
<if test="unionKey != null"> <if test="unionKey != null">
AND ( AND (
ico ico.billNo like concat('%', #{unionKey}, '%')
. or ico.fromCorp like concat('%', #{unionKey}, '%')
billNo or ico.fromType like concat('%', #{unionKey}, '%')
like or ico.fromCorpName like concat('%', #{unionKey}, '%')
concat or ico.backupOrderRemark1 like concat('%', #{unionKey}, '%')
( or ico.backupOrderRemark2 like concat('%', #{unionKey}, '%')
'%' or ico.backupOrderRemark3 like concat('%', #{unionKey}, '%')
, or ico.backupOrderRemark4 like concat('%', #{unionKey}, '%')
#{unionKey} or ico.backupOrderRemark5 like concat('%', #{unionKey}, '%')
, or ico.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
'%'
)
or
ico
.
fromCorp
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
or
ico
.
fromType
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
or
ico
.
fromCorpName
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
or
ico
.
backupOrderRemark1
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
or
ico
.
backupOrderRemark2
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
or
ico
.
backupOrderRemark3
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
or
ico
.
backupOrderRemark4
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
or
ico
.
backupOrderRemark5
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
or
ico
.
backupOrderRemark6
like
concat
(
'%'
,
#{unionKey}
,
'%'
)
)
</if> </if>
<if test="tagStatusList != null and tagStatusList.size() > 0"> <if test="tagStatusList != null and tagStatusList.size() > 0">
and and tagStatus in
tagStatus
in
<foreach collection="tagStatusList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="tagStatusList" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="workPlaceCodes != null and workPlaceCodes.size() > 0"> <if test="workPlaceCodes != null and workPlaceCodes.size() > 0">
and and ico.workPlaceCode in
ico
.
workPlaceCode
in
<foreach collection="workPlaceCodes" item="item" index="index" separator="," open="(" close=")"> <foreach collection="workPlaceCodes" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="invAlert != null"> <if test="invAlert != null">
and ico and ico.invAlert =#{invAlert}
.
invAlert
=
#{invAlert}
</if> </if>
<if test="invAlerts != null and invAlerts.size() > 0"> <if test="invAlerts != null and invAlerts.size() > 0">
and and ico.invAlert in
ico
.
invAlert
in
<foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")"> <foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="uploadStatus != null"> <if test="uploadStatus != null">
and ico and ico.uploadStatus = #{uploadStatus}
.
uploadStatus
=
#{uploadStatus}
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
(
ico
.
billTime
,
'%Y-%m-%d'
)
between
date_format
(
#{startTime}
,
'%Y-%m-%d'
)
and
date_format
(
#{endTime}
,
'%Y-%m-%d'
)
</if> </if>
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
and ( and (ico.billNo like concat('%', #{keywords}, '%')
ico or ico.fromCorp like concat('%', #{keywords}, '%')
. or ico.fromCorpName like concat('%', #{keywords}, '%')
billNo or ico.fromType like concat('%', #{keywords}, '%'))
like
concat
(
'%'
,
#{keywords}
,
'%'
)
or
ico
.
fromCorp
like
concat
(
'%'
,
#{keywords}
,
'%'
)
or
ico
.
fromCorpName
like
concat
(
'%'
,
#{keywords}
,
'%'
)
or
ico
.
fromType
like
concat
(
'%'
,
#{keywords}
,
'%'
)
)
</if> </if>
</where> </where>
GROUP BY ico.billNo GROUP BY
ico.billNo
order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
</select> </select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save