3/12 功能优化 草稿单据

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

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

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

@@ -77,4 +77,5 @@ public class AddOrderRequest {
     private Integer scanActCount;
 
 
+
 }

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

@@ -245,5 +245,7 @@ public class FilterOrderRequest extends ListPageRequest {
      */
     private String workPlaceQueueCode;
 
+    private Integer fifoSplitTag;
+
 
 }

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

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

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

@@ -1040,12 +1040,15 @@ public class IoOrderServiceImpl implements IoOrderService {
     }
 
     @Override
-    public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long userId) {
+    public IoOrderResponse findByWorkPlaceCode(String workPlaceCode,String getWorkPlaceQueueCode,Long userId,String action,Integer fifoSplitTag) {
         //根据用户和状态查找处理中的订单查询单据表
         FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
         filterOrderRequest.setWorkPlaceCode(workPlaceCode);
         filterOrderRequest.setStatus(1);//处理中的订单
         filterOrderRequest.setWorkPlaceQueueCode(getWorkPlaceQueueCode);
+        filterOrderRequest.setAction(action);
+        filterOrderRequest.setFifoSplitTag(fifoSplitTag);
+
         List<IoOrderResponse> ioOrderResponses = orderDao.filterList(filterOrderRequest);
         if (ioOrderResponses.size() > 0){
             IoOrderResponse ioOrderResponse = ioOrderResponses.get(0);

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

@@ -63,6 +63,9 @@
             <if test="productType != null and productType != ''">
                 AND io.productType = #{productType}
             </if>
+            <if test="fifoSplitTag != null and fifoSplitTag != ''">
+                AND io.fifoSplitTag = #{fifoSplitTag}
+            </if>
             <if test="id != null and id != ''">
                 AND id = #{id}
             </if>