From 1ac495d7ac036ad78453e418fe23446e68a49847 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Sun, 24 Dec 2023 16:48:38 +0800
Subject: [PATCH] =?UTF-8?q?app-=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/app/service/impl/BackReceiveServiceImpl.java  | 10 ++++++----
 .../main/resources/mapper/app/BackReceiveMapper.xml    |  1 +
 .../sgzb/material/controller/BackApplyController.java  |  2 +-
 .../main/resources/mapper/material/BackApplyMapper.xml |  1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
index c39be007..75f29647 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
@@ -67,6 +67,8 @@ public class BackReceiveServiceImpl implements BackReceiveService {
     public int setCodeBack(BackApplyInfo record) {
         int res = 0;
         try{
+            //todo 此处需要判断 接收数量是否大于退料数量或者查询待接收数量是否为0
+
             int taskId = record.getTaskId();
             //修改任务状态
             res= updateTaskStatus(taskId,39);
@@ -118,9 +120,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                 //插入任务表tm_task
                 int newTaskId = insertTT(wxList,41);
                 //插入协议任务表tm_task_agreement
-                 res = insertTTA(taskId,wxList);
+                 res = insertTTA(newTaskId,wxList);
                 //插入维修记录表repair_apply_details
-                res = insertRAD(taskId,wxList);
+                res = insertRAD(newTaskId,wxList);
             }
             //待报废的创建报废任务，插入任务协议表
 
@@ -129,9 +131,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                 //插入任务表tm_task
                 int newTaskId = insertTT(bfList,57);
                 //插入协议任务表tm_task_agreement
-                 res = insertTTA(taskId,bfList);
+                 res = insertTTA(newTaskId,bfList);
                 //插入维修记录表scrap_apply_details
-                 res = insertSAD(taskId,bfList);
+                 res = insertSAD(newTaskId,bfList);
             }
         }catch (Exception e){
             throw new RuntimeException(e.getMessage());
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index c385c441..bdf6106d 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -702,6 +702,7 @@
         LEFT JOIN sys_dic sd on mm.ma_status=sd.id
     WHERE
       ma_code LIKE concat('%', #{maCode}, '%')
+      and sd.id='16'
   </select>
 
   <select id="qrcodeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
index 08e98bf0..3ada4d93 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
@@ -93,7 +93,7 @@ public class BackApplyController extends BaseController {
 
 
 
-    @Log(title = "领料申请提交", businessType = BusinessType.INSERT)
+    @Log(title = "退料申请提交", businessType = BusinessType.INSERT)
     @PostMapping("/submitBackApply")
     public AjaxResult submitBackApply(@RequestBody BackApplyInfo bean) {
         if (StringUtils.isNull(bean)) {
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 447ab123..628a1856 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -307,7 +307,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
         WHERE
               1=1
-#             bai.company_id=#{companyId}
         <if test="keyWord != null  and keyWord != ''">
             and bai.`code` like concat('%', #{keyWord}, '%') or
             bai.back_person like concat('%', #{keyWord}, '%') or