From aee6b945f2249c37fd52a8697526ae8bd4915ef8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 四月 2025 13:45:06 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java        |    2 +-
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java |   27 ++++++++++++++++++++-------
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java                   |   11 +++++++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java           |   13 +++++++++++++
 4 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 0e9be0e..a9fae5a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -10,10 +10,13 @@
 import com.vincent.rsf.server.common.domain.KeyValVo;
 import com.vincent.rsf.server.common.domain.PageParam;
 import com.vincent.rsf.server.manager.entity.Task;
+import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.vincent.rsf.server.manager.service.TaskItemService;
 import com.vincent.rsf.server.manager.service.TaskService;
 import com.vincent.rsf.server.system.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -24,6 +27,9 @@
 
     @Autowired
     private TaskService taskService;
+
+    @Autowired
+    private TaskItemService taskItemService;
 
     @PreAuthorize("hasAuthority('manager:task:list')")
     @PostMapping("/task/page")
@@ -80,10 +86,17 @@
     @PreAuthorize("hasAuthority('manager:task:remove')")
     @OperationLog("Delete 浠诲姟宸ヤ綔妗�")
     @PostMapping("/task/remove/{ids}")
+    @Transactional(rollbackFor = Exception.class)
     public R remove(@PathVariable Long[] ids) {
+        if (Objects.isNull(ids) || ids.length < 1) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
         if (!taskService.removeByIds(Arrays.asList(ids))) {
             return R.error("Delete Fail");
         }
+        if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, ids))) {
+            return R.error("鍒犻櫎澶辫触锛侊紒");
+        }
         return R.ok("Delete Success").add(ids);
     }
 
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
index 8a811bc..3286105 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyInspect.java
@@ -174,6 +174,17 @@
 //            null    // 澶囨敞
 //    );
 
+    public String getwkType$() {
+        if (null == this.wkType) {return  null;}
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
+                .eq(DictData::getValue, this.wkType));
+        if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+            return null;
+        }
+        return dictDatas.getLabel();
+    }
 
     public String getIsptStatus$() {
         if (null == this.isptStatus) {return  null;}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index ac33377..84f0eda 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -43,11 +43,23 @@
         List<QlyIsptItem> isptItem =  params.getIsptItem();
         List<Long> list = isptItem.stream().map(QlyIsptItem::getId).collect(Collectors.toList());
         if (params.getType().equals("2") || params.getType().equals("1")) {
-            if (!this.update(new LambdaUpdateWrapper<QlyIsptItem>()
-                    .set(QlyIsptItem::getIsptResult, params.getType())
-                    .in(QlyIsptItem::getId, list))) {
-                throw new CoolException("淇敼澶辫触锛侊紒");
-            }
+            isptItem.forEach(item -> {
+                if (params.getType().equals("1")) {
+                    //TODO 鍏堟崱鍚庢敹涓洪�佽揣鏁伴噺锛屽厛鏀跺悗鎹′负鏀惰揣鏁伴噺
+                    item.setSafeQty(item.getDlyQty());
+                    item.setDisQty(0.0);
+                } else {
+                    item.setSafeQty(0.0);
+                    item.setDisQty(item.getDlyQty());
+                }
+                if (!this.update(new LambdaUpdateWrapper<QlyIsptItem>()
+                        .set(QlyIsptItem::getSafeQty, item.getSafeQty())
+                        .set(QlyIsptItem::getIsptResult, params.getType())
+                        .set(QlyIsptItem::getDisQty, item.getDisQty())
+                        .in(QlyIsptItem::getId, item.getId()))) {
+                    throw new CoolException("淇敼澶辫触锛侊紒");
+                }
+            });
         } else {
             if (!this.updateBatchById(isptItem)) {
                 throw new CoolException("鏄庣粏淇敼澶辫触");
@@ -63,7 +75,7 @@
             QlyInspect inspect = qlyInspectService.getById(key);
             List<QlyIsptItem> items = listMap.get(key);
             Double safeQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum();
-            Double rcptQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum();
+            Double dlyQty = items.stream().mapToDouble(QlyIsptItem::getDlyQty).sum();
             Double disQty = items.stream().mapToDouble(QlyIsptItem::getDisQty).sum();
             Double qlyQty = safeQty + disQty;
             //瀹夊叏鏁伴噺锛岃川妫�鏁伴噺
@@ -72,7 +84,8 @@
             if (Double.compare(disQty, 0) > 0) {
                 inspect.setIsptResult(Short.parseShort("4"));
             }
-            if (Double.compare(safeQty, rcptQty) == 0) {
+            if (Double.compare(safeQty, dlyQty) == 0) {
+                inspect.setIsptStatus("1");
                 inspect.setIsptResult(Short.parseShort("1"));
             }
             if (!qlyInspectService.updateById(inspect)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 3940127..30fee00 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -70,7 +70,7 @@
             Task task = new Task();
             task.setTaskCode(ruleCode)
                     .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
-                    .setTaskStatus(TaskType.TASK_TYPE_IN.type.shortValue())
+                    .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
                     .setTargLoc(LocManageUtil.getTargetLoc())
                     .setBarcode(pakin.getBarcode())
                     .setTargSite(LocManageUtil.getTargetSite());

--
Gitblit v1.9.1