Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java

@@ -529,6 +529,12 @@ public class BackApplyInfoController extends BaseController {
         return backApplyInfoService.uploadSort(bean);
     }
 
+    @ApiOperation(value = "删除装卸单")
+    @PostMapping("/delHandlingOrder")
+    public AjaxResult delHandlingOrder(@RequestBody HandlingOrder bean) {
+        return backApplyInfoService.delHandlingOrder(bean);
+    }
+
 
 
     /**  -------装卸单结束-------  */

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/mapper/BackApplyInfoMapper.java

@@ -500,4 +500,11 @@ public interface BackApplyInfoMapper {
      * @return
      */
     List<SltAgreementInfo> getClzUserList(BackApplyInfo applyInfo);
+
+    /**
+     * 删除装卸单
+     * @param bean
+     * @return
+     */
+    int delHandlingOrder(HandlingOrder bean);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/IBackApplyInfoService.java

@@ -235,5 +235,12 @@ public interface IBackApplyInfoService {
      * @return
      */
     AjaxResult submitBzBackApply(BackApplyInfo backApplyInfo);
+
+    /**
+     * 删除装卸单
+     * @param bean
+     * @return
+     */
+    AjaxResult delHandlingOrder(HandlingOrder bean);
 }
 

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java

@@ -2262,6 +2262,22 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
         return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg());
     }
 
+    @Override
+    public AjaxResult delHandlingOrder(HandlingOrder bean) {
+        try {
+            int res = backApplyInfoMapper.delHandlingOrder(bean);
+            if (res > 0){
+                return AjaxResult.success("删除成功");
+            } else {
+                return AjaxResult.error("删除失败");
+            }
+
+        } catch (Exception e) {
+            log.error("系统错误, " + e.getMessage());
+            return AjaxResult.error("删除失败");
+        }
+    }
+
     /**
      * 处理班组退料结算协议
      * @param record

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmConfigController.java

@@ -42,7 +42,7 @@ public class BmConfigController extends BaseController
      * 查询功能参数配置列表
      */
     @ApiOperation(value = "查询功能参数配置列表")
-    @RequiresPermissions("basic:config:list")
+    //@RequiresPermissions("basic:config:list")
     @GetMapping("/list")
     public TableDataInfo list(BmConfig bmConfig)
     {

bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml

@@ -841,6 +841,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from back_apply_details where parent_id = #{parentId} and type_id = #{typeId}
     </delete>
 
+    <update id="delHandlingOrder">
+        update bm_handling_order set is_active = '0' where id = #{id}
+    </update>
+
     <!--   设置审批人为默认的李勇 防止代码冲突-->
     <select id="getDirectAuditBy"  resultType="Long">
         select
@@ -1093,7 +1097,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bho.type like concat('%',#{keyWord},'%')
             )
         </if>
-        ORDER BY bho.update_time desc,bho.sort desc
+        ORDER BY CASE WHEN bho.sort IS NULL THEN 0 ELSE 1 END,bho.update_time desc,bho.sort desc,bho.reserve_date desc
     </select>
     <select id="selectSort" resultType="java.lang.Integer">
         SELECT count(*)

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml

@@ -1052,6 +1052,8 @@
         WHERE
             is_ds='1' and back_id = #{backId}
         GROUP BY task_id
+        ORDER BY create_time
+        LIMIT 1
     </select>
 
     <update id="updateRepairedAndScrapNum">