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

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

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

src/main/java/com/glxp/api/controller/inout/IoSplitController.java

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

src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java

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

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

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

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

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

src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml

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

src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml

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

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

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