Merge remote-tracking branch 'origin/dev' into dev

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

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");
                 }

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;

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