From cb249acbd7ed7f3bc2afa2bc9bee7d69ac8b5e30 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 三月 2026 14:22:43 +0800
Subject: [PATCH] 空板自动出库定时任务

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java |  217 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 155 insertions(+), 62 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 13c551f..3b01c2f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -39,6 +39,7 @@
 import com.vincent.rsf.server.manager.enums.LocStsType;
 import com.vincent.rsf.server.system.utils.SerialRuleUtils;
 import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -139,6 +140,11 @@
 
         // 楠岃瘉璁惧绔欑偣
         DeviceSite deviceSite = validateDeviceSite(param);
+
+        // 绌烘澘鍏ュ簱锛氫笌闈炵┖鏉垮悓涓�鍏ュ彛锛屼粎涓嶆牎楠岀粍鎵橈紝鍙仛鍒嗛厤搴撲綅銆佸缓浠诲姟銆佹洿鏂板簱浣�
+        if (param.getIoType() != null && param.getIoType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
+            return createInTaskForEmptyPallet(param.getBarcode(), param.getSourceStaNo(), param.getLocType1());
+        }
 
         // 鎻愬墠瀹氫箟 waitPakin / waitPakinItems锛屼緵鍚庣画鍏朵粬鍏ュ簱閫昏緫浣跨敤
         WaitPakin waitPakin = null;
@@ -322,22 +328,47 @@
 
         // 2. 鑻ユ湭鍛戒腑鎷f枡/鐩樼偣鍏ュ簱锛屽啀鏍¢獙缁勬墭骞剁户缁叾浠栧叆搴撻�昏緫
         if (pickInTask == null && checkInTask == null) {
-            waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
-                    .eq(WaitPakin::getBarcode, param.getBarcode())
-                    .in(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));
-            // 绌烘墭鐩樻棤缁勬墭鏃讹細鑻ラ厤缃惎鐢ㄥ垯鎸� AUTO_FULL_OUT_MATNR_CODE 鑷姩缁勬墭骞剁敓鎴愬叆搴撳崟锛屽啀缁х画鍏ュ簱浠诲姟閫昏緫
-            if (waitPakin == null) {
-                tryAutoPakinForBarcode(param.getBarcode());
+            String barcode = param.getBarcode();
+            // 璇ユ墭鐩樺凡鍦ㄥ簱瀛樹腑锛屼笉鍙噸澶嶇敵璇峰叆搴�
+            List<Loc> inStock = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, barcode));
+            if (!inStock.isEmpty()) {
+                throw new CoolException("barcode=" + barcode + ": 璇ユ墭鐩樺凡鍦ㄥ簱锛屼笉鍙噸澶嶇敵璇峰叆搴�");
+            }
+            // 璇ユ墭鐩樺嚭搴撲腑鏈畬鎴愶紝涓嶅彲鐢宠鍏ュ簱
+            List<Integer> outboundTaskTypes = Arrays.asList(
+                    TaskType.TASK_TYPE_OUT.type,
+                    TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
+                    TaskType.TASK_TYPE_MERGE_OUT.type,
+                    TaskType.TASK_TYPE_CHECK_OUT.type,
+                    TaskType.TASK_TYPE_EMPITY_OUT.type
+            );
+            Task outboundTask = taskService.getOne(new LambdaQueryWrapper<Task>()
+                    .eq(Task::getBarcode, barcode)
+                    .in(Task::getTaskType, outboundTaskTypes)
+                    .lt(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id));
+            if (outboundTask != null) {
+                throw new CoolException("barcode=" + barcode + ": 璇ユ墭鐩樺嚭搴撲腑鏈畬鎴愶紝涓嶅彲鐢宠鍏ュ簱");
+            }
+
+            // 鎸� barcode 鍔犻攣锛岄伩鍏嶅悓涓� barcode 骞跺彂璇锋眰閲嶅鑷姩缁勬墭銆侀噸澶嶇敓鎴愬叆搴撳崟
+            String barcodeForLock = param.getBarcode();
+            synchronized ((barcodeForLock != null ? barcodeForLock : "").intern()) {
                 waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
                         .eq(WaitPakin::getBarcode, param.getBarcode())
                         .in(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));
