From b4c5bbd7af3cceab831494f54561c30e362b5411 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Mon, 25 Dec 2023 10:15:38 +0800 Subject: [PATCH 1/2] =?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 --- .../com/bonus/sgzb/app/controller/BackReceiveController.java | 2 +- .../bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 540361d8..2f51515d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -20,7 +20,7 @@ import java.util.Date; import java.util.List; /** - * 退料接收 + * 退料接收-app * @author bns_han */ @RestController 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 c3b2d1eb..e4fd2569 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 @@ -95,7 +95,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { //修改任务状态 res= updateTaskStatus(taskId,40); if(res == 0) { - throw new RuntimeException("插入back_check_details异常"); + throw new RuntimeException("tm_task修改状态"); } //更加退料接收的数据创建下一步流程 //合格的插入入库记录input_apply_details，修改库存ma_type,修改机具状态 @@ -210,6 +210,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { for(BackApplyInfo bi : hgList){ Integer maId = bi.getMaId(); if(maId == null){ + res=1; }else{ res = backReceiveMapper.updateMaStatus(maId,"15"); } From 001761c7777cadee55e9e33f34e3f02e6f2b122c Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Mon, 25 Dec 2023 10:21:58 +0800 Subject: [PATCH 2/2] =?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 --- .../main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java | 2 +- .../src/main/resources/mapper/material/BackApplyMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java index c3f6a08f..0297bb19 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java @@ -18,7 +18,7 @@ public class TypeTreeNode { private String num; - private String unitName; + private String unitNames; @JsonInclude(JsonInclude.Include.NON_EMPTY) private String level; 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 68a2f6d1..6a60a553 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 @@ -483,7 +483,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ma_type JOIN cte ON ma_type.type_id = cte.parent_id ) - SELECT type_id as typeId, parent_id as parentId,type_name as typeName,num,`level`,unit_name as unitName + SELECT type_id as typeId, parent_id as parentId,type_name as typeName,num,`level`,unit_name as unitNames FROM cte WHERE 1=1