From 57130c255931018fa7daf843bb973713193ef6ec Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Fri, 26 Jan 2024 11:27:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackReceiveController.java | 23 ++++ .../bonus/sgzb/app/domain/BackApplyInfo.java | 1 + .../sgzb/app/domain/GlobalConstants.java | 36 +++-- .../sgzb/app/mapper/BackReceiveMapper.java | 130 ++++++++++++++++-- .../sgzb/app/service/BackApplyService.java | 81 +++++++++-- .../sgzb/app/service/BackReceiveService.java | 60 ++++++++ .../service/impl/BackReceiveServiceImpl.java | 57 ++++++-- .../mapper/app/BackApplyAppMapper.xml | 2 - .../mapper/app/BackReceiveMapper.xml | 19 +-- .../mapper/base/MaMachineTypeMapper.xml | 3 +- .../controller/BackApplyController.java | 12 +- .../sgzb/material/mapper/BackApplyMapper.java | 73 +++++++++- .../material/service/BackApplyService.java | 70 ++++++++-- .../mapper/material/BackApplyMapper.xml | 5 +- 14 files changed, 499 insertions(+), 73 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 7748f3b5..d7a430ed 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 @@ -102,6 +102,29 @@ public class BackReceiveController extends BaseController { } } + /** + * 退料接收-rfid退料 + * + * @param record 查询条件 + * @return AjaxResult对象 + */ + @Log(title = "退料接收-rfid退料", businessType = BusinessType.INSERT) + @PostMapping("setRfidCodeBack") + public AjaxResult setRfidCodeBack(@RequestBody BackApplyInfo record) { + try { + int res =backReceiveService.setRfidCodeBack(record); + if (res>0){ + return AjaxResult.success("接收成功"); + }else if (res==-1){ + return AjaxResult.error("该RFID编码已接收"); + }else { + return AjaxResult.error("接收失败"); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + @Log(title = "退料接收-结束任务", businessType = BusinessType.INSERT) @PostMapping("endBack") public AjaxResult endBack(@RequestBody BackApplyInfo record) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index 7c907c63..092a459d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -7,6 +7,7 @@ import java.util.List; /** * 退料 + * @author bns_han */ @Data public class BackApplyInfo { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java index 83ab6322..2a3e0b33 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java @@ -1,14 +1,30 @@ package com.bonus.sgzb.app.domain; public class GlobalConstants { - /** 9 */ - public static final int NINE=9; - /** 100 */ - public static final int ONE_HUNDRED=100; - /** 1000 */ - public static final int ONE_THOUSAND=1000; - /** 99 */ - public static final int NINETY_NINE=99; - /** 41 */ - public static final int FORTY_ONE=41; + /** + * 9 + */ + public static final int NINE = 9; + /** + * 41 + */ + public static final int FORTY_ONE = 41; + /** + * 57 + */ + public static final int FIFTY_SEVEN = 57; + /** + * 99 + */ + public static final int NINETY_NINE = 99; + /** + * 100 + */ + public static final int ONE_HUNDRED = 100; + /** + * 1000 + */ + public static final int ONE_THOUSAND = 1000; + + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index e4c7a93a..1da4567a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -8,54 +8,164 @@ import java.util.Date; import java.util.List; +/** + * @author bns_han + */ @Mapper public interface BackReceiveMapper { + /** + * 退料接收列表 + * + * @param record 查询条件 + * @return List + */ List getbackReceiveList(BackApplyInfo record); + /** + * 退料接收明细 + * + * @param record 查询条件 + * @return List + */ List receiveView(BackApplyInfo record); /** - * 添加退料合格数量 - */ - int setCheckDetails(BackApplyInfo record); - + * 添加接收数据back_check_details + * @param record + * @return int + */ int insertCheckDetails(BackApplyInfo record); + /** + * 查询编号 + * @param date + * @param taskType + * @return int + */ int selectTaskNumByMonthWx(@Param("date") Date date, @Param("taskType") Integer taskType); + /** + * 添加维修任务 + * @param bean + * @return int + */ int addWxTask(BackApplyInfo bean); + /** + * 添加维修协议 + * @param bean + * @return int + */ int addWxTaskAgreement(BackApplyInfo bean); + /** + * 更新任务状态 + * @param taskId + * @param status + * @return int + */ int updateTaskStatus(@Param("taskId") int taskId, @Param("status") int status); + /** + * 更新ma_machine + * @param maId + * @param maStatus + * @return int + */ int updateMaStatus(@Param("maId") int maId,@Param("maStatus") String maStatus); + /** + * getHgList + * @param record + * @return List + */ List getHgList(BackApplyInfo record); - int insertIAD(BackApplyInfo bi); + /** + * 插入input_apply_details + * @param bi + * @return int + */ + int insertIad(BackApplyInfo bi); - int updateMT(BackApplyInfo bi); + /** + * 修改ma_type库存 + * @param bi + * @return int + */ + int updateMt(BackApplyInfo bi); + /** + * 查询 + * @param record + * @return List + */ List getWxList(BackApplyInfo record); - int insertTT(BackApplyInfo bean); + /** + * tm_task + * @param bean + * @return int + */ + int insertTt(BackApplyInfo bean); - int insertRAD(BackApplyInfo wx); + /** + * repair_apply_details + * @param wx + * @return int + */ + int insertRad(BackApplyInfo wx); - int insertTTA(@Param("taskId") int taskId,@Param("agreementId") String agreementId); + /** + * tm_task_agreement + * @param taskId + * @param agreementId + * @return int + */ + int insertTta(@Param("taskId") int taskId,@Param("agreementId") String agreementId); + /** + * 查询 + * @param record + * @return List + */ List getBfList(BackApplyInfo record); - int insertSAD(BackApplyInfo bf); + /** + * 插入scrap_apply_details + * @param bf + * @return int + */ + int insertSad(BackApplyInfo bf); + /** + * 编码查询 + * @param record + * @return List + */ List codeQuery(BackApplyInfo record); + /** + * 二维码查询 + * @param record + * @return List + */ List qrcodeQuery(BackApplyInfo record); + /** + * 退料接收记录 + * @param record + * @return List + */ List backReceiveRecord(BackApplyInfo record); + /** + * 查询 + * @param maId + * @param taskId + * @return int + */ int selectCodeByMaIdAndTaskId(@Param("maId") Integer maId,@Param("taskId") Integer taskId); /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java index 71980f6a..e2b5275a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java @@ -6,45 +6,110 @@ import com.bonus.sgzb.app.domain.TmTask; import java.util.List; +/** + * @author bns_han + */ public interface BackApplyService { /** - * 查询退料单位列表 - */ + * 查询退料单位列表 + * @param record + * @return List + */ List getbackUnit(BmAgreementInfo record); /** - * 查询退料工程列表 - */ + * 查询退料工程列表 + * @param record + * @return List + */ List getbackPro(BmAgreementInfo record); /** - * 创建任务单 - */ + * 创建任务单 + * @param task + * @return int + */ int insertTask(TmTask task); /** - * 退料申请列表 - */ + * 退料申请列表 + * @param record + * @return List + */ List getbackList(BackApplyInfo record); + /** + * 任务协议表(tm_task_agreement) + * @param task + * @return int + */ int insertTaskAgreement(TmTask task); + /** + * 退料任务表(back_apply_info) + * @param task + * @return int + */ int insertBackApply(TmTask task); + /** + * 获取物料列表 + * + * @param record 查询条件 + * @return List + */ List materialList(BackApplyInfo record); + /** + * 提交物料型号及数量 + * + * @param record 查询条件 + * @return int + */ int upload(BackApplyInfo record); + /** + * 详情查看 + * @param record + * @return List + */ List view(BackApplyInfo record); + /** + * 删除 + * @param record + * @return int + */ int del(BackApplyInfo record); + /** + * 退料审核列表 + * + * @param record 查询条件 + * @return List + */ List examineList(BackApplyInfo record); + /** + * 退料审核明细 + * + * @param record 查询条件 + * @return List + */ List examineView(BackApplyInfo record); + /** + * 退料审核通过 + * @param record + * @return int + */ int audit(BackApplyInfo record); + /** + * 退料审核驳回 + * @param record + * @return int + */ int refuse(BackApplyInfo record); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java index ed6157af..29c68c56 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java @@ -4,22 +4,74 @@ import com.bonus.sgzb.app.domain.BackApplyInfo; import java.util.List; +/** + * @author bns_han + */ public interface BackReceiveService { + /** + * 退料接收列表 + * + * @param record 查询条件 + * @return AjaxResult对象 + */ List getbackReceiveList(BackApplyInfo record); + /** + * 退料接收明细 + * + * @param record 查询条件 + * @return AjaxResult对象 + */ List receiveView(BackApplyInfo record); + /** + * 数量退料--管理方式为1的 + * + * @param record 查询条件 + * @return AjaxResult对象 + */ int setNumBack(BackApplyInfo record); + /** + * 编码退料--管理方式为0的 + * + * @param record 查询条件 + * @return AjaxResult对象 + */ int setCodeBack(BackApplyInfo record); + /** + * 退料接收-结束任务 + * + * @param record 查询条件 + * @return int + */ int endBack(BackApplyInfo record); + /** + * 退料接收-编号查询 + * + * @param record 查询条件 + * @return List + */ List codeQuery(BackApplyInfo record); + + /** + * 退料接收-二维码查询 + * + * @param record 查询条件 + * @return List + */ List qrcodeQuery(BackApplyInfo record); + /** + * 退料接收记录 + * + * @param record 查询条件 + * @return List + */ List backReceiveRecord(BackApplyInfo record); /** @@ -28,4 +80,12 @@ public interface BackReceiveService { * @return List */ List rfidCodeQuery(BackApplyInfo record); + + /** + * 退料接收-rfid退料 + * + * @param record 查询条件 + * @return int + */ + int setRfidCodeBack(BackApplyInfo record); } 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 025839c8..02f041e2 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 @@ -174,12 +174,47 @@ public class BackReceiveServiceImpl implements BackReceiveService { return backReceiveMapper.rfidCodeQuery(record); } + @Override + public int setRfidCodeBack(BackApplyInfo record) { + int res=0; + try{ + BackApplyInfo[] arr = record.getArr(); + if (arr.length>0){ + for (int i=0;i< arr.length;i++){ + //根据maId和taskId查询是否已接收 + int re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(),record.getTaskId()); + if (re>0){ + res=-1; + break; + } + } + if (res==-1){ + return res; + } + } + int taskId = record.getTaskId(); + //修改任务状态 + res= updateTaskStatus(taskId,39); + if(res == 0) { + throw new RuntimeException("插入back_check_details异常"); + } + //插入back_check_details + res = insertBcd(record); + if(res == 0) { + throw new RuntimeException("插入back_check_details异常"); + } + }catch (Exception e){ + throw new RuntimeException(e.getMessage()); + } + return res; + } + private int insertRad(int taskId, List wxList) { int result = 0; if(wxList !=null){ for( BackApplyInfo wx : wxList ){ wx.setTaskId(taskId); - result = backReceiveMapper.insertRAD(wx); + result = backReceiveMapper.insertRad(wx); } } return result; @@ -190,7 +225,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { if(list !=null){ for( BackApplyInfo bf : list ){ bf.setTaskId(taskId); - result = backReceiveMapper.insertSAD(bf); + result = backReceiveMapper.insertSad(bf); } } return result; @@ -199,7 +234,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { private int insertTta(int taskId, List list) { int res; String agreementId = list.get(0).getAgreementId(); - res = backReceiveMapper.insertTTA(taskId,agreementId); + res = backReceiveMapper.insertTta(taskId,agreementId); return res; } @@ -213,14 +248,14 @@ public class BackReceiveServiceImpl implements BackReceiveService { if(GlobalConstants.FORTY_ONE == taskType){ taskStatus = "43"; } - if(57 == taskType){ + if(GlobalConstants.FIFTY_SEVEN == taskType){ taskStatus = "58"; } applyInfo.setTaskStatus(taskStatus); applyInfo.setCode(code); //创建人 applyInfo.setCreateBy(createBy); - newTask = backReceiveMapper.insertTT(applyInfo); + newTask = backReceiveMapper.insertTt(applyInfo); if (newTask>0 && applyInfo.getTaskId()>0){ newTask=applyInfo.getTaskId(); } @@ -247,7 +282,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { int res =0; if(hgList!=null && hgList.size()>0){ for(BackApplyInfo bi : hgList){ - res = backReceiveMapper.updateMT(bi); + res = backReceiveMapper.updateMt(bi); } } return res; @@ -257,7 +292,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { int res =0; if(hgList!=null && hgList.size()>0){ for(BackApplyInfo bi : hgList){ - res = backReceiveMapper.insertIAD(bi); + res = backReceiveMapper.insertIad(bi); } } return res; @@ -301,15 +336,15 @@ public class BackReceiveServiceImpl implements BackReceiveService { String format = dateFormat.format(nowDate); int taskNum = backReceiveMapper.selectTaskNumByMonthWx(nowDate,taskType) + 1; String code=""; - if(41 == taskType){ + if(GlobalConstants.FORTY_ONE == taskType){ code = "WX"; } - if(57 == taskType){ + if(GlobalConstants.FIFTY_SEVEN == taskType){ code = "BF"; } - if (taskNum>9 && taskNum<100){ + if (taskNum>GlobalConstants.NINE && taskNum99 && taskNum<1000){ + }else if (taskNum>GlobalConstants.NINETY_NINE && taskNum0 select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.unit_name, m.manage_type, - m.lease_price, m.eff_time, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load, + m.lease_price,m.rent_price, m.eff_time, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load, m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl, mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId, su.user_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time, 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 e87b5a93..39673a66 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 @@ -143,9 +143,12 @@ public class BackApplyController extends BaseController { if (CollUtil.isNotEmpty(leaseApplyDetailsList)) { // 对领料任务表的对象做数据处理 BackApplyInfo backApplyInfo = bean.getBackApplyInfo(); - backApplyInfo.setCode(code); // 创建领料单号 - backApplyInfo.setTaskId(taskId); // 设置任务ID - backApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 设置设备所属分公司,用于交给哪家审核 + // 创建领料单号 + backApplyInfo.setCode(code); + // 设置任务ID + backApplyInfo.setTaskId(taskId); + // 设置设备所属分公司,用于交给哪家审核 + backApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 创建领料任务，返回领料任务编号 boolean addLeaseTaskResult = backApplyService.insertBackApply(backApplyInfo) > 0; @@ -155,7 +158,8 @@ public class BackApplyController extends BaseController { Long backApplyInfoId = backApplyInfo.getId(); if (StringUtils.isNotNull(backApplyInfoId)) { for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) { - leaseApplyDetails.setId(backApplyInfoId); // 设置领料任务ID + // 设置领料任务ID + leaseApplyDetails.setId(backApplyInfoId); // 插入领料任务明细 boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0; if (!addLeaseTaskDetailsResult) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java index 6fc7acfe..191059bc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java @@ -15,39 +15,100 @@ import java.util.List; @Mapper public interface BackApplyMapper { /** - * 获取退料审核列表 - */ + * 获取退料审核列表 + * @param bean + * @return List + */ List getBackApplyList(BackApplyInfo bean); /** - * 获取在用物料列表 - */ + * 获取在用物料列表 + * @param bean + * @return List + */ List getMaterialList(BackApplyInfo bean); + /** + * 查询 + * @param date + * @param taskType + * @return int + */ int selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType); + /** + * 创建任务 + * @param bean + * @return int + */ int insertTask(BackApplyInfo bean); + /** + * 添加协议 + * @param bean + * @return int + */ int insertTaskAgreement(BackApplyInfo bean); + /** + * 创建领料任务，返回领料任务编号 + * @param bean + * @return int + */ int insertBackApply(BackApplyInfo bean); + /** + * 插入领料任务明细 + * @param bean + * @return int + */ int upload(BackApplyInfo bean); + /** + * 详情 + * @param bean + * @return List + */ List getView(BackApplyInfo bean); + /** + * back_apply_details + * @param detailsId + * @param num + * @return int + */ int setModify(@Param("detailsId") String detailsId, @Param("num") String num); + /** + * del + * @param bean + * @return int + */ int del(BackApplyInfo bean); + /** + * tm_task + * @param bean + * @return int + */ int audit(BackApplyInfo bean); - + /** + * tm_task + * @param bean + * @return int + */ int refuse(BackApplyInfo bean); - + /** + * 查询 + * @param bean + * @return List + */ List getUseTypeTree(BackApplyInfo bean); /** * 退料申请导出 + * @param bean + * @return List */ List exportList(BackApplyInfo bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java index f0b8a771..248de79c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java @@ -13,37 +13,89 @@ import java.util.List; public interface BackApplyService { /** * 获取退料审核列表 + * @param bean + * @return List */ List getBackApplyList(BackApplyInfo bean); /** * 获取在用物料列表 + * @param bean + * @return List */ List getMaterialList(BackApplyInfo bean); + /** + * 生成退料编码 + * @param + * @return String + */ String genderBackCode(); + /** + * 创建任务 + * @param bean + * @return int + */ int insertSelective(BackApplyInfo bean); - + /** + * 添加协议 + * @param bean + * @return int + */ int insertTaskAgreement(BackApplyInfo bean); - + /** + * 创建领料任务，返回领料任务编号 + * @param bean + * @return int + */ int insertBackApply(BackApplyInfo bean); - + /** + * 插入领料任务明细 + * @param bean + * @return int + */ int upload(BackApplyInfo bean); - + /** + * 详情 + * @param bean + * @return List + */ List getView(BackApplyInfo bean); - + /** + * back_apply_details + * @param bean + * @return AjaxResult + */ AjaxResult setModify(BackApplyInfo bean); - + /** + * del + * @param bean + * @return AjaxResult + */ AjaxResult del(BackApplyInfo bean); - + /** + * tm_task + * @param record + * @return AjaxResult + */ AjaxResult audit(BackApplyInfo record); - + /** + * tm_task + * @param record + * @return AjaxResult + */ AjaxResult refuse(BackApplyInfo record); - + /** + * 查询 + * @param bean + * @return AjaxResult + */ AjaxResult getUseTypeTree(BackApplyInfo bean); /** * 退料申请导出 + * @param bean + * @return List */ List exportList(BackApplyInfo 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 3bee2718..df524f6d 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 @@ -504,9 +504,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY mt.type_id ) AS subquery2 ON subquery1.type_id = subquery2.type_id - WHERE - subquery1.out_num - COALESCE ( subquery2.audit_num, 0 )> 0) mt4 on mt4.typeId = mt.type_id - HAVING num> 0 + ) mt4 on mt4.typeId = mt.type_id + HAVING num is not null UNION ALL SELECT ma_type.type_id, ma_type.parent_id,ma_type.type_name as typeCode, ma_type.`level`,ma_type.unit_name,0 as num