2/20 优化1.0 查询正在上货的草稿单据

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

@@ -1384,7 +1384,7 @@ public class IoOrderController extends BaseController {
 
     @GetMapping("/udiwms/inout/order/getProcessingOrder")
     public BaseResponse getProcessingOrder(AddOrderRequest addOrderRequest) {
-        IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "", getUserId());
+        IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "",addOrderRequest.getWorkPlaceQueueCode(), getUserId());
         return ResultVOUtils.success(order);
     }
 

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

@@ -235,6 +235,11 @@ public class FilterOrderRequest extends ListPageRequest {
 
     private String keyWords;
 
+    /**
+     * 上货货位编码
+     */
+    private String workPlaceQueueCode;
+
 
 
 }

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -161,7 +161,7 @@ public interface IoOrderService {
     IoOrderEntity findCorpOrderId(String billNo);
 
 
-    IoOrderResponse findByWorkPlaceCode(String workPlaceCode,Long UserId);
+    IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long UserId);
 
     String selectAliYljgSearchbillByAliBillNo(String key);
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -1073,12 +1073,13 @@ public class IoOrderServiceImpl implements IoOrderService {
     }
 
     @Override
-    public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,Long userId) {
+    public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long userId) {
         //根据用户和状态查找处理中的订单查询单据表
         FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
         filterOrderRequest.setWorkPlaceCode(workPlaceCode);
-        filterOrderRequest.setStatus(3);//处理中的订单
-        filterOrderRequest.setUpdateUser(userId + "");
+        filterOrderRequest.setStatus(1);//处理中的订单
+//        filterOrderRequest.setUpdateUser(userId + "");
+        filterOrderRequest.setWorkPlaceQueueCode(getWorkPlaceQueueCode);
         List<IoOrderResponse> ioOrderResponses = orderDao.filterList(filterOrderRequest);
 //        QueryWrapper<IoOrderEntity> ew = new QueryWrapper<>();
 //        ew.eq("workPlaceCode", workPlaceCode);

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -87,6 +87,9 @@
             <if test="workPlaceCode != null and workPlaceCode != ''">
                 AND io.workPlaceCode = #{workPlaceCode}
             </if>
+            <if test="workPlaceQueueCode != null and workPlaceQueueCode != ''">
+                AND io.workPlaceQueueCode = #{workPlaceQueueCode}
+            </if>
             <if test="invoiceEncode != null and invoiceEncode != ''">
                 AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%')
             </if>