diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java index 1cf20e76..af46b446 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java @@ -182,4 +182,8 @@ public interface BmQrBoxMapper { * @return */ int getMonthMaxOrderByDate(@Param("year") String year, @Param("month") String month); + + List selectByBoxId(Long boxId); + + void updateStatusByBoxId(Long boxId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java index 7f7cc7d5..580e0874 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java @@ -259,10 +259,19 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { // 先查询设备是否在标准箱中 List list = bmQrBoxMapper.selectByMaId(record.getMaId()); if (!CollectionUtils.isEmpty(list)) { + Long boxId = list.get(0).getBoxId(); //获取标准箱id res = updateBoxBind(record); if (res == GlobalConstants.INT_0) { throw new RuntimeException("出库失败,移出设备失败"); } + //移除设备后查看标准箱中是否还有其他设备,没有的话标准箱状态设备已出库 + if(boxId!=null){ + List boxMaList = bmQrBoxMapper.selectByBoxId(boxId); + if(boxMaList.size() == 0){ + //更新标准箱状态为已出库 + bmQrBoxMapper.updateStatusByBoxId(boxId); + } + } } } // 7.将班组领料数据同步至材料站 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index ba0f6b02..b38357c2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -916,30 +916,30 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { if (!CollectionUtils.isEmpty(list)) { List purchaseSignRecordUserSignList = new ArrayList<>(); HashMap purchaseSignRecordMap = new HashMap<>(); -// for (PurchaseCheckDetails purchaseCheckDetails : list) { -// // 查询已签名的记录 -// if (purchaseSignRecordUserSignList.isEmpty()) { -// purchaseSignRecordUserSignList = signProcessMapper.getPurchaseSignUrlListByTaskId(purchaseCheckDetails.getTaskId()); -// for (PurchaseSignRecord purchaseSignRecord : purchaseSignRecordUserSignList) { -// if (StringUtils.isNotBlank(purchaseSignRecord.getSignUrl())) { -// if (!purchaseSignRecord.getSignUrl().startsWith("http")) { -// purchaseSignRecord.setSignUrl("data:image/png;base64," + purchaseSignRecord.getSignUrl()); -// } -// } -// purchaseSignRecordMap.put(purchaseSignRecord.getSignUrl(), purchaseSignRecord); -// } -// } -// result.setSignUrl(null != purchaseCheckDetails.getSignUrl() ? purchaseCheckDetails.getSignUrl() : ""); -// result.setSignType(null != purchaseCheckDetails.getSignType() ? purchaseCheckDetails.getSignType() : ""); -// } -// // 分流存入集合,利用Map去重 -// purchaseSignRecordMap.forEach((k, v) -> { -// if (null != v.getUserId()) { -// if (v.getOrgId() == 105) {result.getGySignUrl().add(v);} -// if (v.getOrgId() == 103) {result.getScSignUrl().add(v);} -// if (v.getOrgId() == 106 || v.getOrgId() == 334 || v.getOrgId() == 335) {result.getKgSignUrl().add(v);} -// } -// }); + for (PurchaseCheckDetails purchaseCheckDetails : list) { + // 查询已签名的记录 + if (purchaseSignRecordUserSignList.isEmpty()) { + purchaseSignRecordUserSignList = signProcessMapper.getPurchaseSignUrlListByTaskId(purchaseCheckDetails.getTaskId()); + for (PurchaseSignRecord purchaseSignRecord : purchaseSignRecordUserSignList) { + if (StringUtils.isNotBlank(purchaseSignRecord.getSignUrl())) { + if (!purchaseSignRecord.getSignUrl().startsWith("http")) { + purchaseSignRecord.setSignUrl("data:image/png;base64," + purchaseSignRecord.getSignUrl()); + } + } + purchaseSignRecordMap.put(purchaseSignRecord.getSignUrl(), purchaseSignRecord); + } + } + result.setSignUrl(null != purchaseCheckDetails.getSignUrl() ? purchaseCheckDetails.getSignUrl() : ""); + result.setSignType(null != purchaseCheckDetails.getSignType() ? purchaseCheckDetails.getSignType() : ""); + } + // 分流存入集合,利用Map去重 + purchaseSignRecordMap.forEach((k, v) -> { + if (null != v.getUserId()) { + if (v.getOrgId() == 105) {result.getGySignUrl().add(v);} + if (v.getOrgId() == 103) {result.getScSignUrl().add(v);} + if (v.getOrgId() == 106 || v.getOrgId() == 334 || v.getOrgId() == 335) {result.getKgSignUrl().add(v);} + } + }); // 处理审批签名 // 提取details中的signType和signUrl,单独作为一个集合,并去重 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml index 81220e97..78ba7c3e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml @@ -440,6 +440,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" MONTH ( create_time ) = #{month} AND YEAR ( create_time ) = #{year} + UPDATE tm_task SET task_status = 22 WHERE task_id = #{taskId} @@ -452,4 +460,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bm_qrcode_box set box_status = 6 where box_id = #{boxId} + + update bm_qrcode_box set box_status = 7 where box_id = #{boxId} +