9/27 优化页面查询条件1.0

dev_no_inv
wangwei 10 months ago
parent 3df1ede2c4
commit d9078fe7d8

@ -160,6 +160,8 @@ public class IoCollectOrderController extends BaseController {
request.setLimit(1); request.setLimit(1);
request.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); request.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
request.setBusType(collectOrderRequest.getBusType()); request.setBusType(collectOrderRequest.getBusType());
//根据更改用户查询单据 防止两个用户分配同一单据
request.setUpdateUser(getUserId());
request.setTagStatus(2); request.setTagStatus(2);
List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(request); List<IoCollectOrderResponse> orderResponses = collectOrderService.filterList(request);
if (CollUtil.isNotEmpty(orderResponses)) if (CollUtil.isNotEmpty(orderResponses))

@ -134,6 +134,11 @@ public class IoSplitController extends BaseController {
return ResultVOUtils.error(500, "未找到单据"); return ResultVOUtils.error(500, "未找到单据");
} }
if (collectOrder.getTagStatus() == 2){
return ResultVOUtils.error(501,"当前单据正在处理中,请重新选择单据");
}
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType()); SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) { if (IntUtil.value(sysWorkplaceDocumentEntity.getAutoTag()) == 1) {
splitCodeService.preAutoTagCode(collectOrder); splitCodeService.preAutoTagCode(collectOrder);

@ -22,6 +22,9 @@ public class SysWorkplaceRequest extends ListPageRequest {
//工位状态 //工位状态
private Integer workplaceStatus; private Integer workplaceStatus;
//工位类型
private Integer workPlaceClass;
private List<Long> ids; private List<Long> ids;
private List<Long> workPlaceIds; private List<Long> workPlaceIds;

@ -150,4 +150,5 @@ public class CollectOrderRequest extends ListPageRequest {
private String shipperName; private String shipperName;
} }

@ -199,7 +199,7 @@ public class FilterOrderRequest extends ListPageRequest {
private String unionRemark; private String unionRemark;
private String remark; private String remark;
private String keywords; // private String keywords;
private Integer confirmStatus; private Integer confirmStatus;
private Boolean filterSelected; private Boolean filterSelected;
private List<String> inOrders; private List<String> inOrders;

@ -36,6 +36,9 @@
<if test=" request.code != null and request.code != ''"> <if test=" request.code != null and request.code != ''">
AND scps.code = #{request.code} AND scps.code = #{request.code}
</if> </if>
<if test=" request.workPlaceClass != null and request.workPlaceClass != ''">
AND sw.workPlaceClass = #{request.workPlaceClass}
</if>
<if test=" request.workPlaceIds != null and request.workPlaceIds.size > 0"> <if test=" request.workPlaceIds != null and request.workPlaceIds.size > 0">
AND sw.workplaceId IN AND sw.workplaceId IN
<foreach collection="request.workPlaceIds" item="workplaceId" index="index" open="(" close=")" separator=","> <foreach collection="request.workPlaceIds" item="workplaceId" index="index" open="(" close=")" separator=",">

@ -114,6 +114,9 @@
<if test="shipperName != '' and shipperName != null"> <if test="shipperName != '' and shipperName != null">
AND icob.shipperName LIKE concat('%', #{shipperName}, '%') AND icob.shipperName LIKE concat('%', #{shipperName}, '%')
</if> </if>
<if test="fromType != '' and fromType != null">
AND icob.fromType LIKE concat('%', #{fromType}, '%')
</if>
<if test="fromCorpName != '' and fromCorpName != null"> <if test="fromCorpName != '' and fromCorpName != null">
AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%') AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
</if> </if>

@ -71,6 +71,9 @@
<if test="chargeUser != null"> <if test="chargeUser != null">
AND sw.chargeUser = #{chargeUser} AND sw.chargeUser = #{chargeUser}
</if> </if>
<if test="updateUser != null">
AND ico.updateUser = #{updateUser}
</if>
<if test="unionKey != null"> <if test="unionKey != null">
AND ( AND (
ico.billNo like concat( #{unionKey}) ico.billNo like concat( #{unionKey})

Loading…
Cancel
Save