From 7602bce36122464656e74ce124d1355fe6da41b2 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 6 Aug 2024 17:41:49 +0800 Subject: [PATCH 1/2] =?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/LeaseOutDetails.java | 5 + .../sgzb/common/log/aspect/LogAspect.java | 50 +++--- .../impl/LeaseOutDetailsServiceImpl.java | 13 ++ sgzb-ui/src/views/inventoryLogs/aaa.vue | 169 ------------------ 4 files changed, 43 insertions(+), 194 deletions(-) delete mode 100644 sgzb-ui/src/views/inventoryLogs/aaa.vue diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java index 97c5b8eb..546fe568 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java @@ -160,4 +160,9 @@ public class LeaseOutDetails implements Serializable { @ApiModelProperty(value = "0工程1长期") private String leaseType; + @ApiModelProperty(value = "数量出库 -> 操作前库存量") + private Integer num; + + /** 操作后库存 */ + private int postStoreNum; } \ No newline at end of file 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 50c92f11..f2a68868 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 @@ -283,31 +283,31 @@ public class LogAspect // } // } // 领料出库 -// if (joinPoint.getArgs()[0] instanceof List && -// ((List) joinPoint.getArgs()[0]).stream().noneMatch((o -> !(o instanceof LeaseOutDetails)))) { -// List leaseOutDetails = (List)joinPoint.getArgs()[0]; -// for (LeaseOutDetails lod : leaseOutDetails) { -// BmStorageLog bmStorageLog = new BmStorageLog(); -// bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); -// bmStorageLog.setTypeId(lod.getTypeId()); -// bmStorageLog.setTypeName(lod.getMaCode()); -// bmStorageLog.setPreStoreNum(lod.getNum()); -// bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); -// bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); -// bmStorageLogList.add(bmStorageLog); -// } -// } -// if (joinPoint.getArgs()[0] instanceof LeaseOutDetails) { -// LeaseOutDetails lod = (LeaseOutDetails)joinPoint.getArgs()[0]; -// BmStorageLog bmStorageLog = new BmStorageLog(); -// bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); -// bmStorageLog.setTypeId(lod.getTypeId()); -// bmStorageLog.setTypeName(lod.getMaCode()); -// bmStorageLog.setPreStoreNum(lod.getNum()); -// bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); -// bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); -// bmStorageLogList.add(bmStorageLog); -// } + if (joinPoint.getArgs()[0] instanceof List && + ((List) joinPoint.getArgs()[0]).stream().noneMatch((o -> !(o instanceof LeaseOutDetails)))) { + List leaseOutDetails = (List)joinPoint.getArgs()[0]; + for (LeaseOutDetails lod : leaseOutDetails) { + BmStorageLog bmStorageLog = new BmStorageLog(); + bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); + bmStorageLog.setTypeId(lod.getTypeId()); + bmStorageLog.setTypeName(lod.getMaCode()); + bmStorageLog.setPreStoreNum(lod.getNum()); + bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); + bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); + bmStorageLogList.add(bmStorageLog); + } + } + if (joinPoint.getArgs()[0] instanceof LeaseOutDetails) { + LeaseOutDetails lod = (LeaseOutDetails)joinPoint.getArgs()[0]; + BmStorageLog bmStorageLog = new BmStorageLog(); + bmStorageLog.setTaskId(String.valueOf(lod.getTaskId())); + bmStorageLog.setTypeId(lod.getTypeId()); + bmStorageLog.setTypeName(lod.getMaCode()); + bmStorageLog.setPreStoreNum(lod.getNum()); + bmStorageLog.setOutNum(Objects.isNull(lod.getInputNum()) ? 0 : lod.getInputNum().intValue()); + bmStorageLog.setPostStoreNum(lod.getPostStoreNum()); + bmStorageLogList.add(bmStorageLog); + } // 退料接收-完成退料 // if (joinPoint.getArgs()[0] instanceof BackApplyInfo) { // BackApplyInfo bai = (BackApplyInfo)joinPoint.getArgs()[0]; 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 e7ee66dd..b5e44095 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 @@ -181,6 +181,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (res == 0) { throw new RuntimeException("出库失败,插入结算记录失败"); } + record.setPostStoreNum(getStorageNum(record)); } else { return AjaxResult.error("领料出库失败,机具库存不足"); } @@ -194,6 +195,18 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { return AjaxResult.success("出库成功"); } + private int getStorageNum(LeaseOutDetails record) { + if (StringUtils.isNull(record)) { + return 0; + } + //判断(ma_type 设备规格表)中的库存够不够出库的 + MaType maType = leaseOutDetailsMapper.selectByTypeId(record); + if (maType != null) { + return maType.getNum().intValue(); + } + return 0; + } + private int insertRecords(LeaseOutDetails record) { int res = 0; // 首先更新领料任务详情表的领料数及状态（lease_apply_details） diff --git a/sgzb-ui/src/views/inventoryLogs/aaa.vue b/sgzb-ui/src/views/inventoryLogs/aaa.vue deleted file mode 100644 index 2e4a7f32..00000000 --- a/sgzb-ui/src/views/inventoryLogs/aaa.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - From a600fd35fb434377f9d16b6a5124246cb53d623c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 7 Aug 2024 08:52:05 +0800 Subject: [PATCH 2/2] combine storagelog --- .../sgzb/base/api}/domain/BackApplyInfo.java | 233 +++++++++++++----- .../sgzb/base/api}/domain/MachinePart.java | 2 +- .../sgzb/common/log/aspect/LogAspect.java | 28 +-- .../sgzb/app/controller/AppController.java | 1 - .../app/controller/BackApplyController.java | 5 +- .../app/controller/BackReceiveController.java | 2 +- .../bonus/sgzb/app/domain/BackApplyInfo.java | 201 --------------- .../sgzb/app/domain/LeaseApplyDetails.java | 1 + .../bonus/sgzb/app/domain/StorageStatus.java | 1 + .../sgzb/app/mapper/BackApplyAppMapper.java | 4 +- .../sgzb/app/mapper/BackReceiveMapper.java | 5 +- .../sgzb/app/mapper/HoldingLedgerMapper.java | 4 +- .../app/mapper/LeaseOutDetailsMapper.java | 2 +- .../bonus/sgzb/app/mapper/TmTaskMapper.java | 3 +- .../sgzb/app/service/BackApplyService.java | 2 +- .../sgzb/app/service/BackReceiveService.java | 2 +- .../service/impl/BackApplyServiceImpl.java | 6 +- .../service/impl/BackReceiveServiceImpl.java | 41 ++- .../app/service/impl/HoldingLedgerImpl.java | 2 +- .../impl/LeaseOutDetailsServiceImpl.java | 2 +- .../app/service/impl/TmTaskServiceImpl.java | 2 +- .../mapper/app/BackApplyAppMapper.xml | 14 +- .../mapper/app/BackReceiveMapper.xml | 31 ++- .../mapper/app/LeaseOutDetailsMapper.xml | 2 +- .../resources/mapper/app/TmTaskMapper.xml | 2 +- .../mapper/base/HoldingLedgerMapper.xml | 2 +- .../controller/BackApplyController.java | 2 +- .../controller/LeaseRecordController.java | 3 - .../PurchaseCheckInfoController.java | 3 - .../controller/RepairTestInputController.java | 1 - .../ReturnOfMaterialsInfoController.java | 1 - .../material/domain/BackApplyListDto.java | 1 + .../domain/DirectPassApplyInfoDetails.java | 3 +- .../sgzb/material/domain/MachinePart.java | 16 -- .../sgzb/material/mapper/BackApplyMapper.java | 2 +- .../material/mapper/BackRecordMapper.java | 3 +- .../material/mapper/LeaseRecordMapper.java | 3 - .../mapper/PurchaseCheckInfoMapper.java | 2 +- .../mapper/PurchaseMacodeInfoMapper.java | 2 +- .../material/mapper/RepairRecordMapper.java | 4 - .../mapper/ScrapApplyDetailsMapper.java | 2 +- .../sgzb/material/mapper/TaskMapper.java | 4 +- .../material/service/BackApplyService.java | 2 +- .../service/IPurchaseCheckInfoService.java | 3 +- .../material/service/LeaseRecordService.java | 2 - .../sgzb/material/service/TaskService.java | 2 +- .../service/WorkSiteDirectManageService.java | 3 +- .../service/impl/BackApplyServiceImpl.java | 4 +- .../service/impl/LeaseRecordServiceImpl.java | 17 -- .../impl/PurchaseCheckInfoServiceImpl.java | 1 + .../impl/ScrapApplyDetailsServiceImpl.java | 4 +- .../service/impl/TaskServiceImpl.java | 3 +- .../impl/WorkSiteDirectManageImpl.java | 4 - .../mapper/material/BackApplyMapper.xml | 20 +- .../mapper/material/BackRecordMapper.xml | 2 +- .../material/PurchaseCheckInfoMapper.xml | 2 +- .../material/ScrapApplyDetailsMapper.xml | 2 +- .../resources/mapper/material/TaskMapper.xml | 4 +- .../material/WorkSiteDirectManageMapper.xml | 2 +- 59 files changed, 302 insertions(+), 427 deletions(-) rename {sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material => sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api}/domain/BackApplyInfo.java (74%) rename {sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app => sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api}/domain/MachinePart.java (94%) delete mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java delete mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java similarity index 74% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java index 5d6f022d..95826989 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.material.domain; +package com.bonus.sgzb.base.api.domain; import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; @@ -9,33 +9,20 @@ import java.util.Date; import java.util.List; /** -* @description 退料 -* @author hay -* @date 2023/12/20 11:56 -*/ + * 退料 + * @author bns_han + */ @Data public class BackApplyInfo extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 退料ID */ + /** + * 退料id + */ @ApiModelProperty(value = "退料ID") private Long id; @ApiModelProperty(value="工程id") private Long projectId; - /** - * 任务ID - */ - private Integer parentId; - private String badId; - private String[] split; - - private List maTypeDetails; - - /** - * 工程名称 - */ @ApiModelProperty(value="工程名称") private String proName; @@ -49,58 +36,21 @@ public class BackApplyInfo extends BaseEntity { */ @ApiModelProperty(value = "装备管理方式名称") private String manageTypeName; + + /** + * 机具管理方式 + */ private String manageType; - private int flag; private BackApplyInfo[] arr; private Integer maId; - /** - * 退料状态 - */ - private String backStatus; - /** - * 退料数量 - */ - private Integer backNum; + private Integer directNum; - /** 退料单号 */ - @Excel(name = "退料单号") - @ApiModelProperty(value = "退料单号") - private String code; - - @Excel(name = "退料单位名称") - @ApiModelProperty(value = "单位名称") - private String unitName; - - @Excel(name = "退料工程名称") - @ApiModelProperty(value = "工程名称") - private String lotName; - - @Excel(name = "退料工机具类型") - @ApiModelProperty(value = "类型名称") - private String typeName; - - @Excel(name = "规格型号") - @ApiModelProperty(value = "规格编号") - private String typeCode; - - /** 退料人员 */ - @Excel(name = "退料人员") - @ApiModelProperty(value = "退料人员") - private String backPerson; - - /** 联系电话 */ - @Excel(name = "退料人联系电话") - @ApiModelProperty(value = "联系电话") - private String phone; - - - /** 任务ID */ @ApiModelProperty(value = "任务ID") @@ -118,22 +68,158 @@ public class BackApplyInfo extends BaseEntity { @ApiModelProperty(value = "签订日期") private String signTime; - @Excel(name = "退料申请时间") + + /** + * 退料人 + */ + private String userName; + private String badId; + private String[] split; + private String[] typeIds; + + @Excel(name = "退料状态",sort = 9) + private String taskName; + /** + * 联系人 + */ + @Excel(name = "联系电话",sort = 6) + @ApiModelProperty(value = "联系电话") + private String phone; + /** + * 工程名称 + */ + @Excel(name = "退料工程",sort = 3) + @ApiModelProperty(value = "工程名称") + private String lotName; + /** + * 单位名称 + */ + @Excel(name = "退料单位",sort = 2) + @ApiModelProperty(value = "单位名称") + private String unitName; + /** + * 开始时间 + */ + private String planStartTime; + + + private String modelId; + + private List maTypeDetails; + /** + * 类型名称 + */ + @Excel(name = "退料机具",sort = 4) + @ApiModelProperty(value = "类型名称") + private String typeName; + /** + * 协议号 + */ + @Excel(name = "协议号",sort = 8) + @ApiModelProperty(value = "协议编号") + private String agreementCode; + /** + * 规格编号 + */ + @Excel(name = "规格型号") + @ApiModelProperty(value = "规格编号") + private String typeCode; + + + + + @Excel(name = "退料单号",sort = 1) + @ApiModelProperty(value = "退料单号") + private String code; + + @Excel(name = "退料人员",sort = 5) + @ApiModelProperty(value = "退料人员") + private String backPerson; + + + @Excel(name = "申请时间",sort = 7) @ApiModelProperty(value = "退料日期") private String backTime; - @Excel(name = "协议号") - @ApiModelProperty(value = "协议编号") - private String agreementCode; + + private String type; + /** + * 合格数量 + */ + private Integer passNum; + /** + * 维修数量 + */ + private Integer maintenanceNum; + /** + * 报废数量 + */ + private Integer scrapNum; + + /** + * 退料数量 + */ + private Integer backNum; + + /** + * 退料状态 + */ + private String backStatus; + + /** + * 合格入库数量 + */ + private String inputNum; + + + + + private BackApplyInfo info; + + + private Integer parentId; + private String sdStatus; + private String sdId; + /** + * 二维码编码 + */ + private String qrCode; + /** + * rfid编码 + */ + private String rfidCode; + private String repairedNum; + private String backId; + private String repairer; + + + private Integer flag; + private Integer partNum; + /** + * 合格数量 + */ + private Integer hgNum; + /** + * 维修数量 + */ + private Integer wxNum; + /** + * 报废数量 + */ + private Integer bfNum; + + @Excel(name = "退料状态" , readConverterExp = "37=待退料审核,38=退料已审核,39=退料核查中,40=退料完成,101 = 退料审核驳回") @ApiModelProperty(value = "任务状态") private String taskStatus; + /** 机具公司审核人 */ @ApiModelProperty(value = "机具公司审核人") private Integer directAuditBy; + /** 机具公司审批时间 */ @ApiModelProperty(value = "机具公司审批时间") private String directAuditTime; @@ -174,6 +260,12 @@ public class BackApplyInfo extends BaseEntity { private Integer lotId; + + + + + + @ApiModelProperty(value = "单位id") private Integer unitId; @ApiModelProperty(value = "计量单位") @@ -193,9 +285,11 @@ public class BackApplyInfo extends BaseEntity { private String detailsIdByNum; @ApiModelProperty(value = "类型id和数量") + private String typeIdByNum; @ApiModelProperty(value = "详情id") + private String detailsId; @ApiModelProperty(value = "编码") @@ -238,10 +332,15 @@ public class BackApplyInfo extends BaseEntity { @ApiModelProperty(value="退料任务实体集合") private List backApplyDetails; + /**审核状态*/ @ApiModelProperty(value="同一退料单中不同器具状态") private String status; private String guigeCn; + + /** + * 退料数量 + */ private String preNum; private String auditNum; private String typeCn; @@ -252,4 +351,6 @@ public class BackApplyInfo extends BaseEntity { private int viewWeb; + /** 操作后库存 */ + private int postStoreNum; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/MachinePart.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MachinePart.java similarity index 94% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/MachinePart.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MachinePart.java index 580ad71b..aa68a1e8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/MachinePart.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MachinePart.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.app.domain; +package com.bonus.sgzb.base.api.domain; import com.bonus.sgzb.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; 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/controller/AppController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java index f6a91ac3..ed0ebe9d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java @@ -1,7 +1,6 @@ package com.bonus.sgzb.app.controller; import com.bonus.sgzb.app.domain.AppVersion; -import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.CriticalData; import com.bonus.sgzb.app.domain.ToDoList; import com.bonus.sgzb.app.service.AppService; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index 381c4732..025422fb 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -1,15 +1,12 @@ package com.bonus.sgzb.app.controller; import cn.hutool.core.collection.CollUtil; -import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.service.BackApplyService; -import com.bonus.sgzb.app.service.LeaseApplyDetailsService; -import com.bonus.sgzb.app.service.LeaseApplyInfoService; import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.common.core.utils.GlobalConstants; import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; 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 060c06da..2c35110f 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 @@ -1,6 +1,6 @@ package com.bonus.sgzb.app.controller; -import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.service.*; import com.bonus.sgzb.common.core.text.Convert; 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 deleted file mode 100644 index f83a8792..00000000 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ /dev/null @@ -1,201 +0,0 @@ -package com.bonus.sgzb.app.domain; - -import com.bonus.sgzb.common.core.annotation.Excel; -import io.swagger.models.auth.In; -import lombok.Data; - -import java.util.List; - -/** - * 退料 - * @author bns_han - */ -@Data -public class BackApplyInfo { - /** - * 退料id - */ - private Integer id; - /** - * 退料人 - */ - private String userName; - private String badId; - private String[] typeIds; - - @Excel(name = "退料状态",sort = 9) - private String taskName; - /** - * 联系人 - */ - @Excel(name = "联系电话",sort = 6) - private String phone; - /** - * 工程名称 - */ - @Excel(name = "退料工程",sort = 3) - private String lotName; - /** - * 单位名称 - */ - @Excel(name = "退料单位",sort = 2) - private String unitName; - /** - * 开始时间 - */ - private String planStartTime; - /** - * 审核状态 - */ - private String status; - /** - * 退料审核状态 - */ - private String taskStatus; - /** - * 规格id - */ - private String typeId; - private String modelId; - - private List maTypeDetails; - /** - * 类型名称 - */ - @Excel(name = "退料机具",sort = 4) - private String typeName; - /** - * 协议号 - */ - @Excel(name = "协议号",sort = 8) - private String agreementCode; - /** - * 规格编号 - */ - private String typeCode; - /** - * 组织id - */ - private String companyId; - /** - * 在用数量 - */ - private String num; - /** - * 编码 - */ - private String maCode; - /** - * 协议id - */ - private String agreementId; - /** - * 人员 - */ - private String createBy; - /** - * 修改人 - */ - private String updateBy; - private String updateTime; - private String remark; - /** - * 审核备注 - */ - private String directAuditRemark; - @Excel(name = "退料单号",sort = 1) - private String code; - @Excel(name = "退料人员",sort = 5) - private String backPerson; - private String lotId; - private String unitId; - @Excel(name = "申请时间",sort = 7) - private String backTime; - private Integer maId; - /** - * 机具管理方式 - */ - private String manageType; - private String type; - /** - * 合格数量 - */ - private Integer passNum; - /** - * 维修数量 - */ - private Integer maintenanceNum; - /** - * 报废数量 - */ - private Integer scrapNum; - - /** - * 退料数量 - */ - private Integer backNum; - - /** - * 退料状态 - */ - private String backStatus; - - /** - * 合格入库数量 - */ - private String inputNum; - - /** - * 关键字 - */ - private String keyWord; - - /** - * 任务类型 - */ - private Integer taskType; - - /** - * 任务id - */ - private Integer taskId; - - private BackApplyInfo info; - - private BackApplyInfo[] arr; - private List backApplyDetails; - private Integer parentId; - private String sdStatus; - private String sdId; - /** - * 二维码编码 - */ - private String qrCode; - /** - * rfid编码 - */ - private String rfidCode; - private String repairedNum; - private String backId; - private String repairer; - /** - * 退料数量 - */ - private String preNum; - private String startTime; - private String endTime; - private Integer flag; - private Integer partNum; - /** - * 合格数量 - */ - private Integer hgNum; - /** - * 维修数量 - */ - private Integer wxNum; - /** - * 报废数量 - */ - private Integer bfNum; -} 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 abd73b1d..6ceb8f95 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 @@ -1,5 +1,6 @@ package com.bonus.sgzb.app.domain; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/StorageStatus.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/StorageStatus.java index da369acd..a6fd3ff1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/StorageStatus.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/StorageStatus.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.app.domain; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java index 01da2bc8..61d9e539 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyAppMapper.java @@ -1,8 +1,8 @@ package com.bonus.sgzb.app.mapper; -import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; -import com.bonus.sgzb.app.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import org.apache.ibatis.annotations.Mapper; 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 fedaddd0..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 @@ -1,6 +1,6 @@ package com.bonus.sgzb.app.mapper; -import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.SltAgreementInfo; import org.apache.ibatis.annotations.Mapper; @@ -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/mapper/HoldingLedgerMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/HoldingLedgerMapper.java index 76ef2040..66043ca5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/HoldingLedgerMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/HoldingLedgerMapper.java @@ -1,9 +1,7 @@ package com.bonus.sgzb.app.mapper; -import com.bonus.sgzb.app.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.app.domain.StorageStatus; -import com.bonus.sgzb.app.domain.TmTask; -import com.bonus.sgzb.base.domain.MaSupplierInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; 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 a509fdaa..c44879ed 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,7 +1,7 @@ package com.bonus.sgzb.app.mapper; import com.bonus.sgzb.app.domain.LeaseApplyDetails; -import com.bonus.sgzb.app.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.base.api.domain.MaType; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 73a04675..333d2e95 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -1,7 +1,8 @@ package com.bonus.sgzb.app.mapper; import com.bonus.sgzb.app.domain.*; -import com.bonus.sgzb.base.domain.MaintenanceGang; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.MachinePart; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; 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 e2b5275a..ecf63eb3 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 @@ -1,6 +1,6 @@ package com.bonus.sgzb.app.service; -import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; import com.bonus.sgzb.app.domain.TmTask; 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 20fc688b..7f965a4d 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 @@ -1,6 +1,6 @@ package com.bonus.sgzb.app.service; -import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.TmTask; import java.util.List; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index 0b19f246..cc3d2350 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -1,22 +1,20 @@ package com.bonus.sgzb.app.service.impl; import cn.hutool.core.collection.CollUtil; -import com.bonus.sgzb.app.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.BmAgreementInfo; -import com.bonus.sgzb.app.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.BackApplyAppMapper; import com.bonus.sgzb.app.service.BackApplyService; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; /** * @author hay 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 b52d4e36..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 @@ -1,7 +1,7 @@ package com.bonus.sgzb.app.service.impl; -import com.bonus.sgzb.app.domain.BackApplyInfo; -import com.bonus.sgzb.app.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.BackReceiveMapper; import com.bonus.sgzb.app.mapper.TmTaskMapper; @@ -11,7 +11,6 @@ import com.bonus.sgzb.common.core.constant.TaskTypeConstants; import com.bonus.sgzb.common.core.enums.TaskStatusEnum; import com.bonus.sgzb.common.core.enums.TaskTypeEnum; import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,7 +53,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { typeIds.removeIf(item -> item == null); for (TmTask typeId : typeIds) { MachinePart machinePart = tmTaskMapper.getMachineParts(typeId); - machinePart.setParentId(record.getId()); + machinePart.setParentId(record.getId().intValue()); int countMachineByPidAndTid = tmTaskMapper.getCountMachineByPidAndTid(machinePart); Double machinePartNum = typeId.getPartNum() * Double.parseDouble(backApplyInfo.getPreNum()); count1 += machinePartNum; @@ -147,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) { @@ -182,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); @@ -193,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(); + } } //待报废的创建报废任务，插入任务协议表 @@ -204,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); @@ -212,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()); // } @@ -387,7 +416,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { private int insertTta(int taskId, List list) { int res; - String agreementId = list.get(0).getAgreementId(); + String agreementId = String.valueOf(list.get(0).getAgreementId()); res = backReceiveMapper.insertTta(taskId, agreementId); return res; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/HoldingLedgerImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/HoldingLedgerImpl.java index a446f5e6..4b539d7f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/HoldingLedgerImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/HoldingLedgerImpl.java @@ -1,6 +1,6 @@ package com.bonus.sgzb.app.service.impl; -import com.bonus.sgzb.app.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.app.domain.StorageStatus; import com.bonus.sgzb.app.mapper.HoldingLedgerMapper; import com.bonus.sgzb.app.service.HoldingLedgerService; 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 b5e44095..4ed1094c 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 @@ -2,7 +2,7 @@ package com.bonus.sgzb.app.service.impl; import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.LeaseApplyDetails; -import com.bonus.sgzb.app.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; import com.bonus.sgzb.app.mapper.LeaseOutDetailsMapper; 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 127bf697..c465820a 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 @@ -3,7 +3,7 @@ package com.bonus.sgzb.app.service.impl; import cn.hutool.core.collection.CollUtil; import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.app.domain.LeaseApplyInfo; -import com.bonus.sgzb.app.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; import com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml index d42156ce..5d13413e 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml @@ -383,7 +383,7 @@ bui.unit_id=#{unitId} and bui.del_flag='0' - SELECT bai.id, bai.`code`, @@ -417,7 +417,7 @@ ORDER BY bai.create_time desc - SELECT mt.type_id, mt.type_name as typeCode, @@ -441,7 +441,7 @@ mt.type_id - SELECT mt.type_name typeCode, CONCAT_WS('/', IFNULL(mt2.type_name, '')) AS typeName, @@ -454,7 +454,7 @@ WHERE bai.id=#{id} - SELECT bai.id, bai.code, @@ -487,7 +487,7 @@ GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time ORDER BY bai.create_time desc - SELECT mt.type_name typeCode, CONCAT_WS('/', IFNULL(mt2.type_name, '')) AS typeName, @@ -504,7 +504,7 @@ WHERE bai.id=#{id} - SELECT * FROM tm_task tt LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id @@ -527,7 +527,7 @@ WHERE mt1.type_id = #{typeId} - SELECT mt.type_name AS typeModelName, mt.unit_name as unitName, 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 6aaba5b6..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 @@ -585,7 +585,7 @@ - SELECT bai.id, bai.`code`, @@ -654,7 +654,7 @@ bai.create_time DESC - SELECT bai.id, bai.task_id as taskId, @@ -695,10 +695,15 @@ + + - SELECT tta.agreement_id as agreementId, bai.id, @@ -718,7 +723,7 @@ and bcd.back_status='1' - SELECT tta.agreement_id as agreementId, bai.id, @@ -738,7 +743,7 @@ and bcd.back_status='2' - SELECT tta.agreement_id as agreementId, bai.id, @@ -758,7 +763,7 @@ and bcd.back_status='3' - SELECT mt.type_id as typeId, mm.ma_id as maId, @@ -776,7 +781,7 @@ and sd.id='16' - SELECT mt.type_id as typeId, mm.ma_id as maId, @@ -794,7 +799,7 @@ WHERE mm.qr_code =#{qrCode} and sai.agreement_id = #{agreementId} - SELECT mt2.type_name AS typeName, mt1.type_name AS typeCode, @@ -827,7 +832,7 @@ AND bai.task_id = #{taskId} - SELECT mt.type_id as typeId, mm.ma_id as maId, @@ -870,7 +875,7 @@ order by start_time asc - SELECT tta.agreement_id AS agreementId, bai.id, @@ -960,7 +965,7 @@ ) res HAVING backNum > -1 - SELECT mt2.type_name AS typeName, mt1.type_name AS typeCode, @@ -988,7 +993,7 @@ ORDER BY bcd.create_time DESC - SELECT bad.type_id as typeId, ifnull(bad.audit_num,0) as backNum, @@ -999,7 +1004,7 @@ WHERE bad.parent_id = #{parentId} - SELECT mt2.type_name AS typeName, mt1.type_name AS typeCode, 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 14eddf4d..ce559e0f 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 @@ -424,7 +424,7 @@ WHERE mt1.type_id = #{typeId} - SELECT mt.type_name AS typeModelName, mt.unit_name as unitName, 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 eb028e92..4403e1a2 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 @@ -1081,7 +1081,7 @@ WHERE mt1.type_id = #{typeId} - SELECT mt.type_name AS typeModelName, mt.type_id as modelId, diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/HoldingLedgerMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/HoldingLedgerMapper.xml index cee445eb..c9387a7a 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/HoldingLedgerMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/HoldingLedgerMapper.xml @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mt.type_id = #{typeId} - SELECT mt2.type_name AS typeModelName, mt2.type_id AS typeId, 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 5d0c6745..f0a57c4c 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 @@ -14,7 +14,7 @@ import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.BackApplyDto; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.material.service.BackApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java index 0eee3491..471bbbdc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java @@ -5,10 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.material.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.LeaseRecord; -import com.bonus.sgzb.material.domain.PurchaseCheckInfo; -import com.bonus.sgzb.material.service.BackApplyService; import com.bonus.sgzb.material.service.LeaseRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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 ff06ca77..211830b9 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,8 @@ package com.bonus.sgzb.material.controller; -import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.bonus.sgzb.common.security.utils.SecurityUtils; -import com.bonus.sgzb.material.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java index a84b55f0..bdd2eb52 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java @@ -6,7 +6,6 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.material.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.RepairTestInputDetailVo; import com.bonus.sgzb.material.domain.RepairTestInputDto; import com.bonus.sgzb.material.domain.RepairTestInputVo; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java index 83a73fd6..c7914511 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java @@ -6,7 +6,6 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.material.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; import com.bonus.sgzb.material.service.ReturnOfMaterialsInfoService; import io.swagger.annotations.Api; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyListDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyListDto.java index d3a40c51..8b148ec6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyListDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyListDto.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.domain; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java index 9d52bbd2..5b071391 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java @@ -1,7 +1,6 @@ package com.bonus.sgzb.material.domain; -import com.bonus.sgzb.base.api.domain.DirectApplyDetails; -import com.bonus.sgzb.base.api.domain.DirectApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.common.core.web.domain.BaseEntity; import lombok.Data; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java deleted file mode 100644 index e168051d..00000000 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.bonus.sgzb.material.domain; - -import lombok.Data; - -/** - * @Author：梁超 - * @date：2024/4/17 - 9:04 - */ -@Data -public class MachinePart { - private String typeModelName; - private String unitName; - private String typeName; - private Integer partNum; - private Integer typeId; -} 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 9574ce0c..02555a50 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 @@ -1,7 +1,7 @@ package com.bonus.sgzb.material.mapper; import com.bonus.sgzb.material.domain.BackApplyDto; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.TypeTreeNode; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java index ccaa05e2..fda4fbb6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java @@ -1,9 +1,8 @@ package com.bonus.sgzb.material.mapper; import com.bonus.sgzb.base.api.domain.SltAgreementInfo; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.BackRecord; -import com.bonus.sgzb.material.domain.LeaseRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/LeaseRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/LeaseRecordMapper.java index 6125a886..6390fa9e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/LeaseRecordMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/LeaseRecordMapper.java @@ -3,13 +3,10 @@ package com.bonus.sgzb.material.mapper; import com.bonus.sgzb.base.api.domain.LeaseOutDetails; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.base.api.domain.SltAgreementInfo; -import com.bonus.sgzb.material.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.LeaseRecord; -import com.bonus.sgzb.material.domain.TypeTreeNode; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java index a0d68b68..9dfa986f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java @@ -1,7 +1,7 @@ package com.bonus.sgzb.material.mapper; import com.bonus.sgzb.material.domain.BmNoticeInfo; -import com.bonus.sgzb.material.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import org.apache.ibatis.annotations.Mapper; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index 62818c9a..5d1c70cd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -7,7 +7,7 @@ import com.bonus.sgzb.base.api.domain.MaMachineLabel; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.material.domain.InputApplyDetails; import com.bonus.sgzb.base.api.domain.MaInputRecord; -import com.bonus.sgzb.material.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairRecordMapper.java index c60abeda..14364bb2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairRecordMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairRecordMapper.java @@ -1,11 +1,7 @@ package com.bonus.sgzb.material.mapper; -import com.bonus.sgzb.base.api.domain.SltAgreementInfo; -import com.bonus.sgzb.material.domain.BackApplyInfo; -import com.bonus.sgzb.material.domain.BackRecord; import com.bonus.sgzb.material.domain.RepairRecord; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java index 292dcdc3..276504ad 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java @@ -1,6 +1,6 @@ package com.bonus.sgzb.material.mapper; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.RepairAuditDetails; import com.bonus.sgzb.material.domain.RepairRecord; import com.bonus.sgzb.material.domain.ScrapApplyDetails; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java index 53f40970..2ebdd33a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java @@ -1,9 +1,9 @@ package com.bonus.sgzb.material.mapper; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.ScrapApplyDetails; -import com.bonus.sgzb.material.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.material.domain.TmTask; import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO; import org.apache.ibatis.annotations.Mapper; 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 c3c8bac1..e25ce61b 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 @@ -2,7 +2,7 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.BackApplyDto; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import java.util.List; 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 d9e8b36f..e42a89b8 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 @@ -1,7 +1,6 @@ package com.bonus.sgzb.material.service; -import com.bonus.sgzb.material.domain.BmNoticeInfo; -import com.bonus.sgzb.material.domain.MachinePart; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.vo.NoticeInfoVO; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/LeaseRecordService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/LeaseRecordService.java index 45fb422d..3b57ccdf 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/LeaseRecordService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/LeaseRecordService.java @@ -1,7 +1,5 @@ package com.bonus.sgzb.material.service; -import com.bonus.sgzb.common.core.web.domain.AjaxResult; -import com.bonus.sgzb.material.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.LeaseRecord; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java index 3d7ebde6..b144a611 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java @@ -1,7 +1,7 @@ package com.bonus.sgzb.material.service; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.TmTask; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java index 9f8c133e..d03dbc7f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java @@ -1,8 +1,7 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.base.api.domain.*; -import com.bonus.sgzb.common.core.web.domain.AjaxResult; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.DirectPassApplyInfoDetails; import com.bonus.sgzb.material.domain.TmTask; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index d1d73847..66e71d9d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -1,6 +1,8 @@ package com.bonus.sgzb.material.service.impl; import cn.hutool.core.collection.CollUtil; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.utils.StringUtils; @@ -150,7 +152,7 @@ public class BackApplyServiceImpl implements BackApplyService { typeIds.removeIf(item -> item == null); for (TmTask typeId : typeIds) { MachinePart machinePart = tmTaskMapper.getMachineParts(typeId); - machinePart.setPartNum((int) (Double.parseDouble(typeId.getPartNum()) * Double.parseDouble(backApplyInfo.getPreNum()))); + machinePart.setPartNum((Double.parseDouble(typeId.getPartNum()) * Double.parseDouble(backApplyInfo.getPreNum()))); machineParts.add(machinePart); } backApplyInfo.setMaTypeDetails(machineParts); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/LeaseRecordServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/LeaseRecordServiceImpl.java index 1fee1e93..6cf8317d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/LeaseRecordServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/LeaseRecordServiceImpl.java @@ -1,29 +1,12 @@ package com.bonus.sgzb.material.service.impl; -import cn.hutool.core.collection.CollUtil; -import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.common.core.utils.StringUtils; -import com.bonus.sgzb.common.core.web.domain.AjaxResult; -import com.bonus.sgzb.common.security.utils.SecurityUtils; -import com.bonus.sgzb.material.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.LeaseRecord; -import com.bonus.sgzb.material.domain.TypeTreeNode; -import com.bonus.sgzb.material.mapper.BackApplyMapper; import com.bonus.sgzb.material.mapper.LeaseRecordMapper; -import com.bonus.sgzb.material.mapper.TaskMapper; -import com.bonus.sgzb.material.service.BackApplyService; import com.bonus.sgzb.material.service.LeaseRecordService; -import com.bonus.sgzb.material.vo.GlobalContants; -import com.bonus.sgzb.material.vo.TypeTreeBuild; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.Set; /** * @author hay 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 48e0ecf2..13e46092 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 @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.service.impl; +import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.security.utils.SecurityUtils; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index afd58e87..b2095054 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.stream.Collectors; import cn.hutool.core.bean.BeanUtil; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.common.core.constant.TaskTypeConstants; import com.bonus.sgzb.common.core.enums.ReviewStatusEnum; import com.bonus.sgzb.common.core.enums.ScrapSourceEnum; @@ -22,13 +23,10 @@ import com.bonus.sgzb.material.exception.ExceptionDict; import com.bonus.sgzb.material.mapper.*; import com.bonus.sgzb.material.service.IScrapApplyDetailsService; import com.bonus.sgzb.material.vo.ForecastWasteExcel; -import com.bonus.sgzb.material.vo.GlobalContants; import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO; import com.bonus.sgzb.material.vo.ScrapAudit; import lombok.extern.slf4j.Slf4j; -import org.apache.catalina.security.SecurityUtil; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java index 75ea5081..61baf546 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java @@ -6,9 +6,8 @@ import java.util.List; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringHelper; -import com.bonus.sgzb.material.domain.BackApplyInfo; +import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.material.domain.TmTask; -import com.bonus.sgzb.material.vo.GlobalContants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.sgzb.material.mapper.TaskMapper; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index b7cdc59f..0d03f257 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -3,9 +3,7 @@ package com.bonus.sgzb.material.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.bonus.sgzb.base.api.domain.*; -import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; -import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.BackRecordMapper; @@ -13,13 +11,11 @@ import com.bonus.sgzb.material.mapper.LeaseRecordMapper; import com.bonus.sgzb.material.mapper.WorkSiteDirectManageMapper; import com.bonus.sgzb.material.service.*; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.util.ArrayList; import java.util.Date; import java.util.List; 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 a75411c5..c50305d3 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 @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into tm_task ( task_type, task_status, @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + insert into back_apply_info ( @@ -403,7 +403,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT bai.id, bai.`code`, @@ -461,7 +461,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY bai.create_time desc - SELECT subquery1.type_id as typeId, subquery1.typeName typeCode, subquery1.typeNames as typeName, @@ -528,7 +528,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY create_time DESC LIMIT 1 - SELECT bai.back_person AS backPerson, bai.phone AS phone, @@ -610,7 +610,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEVEL ASC; - SELECT bai.`code`, bai.back_person as backPerson, @@ -658,7 +658,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY bai.task_id desc - SELECT bai.id, bai.`code`, @@ -732,7 +732,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (SELECT * FROM back_apply_info bai2 WHERE bai2.id = #{id}) dd on bai1.task_id = dd.task_id - SELECT bai.back_person AS backPerson, bai.phone AS phone, @@ -788,7 +788,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_name like concat('%', #{keyWord}, '%')) - SELECT bai.id, bai.`code`, @@ -851,7 +851,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY bai.create_time desc - select * from back_apply_info where task_id = #{taskId} - SELECT tta.agreement_id AS agreementId, bai.id, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index 7f7c9d94..0c476562 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -310,7 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) t GROUP BY task_id - SELECT mt2.type_name AS typeModelName, mt2.type_id as typeId, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml index dd46db4b..bf61716f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml @@ -331,7 +331,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where task_id = #{taskId} and status = '0' - select id, code, task_id as taskId, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml index 438ff712..68d57269 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INSERT INTO tm_task_agreement ( `task_id`, `agreement_id`, `create_by`, `create_time`, `company_id` ) VALUES(#{id},#{agreementId},#{createBy},NOW(),#{companyId}) - + insert into tm_task ( task_type, task_status, @@ -236,7 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE mt1.type_id = #{typeId} - SELECT mt.type_name AS typeModelName, mt.unit_name as unitName, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml index 41808474..e9e96866 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml @@ -299,7 +299,7 @@ NOW() - + insert into tm_task ( task_type, task_status,