From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

---
 src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 8328226..5534011 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -3,8 +3,10 @@
 import com.core.exception.CoolException;
 import com.zy.asrs.domain.enums.TaskStatusType;
 import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.StaDesc;
 import com.zy.asrs.mapper.TaskWrkMapper;
 import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.service.StaDescService;
 import com.zy.asrs.service.TaskWrkService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.zy.common.service.CommonService;
@@ -13,16 +15,24 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
 
 @Service("taskWrkService")
 public class TaskWrkServiceImpl extends ServiceImpl<TaskWrkMapper, TaskWrk> implements TaskWrkService {
 
     @Autowired
     private CommonService commonService;
+    @Autowired
+    private StaDescService staDescService;
 
     @Override
     public TaskWrk selectByTaskNo(String taskNo) {
         return this.baseMapper.selectByTaskNo(taskNo);
+    }
+
+    @Override
+    public TaskWrk selectByStartPoint(String taskNo) {
+        return this.baseMapper.selectByStartPoint(taskNo);
     }
 
     @Override
@@ -31,11 +41,20 @@
     }
 
     @Override
+    public List<TaskWrk> selectReceive() {
+        return this.baseMapper.selectReceive();
+    }
+
+    @Override
     @Transactional
     public void distribute(String taskNo, Long userId) {
         TaskWrk taskWrk = this.selectByTaskNo(taskNo);
         if (taskWrk == null) {
             throw new CoolException("WMS浠诲姟涓嶅瓨鍦�");
+        }
+
+        if (taskWrk.getStatus() != 1) {
+            throw new CoolException("浠诲姟宸叉淳鍙�");
         }
 
         //鍒涘缓浠诲姟
@@ -54,11 +73,16 @@
     @Override
     public void startup(TaskWrk taskWrk, Long userId) {
         //鍏ュ簱浠诲姟娲惧彂
+        StaDesc staDesc = staDescService.queryCrn(taskWrk.getIoType(), Integer.parseInt(taskWrk.getStartPoint()));
+        if (staDesc == null) {
+            return;//涓嶅瓨鍦ㄨ矾寰�
+        }
         int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
         taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
         taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
         taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
         taskWrk.setWrkSts(2);//宸ヤ綔鐘舵�� 2.璁惧涓婅蛋
+        taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
         taskWrk.setModiTime(new Date());
         taskWrk.setModiUser(userId);
         updateById(taskWrk);
@@ -67,11 +91,16 @@
     @Override
     public void stockOut(TaskWrk taskWrk, Long userId) {
         //鍑哄簱浠诲姟娲惧彂
+        StaDesc staDesc = staDescService.queryCrn(taskWrk.getIoType(), Integer.parseInt(taskWrk.getTargetPoint()));
+        if (staDesc == null) {
+            return;//涓嶅瓨鍦ㄨ矾寰�
+        }
         int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍑哄簱宸ヤ綔鍙�
         taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
         taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
         taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
         taskWrk.setWrkSts(11);//宸ヤ綔鐘舵�� 11.鐢熸垚鍑哄簱ID
+        taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
         taskWrk.setModiTime(new Date());
         taskWrk.setModiUser(userId);
         updateById(taskWrk);
@@ -80,13 +109,28 @@
     @Override
     public void locMove(TaskWrk taskWrk, Long userId) {
         //搴撴牸绉昏浇浠诲姟娲惧彂
+        StaDesc staDesc = staDescService.queryCrn(taskWrk.getIoType(), Integer.parseInt(taskWrk.getTargetPoint()));
+        if (staDesc == null) {
+            return;//涓嶅瓨鍦ㄨ矾寰�
+        }
         int workNo = commonService.getWorkNo(WorkNoType.OTHER.type);//鑾峰彇宸ヤ綔鍙�
         taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
         taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
         taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
         taskWrk.setWrkSts(11);//宸ヤ綔鐘舵�� 11.鐢熸垚鍑哄簱ID
+        taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
         taskWrk.setModiTime(new Date());
         taskWrk.setModiUser(userId);
         updateById(taskWrk);
     }
+
+    @Override
+    public List<TaskWrk> selectToBeHistoryData() {
+        return this.baseMapper.selectToBeHistoryData();
+    }
+
+    @Override
+    public int saveToHistory(String taskNo) {
+        return this.baseMapper.saveToHistory(taskNo);
+    }
 }

--
Gitblit v1.9.1