From e0a9901c595fda5befabe910b69b77cf7d4889cb Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 6 Aug 2024 20:17:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/BackApplyInfo.java | 3 ++ .../sgzb/common/log/aspect/LogAspect.java | 28 ++++++++-------- .../sgzb/app/mapper/BackReceiveMapper.java | 3 ++ .../service/impl/BackReceiveServiceImpl.java | 32 ++++++++++++++++++- .../mapper/app/BackReceiveMapper.xml | 5 +++ 5 files changed, 56 insertions(+), 15 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java index c56425a1..95826989 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java @@ -350,4 +350,7 @@ public class BackApplyInfo extends BaseEntity { private String time; private int viewWeb; + + /** 操作后库存 */ + private int postStoreNum; } diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index f2a68868..46f29463 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -309,20 +309,20 @@ public class LogAspect bmStorageLogList.add(bmStorageLog); } // 退料接收-完成退料 -// if (joinPoint.getArgs()[0] instanceof BackApplyInfo) { -// BackApplyInfo bai = (BackApplyInfo)joinPoint.getArgs()[0]; -// BmStorageLog bmStorageLog = new BmStorageLog(); -// bmStorageLog.setTaskId(String.valueOf(bai.getTaskId())); -// bmStorageLog.setTypeId(Integer.parseInt(bai.getTypeId())); -// bmStorageLog.setTypeName(bai.getMaCode()); -// bmStorageLog.setPreStoreNum(Integer.parseInt(bai.getNum())); -// bmStorageLog.setBackNum(bai.getBackNum()); -// bmStorageLog.setPassNum(bai.getPassNum()); -// bmStorageLog.setMaintenanceNum(bai.getMaintenanceNum()); -// bmStorageLog.setScrapNum(bai.getScrapNum()); -// bmStorageLog.setPostStoreNum(bai.getPostStoreNum()); -// bmStorageLogList.add(bmStorageLog); -// } + if (joinPoint.getArgs()[0] instanceof BackApplyInfo) { + BackApplyInfo bai = (BackApplyInfo)joinPoint.getArgs()[0]; + BmStorageLog bmStorageLog = new BmStorageLog(); + bmStorageLog.setTaskId(String.valueOf(bai.getTaskId())); + bmStorageLog.setTypeId(Integer.parseInt(bai.getTypeId())); + bmStorageLog.setTypeName(bai.getMaCode()); + bmStorageLog.setPreStoreNum(Integer.parseInt(bai.getNum())); + bmStorageLog.setBackNum(bai.getBackNum()); + bmStorageLog.setPassNum(bai.getPassNum()); + bmStorageLog.setMaintenanceNum(bai.getMaintenanceNum()); + bmStorageLog.setScrapNum(bai.getScrapNum()); + bmStorageLog.setPostStoreNum(bai.getPostStoreNum()); + bmStorageLogList.add(bmStorageLog); + } // 二级库出入库, 不影响ma_type库存变化，暂时不加库存监控日志 // if (joinPoint.getArgs()[0] instanceof TeamLeaseInfo) { // TeamLeaseInfo tli = (TeamLeaseInfo)joinPoint.getArgs()[0]; 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 80883ace..69fb68f3 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 @@ -77,6 +77,9 @@ public interface BackReceiveMapper { */ int updateMaStatus(@Param("maId") int maId,@Param("maStatus") String maStatus); + + int getmaChineByCt(BackApplyInfo record); + /** * getHgList * @param 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 cd0ffae3..93e72be7 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 @@ -146,6 +146,17 @@ public class BackReceiveServiceImpl implements BackReceiveService { int res; // try { int taskId = record.getTaskId(); + int passNum = 0; + int maintenanceNum = 0; + int scrapNum = 0; + List allList1 = backReceiveMapper.getAllList(record); + if (allList1 != null && allList1.size() > 0) { + BackApplyInfo b = allList1.get(0); + record.setTypeId(b.getTypeId()); + int num = backReceiveMapper.getmaChineByCt(record); + record.setNum(String.valueOf(num)); + } + //先判断是否已经完成退料了 int taskStatus = selectTaskStatus(taskId); if (taskStatus == 0) { @@ -181,7 +192,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { if (res == 0) { throw new RuntimeException("ma_machines"); } - + for (BackApplyInfo bi : hgList) { + passNum += bi.getBackNum(); + } } //维修的创建维修任务，插入任务协议表 List wxList = backReceiveMapper.getWxList(record); @@ -192,6 +205,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { res = insertTta(newTaskId, wxList); //插入维修记录表repair_apply_details res = insertRad(newTaskId, wxList); + for (BackApplyInfo bi : wxList) { + maintenanceNum += bi.getBackNum(); + } } //待报废的创建报废任务，插入任务协议表 @@ -203,6 +219,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { res = insertTta(newTaskId, bfList); //插入维修记录表scrap_apply_details res = insertSad(newTaskId, bfList); + for (BackApplyInfo bi : bfList) { + scrapNum += bi.getBackNum(); + } } List allList = backReceiveMapper.getAllList(record); @@ -211,7 +230,18 @@ public class BackReceiveServiceImpl implements BackReceiveService { if (res == 0) { throw new RuntimeException("该机具未被领料使用"); } + BackApplyInfo b = allList.get(0); + record.setTypeId(b.getTypeId()); + int postStoreNum = backReceiveMapper.getmaChineByCt(record); + record.setPostStoreNum(postStoreNum); } + + //库存日志 + record.setBackNum(passNum+maintenanceNum+scrapNum); + record.setPassNum(passNum); + record.setMaintenanceNum(maintenanceNum); + record.setScrapNum(scrapNum); + // } catch (Exception e) { // throw new RuntimeException(e.getMessage()); // } 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 64e32de2..fea753c1 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 @@ -695,9 +695,14 @@ + + +