+                // 绌烘墭鐩樻棤缁勬墭鏃讹細鑻ラ厤缃惎鐢ㄥ垯鎸� AUTO_FULL_OUT_MATNR_CODE 鑷姩缁勬墭骞剁敓鎴愬叆搴撳崟锛屽啀缁х画鍏ュ簱浠诲姟閫昏緫
+                if (waitPakin == null) {
+                    tryAutoPakinForBarcode(param.getBarcode());
+                    waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+                            .eq(WaitPakin::getBarcode, param.getBarcode())
+                            .in(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));
+                }
             }
             waitPakin = validateWaitPakin(param.getBarcode());
             waitPakinItems = waitPakinItemService.list(
                     new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
         }
-        // 妫�鏌ュ叾浠栧叆搴撲换鍔$被鍨嬶紙鐢ㄧ鍙锋煡璇紝鐘舵�佷负1鎴�2锛�
-        // 娉ㄦ剰锛氱洏鐐瑰叆搴撳凡鍗曠嫭澶勭悊锛屼笉鍐嶅寘鍚湪姝ゅ垪琛ㄤ腑
+        // 妫�鏌ヨ鎵樼洏鍙锋槸鍚﹀凡鏈夊叆搴撲换鍔★紙鍚繘琛屼腑銆佸凡瀹屾垚锛夛紝鏈夊垯鐩存帴澶嶇敤杩斿洖锛屾嫤鎴噸澶嶆彁浜�
         List<Integer> otherInboundTaskTypes = Arrays.asList(
                 TaskType.TASK_TYPE_IN.type,
                 TaskType.TASK_TYPE_MERGE_IN.type,
@@ -347,48 +378,35 @@
         Task existingInTask = taskService.getOne(new LambdaQueryWrapper<Task>()
                 .eq(Task::getBarcode, param.getBarcode())
                 .in(Task::getTaskType, otherInboundTaskTypes)
-                .in(Task::getTaskStatus, TaskStsType.GENERATE_IN.id, TaskStsType.WCS_EXECUTE_IN.id)
                 .orderByDesc(Task::getCreateTime)
                 .last("LIMIT 1"));
 
         if (Objects.nonNull(existingInTask)) {
-            log.info("鎵惧埌鍖归厤鐨勫叾浠栧叆搴撲换鍔� - 浠诲姟缂栫爜锛歿}锛屼换鍔$被鍨嬶細{}锛岀鍙凤細{}",
-                    existingInTask.getTaskCode(), existingInTask.getTaskType(), param.getBarcode());
+            log.info("鎵惧埌璇ユ墭鐩樺彿宸叉湁鍏ュ簱浠诲姟锛屽鐢ㄥ苟鎷︽埅閲嶅鎻愪氦 - 浠诲姟缂栫爜锛歿}锛岀鍙凤細{}锛岀姸鎬侊細{}",
+                    existingInTask.getTaskCode(), param.getBarcode(), existingInTask.getTaskStatus());
 
-            // 妫�鏌ョ粍鎵樻槑缁嗘槸鍚︽湁璁㈠崟缂栫爜锛堜换鍔$紪鍙凤級
-            List<WaitPakinItem> itemsWithAsnCode = waitPakinItems.stream()
-                    .filter(item -> StringUtils.isNotBlank(item.getAsnCode()))
-                    .collect(Collectors.toList());
-
-            if (!itemsWithAsnCode.isEmpty()) {
-                log.info("缁勬墭妗f湁浠诲姟缂栧彿锛屼娇鐢ㄧ幇鏈夊叆搴撲换鍔″崟鍙� - 浠诲姟缂栫爜锛歿}锛岀鍙凤細{}锛屼换鍔$紪鍙锋暟閲忥細{}",
-                        existingInTask.getTaskCode(), param.getBarcode(), itemsWithAsnCode.size());
-
-                // 鏇存柊鍏ュ簱绔欑偣淇℃伅锛堝鏋滀笌褰撳墠鐢宠鐨勭珯鐐逛笉鍚岋級
-                if (StringUtils.isNotBlank(param.getSourceStaNo()) &&
-                        !param.getSourceStaNo().equals(existingInTask.getOrgSite())) {
-                    log.info("鏇存柊鍏ュ簱浠诲姟鐨勫叆搴撶珯鐐� - 浠诲姟缂栫爜锛歿}锛屽師绔欑偣锛歿}锛屾柊绔欑偣锛歿}",
-                            existingInTask.getTaskCode(), existingInTask.getOrgSite(), param.getSourceStaNo());
-                    existingInTask.setOrgSite(param.getSourceStaNo());
-                    if (!taskService.updateById(existingInTask)) {
-                        log.warn("鏇存柊鍏ュ簱浠诲姟鐨勫叆搴撶珯鐐瑰け璐� - 浠诲姟缂栫爜锛歿}", existingInTask.getTaskCode());
-                    }
+            // 鏇存柊鍏ュ簱绔欑偣淇℃伅锛堝鏋滀笌褰撳墠鐢宠鐨勭珯鐐逛笉鍚岋級
+            if (StringUtils.isNotBlank(param.getSourceStaNo()) &&
+                    !param.getSourceStaNo().equals(existingInTask.getOrgSite())) {
+                log.info("鏇存柊鍏ュ簱浠诲姟鐨勫叆搴撶珯鐐� - 浠诲姟缂栫爜锛歿}锛屽師绔欑偣锛歿}锛屾柊绔欑偣锛歿}",
+                        existingInTask.getTaskCode(), existingInTask.getOrgSite(), param.getSourceStaNo());
+                existingInTask.setOrgSite(param.getSourceStaNo());
+                if (!taskService.updateById(existingInTask)) {
+                    log.warn("鏇存柊鍏ュ簱浠诲姟鐨勫叆搴撶珯鐐瑰け璐� - 浠诲姟缂栫爜锛歿}", existingInTask.getTaskCode());
                 }
-
-                // 杩斿洖鐜版湁鍏ュ簱浠诲姟鐨勪俊鎭�
-                InTaskMsgDto msgDto = new InTaskMsgDto();
-                msgDto.setWorkNo(existingInTask.getTaskCode());
-                msgDto.setTaskId(existingInTask.getId());
-                msgDto.setLocNo(existingInTask.getTargLoc());
-                msgDto.setSourceStaNo(existingInTask.getOrgSite());
-                msgDto.setStaNo(existingInTask.getTargSite());
-                return msgDto;
-            } else {
-                log.info("缁勬墭妗f病鏈変换鍔$紪鍙凤紝缁х画鍒涘缓鏂颁换鍔� - 绠卞彿锛歿}", param.getBarcode());
             }
-        } else {
-            log.info("鏈壘鍒板尮閰嶇殑鍏朵粬鍏ュ簱浠诲姟锛岀户缁垱寤烘柊浠诲姟 - 绠卞彿锛歿}", param.getBarcode());
+
+            // 鐩存帴杩斿洖宸叉湁浠诲姟淇℃伅锛屼笉鍐嶆柊寤轰换鍔�
+            InTaskMsgDto msgDto = new InTaskMsgDto();
+            msgDto.setWorkNo(existingInTask.getTaskCode());
+            msgDto.setTaskId(existingInTask.getId());
+            msgDto.setLocNo(existingInTask.getTargLoc());
+            msgDto.setSourceStaNo(existingInTask.getOrgSite());
+            msgDto.setStaNo(existingInTask.getTargSite());
+            return msgDto;
         }
+
+        log.info("鏈壘鍒拌鎵樼洏鍙峰凡鏈夊叆搴撲换鍔★紝缁х画鍒涘缓鏂颁换鍔� - 绠卞彿锛歿}", param.getBarcode());
 
         // 鐢熸垚浠诲姟缂栫爜
         String ruleCode = generateTaskCode();
@@ -439,6 +457,14 @@
         if (matnrConfig == null || StringUtils.isBlank(matnrConfig.getVal())) {
             return;
         }
+        // 浜屾纭锛氬凡鏈夎 barcode 鐨勭粍鎵樺垯鐩存帴杩斿洖锛岀敱澶栧眰澶嶇敤锛岄伩鍏嶉噸澶嶈姹傜敓鎴愬鏉″叆搴撳崟
+        WaitPakin existing = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+                .eq(WaitPakin::getBarcode, barcode)
+                .in(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val));
+        if (existing != null) {
+            log.info("[RCS鍏ュ簱鐢宠-鑷姩缁勬墭] barcode={} 宸叉湁缁勬墭锛岃烦杩囪嚜鍔ㄧ粍鎵�", barcode);
+            return;
+        }
         Config qtyConfig = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_PAKIN_QTY));
         double autoQty = 1.0;
         if (qtyConfig != null && StringUtils.isNotBlank(qtyConfig.getVal())) {
@@ -470,13 +496,15 @@
             waitPakin = mobileService.mergeItems(param, 1L);
         } catch (Exception e) {
             log.warn("[RCS鍏ュ簱鐢宠-鑷姩缁勬墭] 缁勬墭澶辫触, barcode={}: {}", barcode, e.getMessage());
-            return;
+            throw new CoolException("barcode=" + barcode + ": " + e.getMessage());
         }
         String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, null);
         if (StringUtils.isBlank(ruleCode)) {
             log.warn("[RCS鍏ュ簱鐢宠-鑷姩缁勬墭] 鍏ュ簱鍗曠紪鐮佽鍒欐湭閰嶇疆");
             return;
         }
