代码备份

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

@@ -131,6 +131,8 @@ public class IoCollectOrderController extends BaseController {
         return ResultVOUtils.error(500, "未查到待处理单据");
     }
 
+    @Resource
+    IoCollectSetService collectSetService;
 
     /**
      * 获取当前正在处理的单据
@@ -157,6 +159,14 @@ public class IoCollectOrderController extends BaseController {
             orderResponses = collectOrderService.filterList(request);
             if (CollUtil.isNotEmpty(orderResponses))
                 return ResultVOUtils.success(orderResponses.get(0));
+            else {
+                IoCollectSet collectSet = collectSetService.getSet();
+                if (IntUtil.value(collectSet.getAutoDealOrder())) {
+                    request.setTagStatus(1);
+                    orderResponses = collectOrderService.filterList(request);
+                    return ResultVOUtils.success(orderResponses.get(0));
+                }
+            }
         }
 
         return ResultVOUtils.error(500, "未查到待处理单据");

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

@@ -1,20 +1,11 @@
 package com.glxp.api.controller.collect;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageInfo;
-import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
-import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectSet;
-import com.glxp.api.req.collect.CollectOrderCodeManRequest;
-import com.glxp.api.req.inout.AddTagCodeReqeust;
-import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.collect.CollectOrderCodeManResponse;
 import com.glxp.api.service.collect.IoCollectSetService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -32,7 +23,6 @@ public class IoCollectSetController extends BaseController {
     IoCollectSetService collectSetService;
 
 
-
     @GetMapping("/udiwms/ioSplit/collect/getSet")
     public BaseResponse getSet() {
         IoCollectSet  collectSet =  collectSetService.getSet();
@@ -40,7 +30,6 @@ public class IoCollectSetController extends BaseController {
     }
 
 
-
     @PostMapping("/udiwms/ioSplit/collect/updateSet")
     public BaseResponse updateSet(@RequestBody @Valid IoCollectSet collectSet) {
         collectSetService.updateById(collectSet);

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

@@ -88,7 +88,7 @@ public class CollectOrderRequest extends ListPageRequest {
     private Long updateUser;
 
     private List<Integer> tagStatusList;
-
+    // 赋码状态  0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常,-1:草稿，挂起状态
     private Integer tagStatus;
 
     private String workplaceName;

src/main/resources/schemas/schema_v2.4.sql

@@ -4425,3 +4425,20 @@ CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'thrBusType',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''第三方单据类型''',
                          1);
 
+
+
+CREATE TABLE IF NOT EXISTS `io_collect_set`
+(
+    `id`                int         NOT NULL,
+    `startDownloadTime` datetime(0) NULL DEFAULT NULL COMMENT '开启下载下时间',
+    `autoDownload`      tinyint     NULL DEFAULT NULL COMMENT '是否开启自动下载',
+    `autoDealOrder`     tinyint     NULL DEFAULT NULL COMMENT '是否自动转成待处理单',
+    `autoAllotOrder`    tinyint     NULL DEFAULT NULL COMMENT '是否自动分配单据',
+    `autoFinishOrder`   tinyint     NULL DEFAULT NULL COMMENT '是否自动完成单据',
+    `autoUploadOrder`   tinyint     NULL DEFAULT NULL COMMENT '是否自动上传单据',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+