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
*/
// @PostMapping("/udiwms/basic/collect/order/upload")
@ -441,4 +441,16 @@ public class IoCollectOrderController extends BaseController {
// 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"?>
<!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">
<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">
SELECT ico.billNo,
ico.busType,
@ -22,8 +23,8 @@
ico.splitMsg,
ico.fromCorpName,
ico.tagMsg,
sys_workplace_document.busName busTypeName,
thr_bustype_origin.name actionName,
sys_workplace_document.busName busTypeName,
thr_bustype_origin.name actionName,
sw.workplaceName,
ico.id,
ico.orderTime,
@ -93,297 +94,75 @@
)
</if>
<if test="fromType != '' and fromType != null">
AND fromType
LIKE
concat
(
'%'
,
#{fromType}
,
'%'
)
AND fromType LIKE concat('%', #{fromType}, '%')
</if>
<if test="collectCode != null and collectCode != ''">
AND collectCode = #{collectCode}
</if>
<if test="busType != null and busType != ''">
AND busType
=
#{busType}
AND busType = #{busType}
</if>
<if test="tagStatus != null">
AND tagStatus
=
#{tagStatus}
AND tagStatus = #{tagStatus}
</if>
<if test="workPlaceCode != null">
AND ico
.
workPlaceCode
=
#{workPlaceCode}
AND ico.workPlaceCode = #{workPlaceCode}
</if>
<if test="chargeUser != null">
AND sw
.
chargeUser
=
#{chargeUser}
AND sw.chargeUser = #{chargeUser}
</if>
<if test="unionKey != null">
AND (
ico
.
billNo
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}
,
'%'
)
)
ico.billNo 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 test="tagStatusList != null and tagStatusList.size() > 0">
and
tagStatus
in
and tagStatus in
<foreach collection="tagStatusList" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="workPlaceCodes != null and workPlaceCodes.size() > 0">
and
ico
.
workPlaceCode
in
and ico.workPlaceCode in
<foreach collection="workPlaceCodes" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="invAlert != null">
and ico
.
invAlert
=
#{invAlert}
and ico.invAlert =#{invAlert}
</if>
<if test="invAlerts != null and invAlerts.size() > 0">
and
ico
.
invAlert
in
and ico.invAlert in
<foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
<if test="uploadStatus != null">
and ico
.
uploadStatus
=
#{uploadStatus}
and ico.uploadStatus = #{uploadStatus}
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format
(
ico
.
billTime
,
'%Y-%m-%d'
)
between
date_format
(
#{startTime}
,
'%Y-%m-%d'
)
and
date_format
(
#{endTime}
,
'%Y-%m-%d'
)
AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
</if>
<if test="keywords != null and keywords != ''">
and (
ico
.
billNo
like
concat
(
'%'
,
#{keywords}
,
'%'
)
or
ico
.
fromCorp
like
concat
(
'%'
,
#{keywords}
,
'%'
)
or
ico
.
fromCorpName
like
concat
(
'%'
,
#{keywords}
,
'%'
)
or
ico
.
fromType
like
concat
(
'%'
,
#{keywords}
,
'%'
)
)
and (ico.billNo like concat('%', #{keywords}, '%')
or ico.fromCorp like concat('%', #{keywords}, '%')
or ico.fromCorpName like concat('%', #{keywords}, '%')
or ico.fromType like concat('%', #{keywords}, '%'))
</if>
</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
</select>
</mapper>

Write Preview
Loading…
Cancel
Save