+//        val orderWorkTypeOtherIn = OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type;
+        //                .setWkType(orderWorkTypeOtherIn)
         WkOrder order = new WkOrder();
         order.setCode(ruleCode)
                 .setType(OrderType.ORDER_IN.type)
@@ -558,10 +586,18 @@
      */
     private Task createTask(String ruleCode, String targetLoc, String barcode,
                             String targetSite, String sourceSiteNo, Long loginUserId) {
+        return createTask(ruleCode, targetLoc, barcode, targetSite, sourceSiteNo, loginUserId, TaskType.TASK_TYPE_IN.type);
+    }
+
+    /**
+     * 鍒涘缓骞朵繚瀛樹换鍔★紙鏀寔鎸囧畾浠诲姟绫诲瀷锛屽绌烘澘鍏ュ簱锛�
+     */
+    private Task createTask(String ruleCode, String targetLoc, String barcode,
+                            String targetSite, String sourceSiteNo, Long loginUserId, Integer taskType) {
         Task task = new Task();
         task.setTaskCode(ruleCode)
                 .setTaskStatus(TaskStsType.GENERATE_IN.id)
-                .setTaskType(TaskType.TASK_TYPE_IN.type)
+                .setTaskType(taskType != null ? taskType : TaskType.TASK_TYPE_IN.type)
                 .setWarehType(WarehType.WAREHOUSE_TYPE_CRN.val)
                 .setTargLoc(targetLoc)
                 .setBarcode(barcode)
@@ -587,6 +623,75 @@
         if (!updated) {
             throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
         }
+    }
+
+    /**
+     * 绌烘澘鍏ュ簱锛氫笌闈炵┖鏉垮悓涓�娴佺▼锛堟牎楠岀珯鐐广�佸垎閰嶅簱浣嶃�佸缓浠诲姟銆佹洿鏂板簱浣嶏級锛屼粎涓嶆牎楠岀粍鎵樸�佷笉鍐欎换鍔℃槑缁嗐�佷笉鏇存柊缁勬墭鐘舵�併��
+     * 鐢� createInTask 鍦� ioType=绌烘澘鏃惰皟鐢紱闇�鍦ㄨ澶囩珯鐐逛腑閰嶇疆 type=10锛堢┖鏉垮叆搴擄級鐨勭珯鐐硅矾寰勩��
+     */
+    private InTaskMsgDto createInTaskForEmptyPallet(String barcode, String staNo, Integer type) {
+        TaskInParam param = new TaskInParam();
+        param.setBarcode(barcode);
+        param.setSourceStaNo(staNo);
+        param.setLocType1(type != null ? type : 1);
+        param.setIoType(TaskType.TASK_TYPE_EMPITY_IN.type);
+        param.setUser(1L);
+
+        // 鏍¢獙璁惧绔欑偣锛堥渶閰嶇疆 type=10 绌烘澘鍏ュ簱鐨勭珯鐐癸級
+        DeviceSite deviceSite = validateDeviceSite(param);
+
+        // 妫�鏌ヨ鎵樼洏鍙锋槸鍚﹀凡鏈夌┖鏉垮叆搴撲换鍔★紝鏈夊垯澶嶇敤
+        Task existingInTask = taskService.getOne(new LambdaQueryWrapper<Task>()
+                .eq(Task::getBarcode, barcode)
+                .eq(Task::getTaskType, TaskType.TASK_TYPE_EMPITY_IN.type)
+                .orderByDesc(Task::getCreateTime)
+                .last("LIMIT 1"));
+        if (existingInTask != null) {
+            log.info("鎵惧埌璇ユ墭鐩樺彿宸叉湁绌烘澘鍏ュ簱浠诲姟锛屽鐢� - 浠诲姟缂栫爜锛歿}锛岀鍙凤細{}", existingInTask.getTaskCode(), barcode);
+            if (StringUtils.isNotBlank(staNo) && !staNo.equals(existingInTask.getOrgSite())) {
+                existingInTask.setOrgSite(staNo);
+                taskService.updateById(existingInTask);
+            }
+            InTaskMsgDto msgDto = new InTaskMsgDto();
+            msgDto.setWorkNo(existingInTask.getTaskCode());
+            msgDto.setTaskId(existingInTask.getId());
+            msgDto.setLocNo(existingInTask.getTargLoc());
+            msgDto.setSourceStaNo(existingInTask.getOrgSite());
+            msgDto.setStaNo(existingInTask.getTargSite());
+            return msgDto;
+        }
+
+        // 璇ユ墭鐩樺凡鍦ㄥ簱鎴栧嚭搴撲腑锛屼笉鍙噸澶嶇敵璇风┖鏉垮叆搴�
+        List<Loc> inStock = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, barcode));
+        if (!inStock.isEmpty()) {
+            throw new CoolException("barcode=" + barcode + ": 璇ユ墭鐩樺凡鍦ㄥ簱锛屼笉鍙噸澶嶇敵璇峰叆搴�");
+        }
+        Task outboundTask = taskService.getOne(new LambdaQueryWrapper<Task>()
+                .eq(Task::getBarcode, barcode)
+                .in(Task::getTaskType, Arrays.asList(TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_OUT.type,
+                        TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type))
+                .lt(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id));
+        if (outboundTask != null) {
+            throw new CoolException("barcode=" + barcode + ": 璇ユ墭鐩樺嚭搴撲腑鏈畬鎴愶紝涓嶅彲鐢宠鍏ュ簱");
+        }
+
+        InTaskMsgDto locNo;
+        try {
+            locNo = getLocNo(param);
+        } catch (Exception e) {
+            throw new CoolException("鑾峰彇绌烘澘鍏ュ簱搴撲綅澶辫触锛�" + e.getMessage());
+        }
+        if (locNo == null || StringUtils.isBlank(locNo.getLocNo())) {
+            throw new CoolException("鏈壘鍒板彲鐢ㄧ殑绌哄簱浣嶏紝璇锋鏌ュ簱鍖轰笌璁惧绔欑偣閰嶇疆锛堢┖鏉垮叆搴撻渶閰嶇疆 type=10 鐨勭珯鐐癸級");
+        }
+        String ruleCode = generateTaskCode();
+        String targetSite = StringUtils.isNotBlank(deviceSite.getDeviceSite()) ? deviceSite.getDeviceSite() : staNo;
+        Task task = createTask(ruleCode, locNo.getLocNo(), barcode, targetSite, staNo, param.getUser(), TaskType.TASK_TYPE_EMPITY_IN.type);
+        updateLocStatus(task.getTargLoc(), barcode);
+        locNo.setWorkNo(ruleCode);
+        locNo.setTaskId(task.getId());
+        log.info("[绌烘澘鍏ュ簱] 宸插垱寤轰换鍔�: {}, 搴撲綅: {}, 鏂欑: {}", ruleCode, locNo.getLocNo(), barcode);
+        return locNo;
     }
 
     /**
@@ -1456,30 +1561,18 @@
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R allocateLocation(String barcode, String staNo, Integer type) {
+    public R allocateLocation(String barcode, String staNo, Integer type, Boolean full) {
         log.info("========== 寮�濮嬬敵璇峰叆搴撲换鍔★紝鍒嗛厤搴撲綅 ==========");
-        log.info("鏂欑鐮侊細{}锛屽叆搴撶珯鐐癸細{}锛屽叆搴撶被鍨嬶細{}", barcode, staNo, type);
+        log.info("鏂欑鐮侊細{}锛屽叆搴撶珯鐐癸細{}锛屽叆搴撶被鍨嬶細{}锛岀┖鏉匡細{}", barcode, staNo, type, full);
 
-        // 鏋勫缓 TaskInParam 鍙傛暟锛屼笌 /wcs/create/in/task 鎺ュ彛鍙傛暟涓�鑷�
+        // 缁熶竴璧� createInTask锛氱┖鏉�(full=true)浠呬笉鏍¢獙缁勬墭锛屼粛鏍¢獙绔欑偣銆佸垎閰嶅簱浣嶃�佸缓浠诲姟锛涢潪绌烘澘闇�缁勬墭
         TaskInParam param = new TaskInParam();
         param.setBarcode(barcode);
         param.setSourceStaNo(staNo);
-        param.setIoType(TaskType.TASK_TYPE_IN.type); // 鍏ュ簱绫诲瀷
-        param.setLocType1(type); // 搴撲綅绫诲瀷锛堥珮浣庢娴嬩俊鍙凤級
-        param.setUser(1L); // 榛樿鐢ㄦ埛ID锛屽彲浠ユ牴鎹疄闄呴渶姹傝皟鏁�
+        param.setLocType1(type != null ? type : 1);
+        param.setUser(1L);
+        param.setIoType(Boolean.TRUE.equals(full) ? TaskType.TASK_TYPE_EMPITY_IN.type : TaskType.TASK_TYPE_IN.type);
 
-        // 璋冪敤 createInTask 鏂规硶锛屽垱寤哄畬鏁寸殑鍏ュ簱浠诲姟
-        // 璇ユ柟娉曚細鎵ц浠ヤ笅娴佺▼锛�
-        // 1. 楠岃瘉璁惧绔欑偣
-        // 2. 楠岃瘉缁勬嫋鐘舵��
-        // 3. 妫�鏌ユ槸鍚︽湁鍖归厤鐨勫叆搴撲换鍔★紙鎷f枡/鐩樼偣鍏ュ簱浼氬尮閰嶇姸鎬�199骞舵洿鏂颁负2锛�
-        // 4. 鐢熸垚浠诲姟缂栫爜锛堝鏋滈渶瑕佸垱寤烘柊浠诲姟锛�
-        // 5. 鑾峰彇搴撲綅鍙�
-        // 6. 鍒涘缓骞朵繚瀛樹换鍔★紙濡傛灉闇�瑕佸垱寤烘柊浠诲姟锛�
-        // 7. 鏇存柊搴撲綅鐘舵��
-        // 8. 鑾峰彇骞堕獙璇佺粍鎷栨槑缁�
-        // 9. 鍒涘缓骞朵繚瀛樹换鍔℃槑缁�
-        // 10. 鏇存柊缁勬墭鐘舵��
         InTaskMsgDto msgDto = createInTask(param);
 
         // 鏌ヨ浠诲姟褰撳墠鐘舵��

--
Gitblit v1.9.1