From b7f2c3ba4c878fd59936a1593e21bb9a9b841a5c Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Wed, 24 Jan 2024 18:44:10 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/service/impl/TmTaskServiceImpl.java | 14 ++++++++++++++ .../src/main/resources/mapper/app/TmTaskMapper.xml | 2 ++ 2 files changed, 16 insertions(+) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 0cc16df3..11fc2495 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -340,6 +340,20 @@ public class TmTaskServiceImpl implements TmTaskService { List listLeaseDetails = new ArrayList<>(); for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { if (leaseApplyInfo != null) { + SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); + //获取当前用户所属公司id + Long companyId = sysUser.getCompanyId(); + //获取当前用户的角色 + Set roles = SecurityUtils.getLoginUser().getRoles(); + StringBuilder sb = new StringBuilder(); + for (String s : roles) { + sb.append(s); + } + String rolesStr = sb.toString(); + //如果是内部人员，加上所属公司 + if ((rolesStr.contains("jjfgs") && !rolesStr.contains("admin")) || (rolesStr.contains("tsfgs") && !rolesStr.contains("admin"))) { + leaseApplyInfo.setCompanyId(Integer.parseInt(companyId.toString())); + } // 去查询领料任务详情表 List leaseApplyDetails = tmTaskMapper.getLeaseApplyDetails(leaseApplyInfo); if (leaseApplyDetails != null && !leaseApplyDetails.isEmpty()) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index fbcd3d9e..32d793a2 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -603,6 +603,7 @@ direct_audit_by = #{record.companyAuditBy}, direct_audit_time = now(), direct_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, update_by = #{record.companyAuditBy}, @@ -640,6 +641,7 @@ direct_audit_by = #{record.companyAuditBy}, direct_audit_time = now(), direct_audit_remark = #{record.companyAuditRemark}, + status = #{record.status}, WHERE 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 2/8] =?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 From 008bbc2f28f9c74b85e64a8d471605dffa65fe28 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Fri, 26 Jan 2024 18:38:50 +0800 Subject: [PATCH 3/8] =?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 --- .../controller/LeaseOutDetailsController.java | 20 +++++++++++ .../sgzb/app/domain/LeaseApplyDetails.java | 12 +++++++ .../app/mapper/LeaseOutDetailsMapper.java | 9 +++++ .../app/service/LeaseOutDetailsService.java | 9 +++++ .../impl/LeaseOutDetailsServiceImpl.java | 6 ++++ .../mapper/app/LeaseOutDetailsMapper.xml | 34 +++++++++++++++++++ 6 files changed, 90 insertions(+) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index 2c54b8dd..561977e7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -1,5 +1,8 @@ package com.bonus.sgzb.app.controller; +import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.service.LeaseOutDetailsService; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.common.core.web.controller.BaseController; @@ -10,6 +13,7 @@ import com.bonus.sgzb.common.log.enums.BusinessType; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * Description: 任务领料出库详情表控制器 @@ -64,4 +68,20 @@ public class LeaseOutDetailsController extends BaseController { return leaseOutDetailsService.submitOut(record); } + + /** + * 综合查询--领用记录查询 + * @param bean + */ + @Log(title = "综合查询--领用记录查询", businessType = BusinessType.UPDATE) + @PostMapping("/leaseOutRecord") + public AjaxResult leaseOutRecord(@RequestBody LeaseApplyDetails bean){ + try { + List list = leaseOutDetailsService.leaseOutRecord(bean); + return success(list); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java index 96e23d4e..173703ed 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java @@ -121,6 +121,11 @@ public class LeaseApplyDetails implements Serializable { @ApiModelProperty(value = "计量单位") private String unitName; + /** + * 工程名称 + */ + private String proName; + /** * 设备所属类型 */ @@ -153,4 +158,11 @@ public class LeaseApplyDetails implements Serializable { */ @ApiModelProperty(value = "当前库管员领料出库的单子") private Integer count; + + @ApiModelProperty(value="开始时间") + private String startTime; + @ApiModelProperty(value="结束时间") + private String endTime; + @ApiModelProperty(value="关键字") + private String keyWord; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index cec88c8d..2df81ada 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -1,5 +1,7 @@ package com.bonus.sgzb.app.mapper; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -51,4 +53,11 @@ public interface LeaseOutDetailsMapper { int updateTaskStatus(@Param("taskId") String taskId,@Param("status")int status); String getMachineStatus(LeaseOutDetails record); + + /** + * 综合查询--领用记录查询 + * @param bean + * @return List + */ + List leaseOutRecord(LeaseApplyDetails bean); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java index fd0899c1..953034a4 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java @@ -1,5 +1,7 @@ package com.bonus.sgzb.app.service; +import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -22,4 +24,11 @@ public interface LeaseOutDetailsService { List getMaMachineByCode(String maCode); List getMaMachineByQrCode(String qrCode); + + /** + * 综合查询--领用记录查询 + * @param bean + * @return List + */ + List leaseOutRecord(LeaseApplyDetails bean); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 3c151dca..8e068dd1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.app.service.impl; import com.bonus.sgzb.app.domain.LeaseApplyDetails; +import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; import com.bonus.sgzb.app.mapper.LeaseOutDetailsMapper; import com.bonus.sgzb.app.service.LeaseOutDetailsService; @@ -124,4 +125,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return maMachineMapper.getMaMachineByQrCode(qrCode); } + @Override + public List leaseOutRecord(LeaseApplyDetails bean) { + return leaseOutDetailsMapper.leaseOutRecord(bean); + } + } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 0403b12a..50c11d91 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -25,6 +25,40 @@ where ma_id = #{maId} + + UPDATE lease_apply_details From dcb492aee66f0e0467851ba302318aa7750867bc Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Mon, 29 Jan 2024 15:59:30 +0800 Subject: [PATCH 4/8] =?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 --- .../PurchaseCheckInfoController.java | 5 ---- .../service/IPurchaseCheckInfoService.java | 24 +++++++++++++---- .../impl/PurchaseCheckDetailsServiceImpl.java | 12 +-------- .../impl/PurchaseCheckInfoServiceImpl.java | 27 ++++++++++++++----- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index bab9b244..6937c81d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -1,11 +1,7 @@ package com.bonus.sgzb.material.controller; -import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; - -import cn.hutool.core.bean.BeanUtil; -import com.bonus.sgzb.material.domain.BmNoticeInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; @@ -16,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java index b3d6ba2f..9676dc1b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java @@ -17,8 +17,9 @@ public interface IPurchaseCheckInfoService { /** * 查询新购验收任务purchase_check_info - * - * @param taskId 新购验收任务purchase_check_info主键 + * @param taskId + * @param keyword + * 新购验收任务purchase_check_info主键 * @return 新购验收任务purchase_check_info */ public PurchaseCheckInfo selectPurchaseCheckInfoByTaskId(Long taskId,String keyword); @@ -41,7 +42,6 @@ public interface IPurchaseCheckInfoService /** * 修改新购验收任务purchase_check_info - * * @param purchaseCheckInfo 新购验收任务purchase_check_info * @return 结果 */ @@ -63,16 +63,30 @@ public interface IPurchaseCheckInfoService */ public int deletePurchaseCheckInfoByTaskId(Long taskId); + /** + * 验收通知 + * @param noticeInfoVO + * @return Boolean + */ Boolean insertBmNoticeInfo(NoticeInfoVO noticeInfoVO) throws Exception; + /** + * 查询新购入库任务列表 + * @param purchaseCheckInfo + * @return List + */ List selectPutInListList(PurchaseCheckInfo purchaseCheckInfo); /** * 新购工机具验收导出 + * @param purchaseCheckInfo + * @return List */ List exportList(PurchaseCheckInfo purchaseCheckInfo); /** - * 新购工机具入库导出 - */ + * 新购工机具入库导出 + * @param purchaseCheckInfo + * @return List + */ List putInExportList(PurchaseCheckInfo purchaseCheckInfo); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java index 763e85c2..a12000ea 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -61,8 +61,6 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer */ @Override public int insertPurchaseCheckDetails(List purchaseCheckDetailsList) { -// purchaseCheckDetails.setCreateTime(DateUtils.getNowDate()); -// return purchaseCheckDetailsMapper.insertPurchaseCheckDetails(purchaseCheckDetails); return purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckDetailsList); } @@ -73,21 +71,13 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int updatePurchaseCheckDetails(List purchaseCheckDetailsList) { Long taskId = 0L; for (PurchaseCheckDetails purchaseCheckDetails : purchaseCheckDetailsList) { taskId = purchaseCheckDetails.getTaskId(); if ("通过".equals(purchaseCheckDetails.getCheckResult())) { purchaseCheckDetails.setStatus(1); -// // 通过之后往编码管理表里回填数据 -// if ("0".equals(purchaseCheckDetails.getManageType())) { -// PurchaseMacodeInfo macodeInfo = new PurchaseMacodeInfo(); -// macodeInfo.setTypeId(purchaseCheckDetails.getTypeId()); -// macodeInfo.setTaskId(taskId); -// macodeInfo.setStatus("0"); -// macodeInfoService.insertPurchaseMacodeInfo(macodeInfo); -// } } else if ("不通过".equals(purchaseCheckDetails.getCheckResult())) { purchaseCheckDetails.setStatus(3); } else { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index 4857a256..561f6abd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -27,6 +27,17 @@ import javax.annotation.Resource; @Service public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { + /** 9 */ + public static final int NINE = 9; + /** 24 */ + public static final int TWENTY_FOUR = 24; + /** 99 */ + public static final int NINETY_NINE = 99; + /** 100 */ + public static final int ONE_HUNDRED = 100; + /** 1000 */ + public static final int ONE_THOUSAND = 1000; + @Resource private PurchaseCheckInfoMapper purchaseCheckInfoMapper; @@ -110,7 +121,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService * @return 结果 */ @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public int insertPurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo) { TmTask task = new TmTask(); @@ -140,16 +151,18 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService return purchaseCheckInfoMapper.insertPurchaseCheckInfo(purchaseCheckInfo); } - // 采购单号编码生成规则 + /** + * 采购单号编码生成规则 + */ private String purchaseCodeRule() { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); int taskNum = taskMapper.selectTaskNumByMonth(nowDate,23) + 1; String code=""; - if (taskNum>9 && taskNum<100){ + if (taskNum>NINE && taskNum99 && taskNum<1000){ + }else if (taskNum>NINETY_NINE && taskNum Date: Mon, 29 Jan 2024 15:59:43 +0800 Subject: [PATCH 5/8] =?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 --- .../src/main/resources/mapper/app/BackReceiveMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 44b80c10..e2709080 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 @@ -659,7 +659,8 @@ bcd.back_num as backNum, bcd.parent_id as parentId, bcd.create_by as createBy, - bcd.ma_id as maId + bcd.ma_id as maId, + bai.company_id as companyId FROM back_check_details bcd LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id From a5a1a16b28c2d672503a72a38337e538307598ce Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Mon, 29 Jan 2024 16:49:57 +0800 Subject: [PATCH 6/8] =?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 --- .../src/main/resources/mapper/app/BackReceiveMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 e2709080..7054b46e 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 @@ -639,7 +639,8 @@ bcd.back_num as backNum, bcd.parent_id as parentId, bcd.create_by as createBy, - bcd.ma_id as maId + bcd.ma_id as maId, + bai.company_id as companyId FROM back_check_details bcd LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id @@ -679,7 +680,8 @@ bcd.back_num as backNum, bcd.parent_id as parentId, bcd.create_by as createBy, - bcd.ma_id as maId + bcd.ma_id as maId, + bai.company_id as companyId FROM back_check_details bcd LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id From d801158d546e8dafcca65bfd0c23102dd546cdd1 Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Wed, 31 Jan 2024 13:57:52 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/controller/BackApplyController.java | 12 ------------ 1 file changed, 12 deletions(-) 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 16c7eaca..6f01d66b 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,19 +143,11 @@ public class BackApplyController extends BaseController { if (CollUtil.isNotEmpty(leaseApplyDetailsList)) { // 对领料任务表的对象做数据处理 BackApplyInfo backApplyInfo = bean.getBackApplyInfo(); -<<<<<<< HEAD - // 创建领料单号 - backApplyInfo.setCode(code); - // 设置任务ID - backApplyInfo.setTaskId(taskId); - // 设置设备所属分公司,用于交给哪家审核 -======= /* 创建领料单号*/ backApplyInfo.setCode(code); /*设置任务ID*/ backApplyInfo.setTaskId(taskId); /*设置设备所属分公司,用于交给哪家审核*/ ->>>>>>> origin/dev backApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 创建领料任务，返回领料任务编号 @@ -166,11 +158,7 @@ public class BackApplyController extends BaseController { Long backApplyInfoId = backApplyInfo.getId(); if (StringUtils.isNotNull(backApplyInfoId)) { for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) { -<<<<<<< HEAD - // 设置领料任务ID -======= /* 设置领料任务ID*/ ->>>>>>> origin/dev leaseApplyDetails.setId(backApplyInfoId); // 插入领料任务明细 boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0; From ab4ba2cab8d2fbb90b63a833fc56d6d5e52b77ec Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Sun, 18 Feb 2024 10:50:30 +0800 Subject: [PATCH 8/8] =?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 --- .../java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java index 953034a4..5de58a59 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java @@ -25,6 +25,8 @@ public interface LeaseOutDetailsService { List getMaMachineByQrCode(String qrCode); + List getMaMachineByRfidCode(String rfidCode); + /** * 综合查询--领用记录查询 * @param bean