From 2886d4946beb5123e3c1e127116c8775092c27c4 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Tue, 20 Feb 2024 14:01:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseAccessoryController.java | 21 +++ .../PurchaseCheckInfoController.java | 11 ++ .../PurchaseMacodeInfoController.java | 4 +- .../material/domain/PurchaseMacodeInfo.java | 11 ++ .../material/domain/PurchasePartDetails.java | 24 +++ .../mapper/PurchaseAccessoryMapper.java | 52 ++++-- .../mapper/PurchaseCheckDetailsMapper.java | 7 + .../mapper/PurchaseMacodeInfoMapper.java | 7 + .../service/IPurchaseAccessoryService.java | 15 ++ .../service/IPurchaseCheckInfoService.java | 7 + .../service/IPurchaseMacodeInfoService.java | 6 + .../impl/PurchaseAccessoryServiceImpl.java | 86 ++++++--- .../impl/PurchaseCheckInfoServiceImpl.java | 14 ++ .../impl/PurchaseMacodeInfoServiceImpl.java | 7 +- .../material/PurchaseAccessoryMapper.xml | 165 ++++++++++++++---- .../material/PurchaseCheckDetailsMapper.xml | 30 ++++ .../material/PurchaseMacodeInfoMapper.xml | 92 +++++++++- 17 files changed, 476 insertions(+), 83 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java index da42d4ef..cb708a4d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java @@ -53,6 +53,17 @@ public class PurchaseAccessoryController extends BaseController return success(purchaseAccessoryService.selectPurchasePartInfoByTaskId(taskId,keyWord)); } + /** + * 获取新购配件验收单 + */ + @ApiOperation("获取新购配件验收单") + @GetMapping(value = "/getAcceptanceForm") + public AjaxResult getAcceptanceForm(@RequestParam(required = false) Long taskId, + @RequestParam(required = false) String keyWord) + { + return success(purchaseAccessoryService.getAcceptanceForm(taskId,keyWord)); + } + /** * 新增新购配件任务 */ @@ -144,6 +155,16 @@ public class PurchaseAccessoryController extends BaseController return getDataTable(purchaseAccessoryService.selectPutinDetails(purchasePartDetails)); } + /** + * 获取新购配件入库单 + */ + @ApiOperation(value = "获取新购配件入库单") + @GetMapping(value = "/warehousingEntry") + public AjaxResult warehousingEntry(PurchasePartDetails purchasePartDetails) + { + return success(purchaseAccessoryService.warehousingEntry(purchasePartDetails)); + } + /** * 新购配件入库审核 */ 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 6937c81d..31bc3fc7 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 @@ -92,6 +92,17 @@ public class PurchaseCheckInfoController extends BaseController return success(purchaseCheckInfoService.selectPurchaseCheckInfoByTaskId(taskId,keyWord)); } + /** + * 获取新购验收任务--验收单 + */ + @ApiOperation("获取新购验收任务验收单") + @GetMapping(value = "/getAcceptanceForm") + public AjaxResult getAcceptanceForm(@RequestParam(required = false) Long taskId, + @RequestParam(required = false) String keyWord) + { + return success(purchaseCheckInfoService.getAcceptanceForm(taskId,keyWord)); + } + /** * 新增新购验收任务 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index b29bca26..84673054 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -78,13 +78,13 @@ public class PurchaseMacodeInfoController extends BaseController } /** - * 获取新购验收编号管理详细信息--用于入库单，不带分页 + * 获取新购入库单 */ @ApiOperation(value = "入库单") @GetMapping(value = "/warehousingEntry") public AjaxResult warehousingEntry(PurchaseMacodeInfo purchaseMacodeInfo) { - return success(purchaseMacodeInfoService.selectPutinDetails(purchaseMacodeInfo)); + return success(purchaseMacodeInfoService.warehousingEntry(purchaseMacodeInfo)); } /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java index 231c70c2..5c9bb831 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java @@ -89,6 +89,9 @@ public class PurchaseMacodeInfo extends BaseEntity @ApiModelProperty(value = "关键字筛选") private String keyWord; + @ApiModelProperty(value = "关键字筛选") + private String dictName; + @ApiModelProperty(value = "规格编码") private String specsCode; @@ -313,6 +316,14 @@ public class PurchaseMacodeInfo extends BaseEntity this.rfidCode = rfidCode; } + public String getDictName() { + return dictName; + } + + public void setDictName(String dictName) { + this.dictName = dictName; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java index 8bf9cad6..301d04e5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java @@ -33,8 +33,16 @@ public class PurchasePartDetails extends BaseEntity /** 规格id */ @ApiModelProperty(value = "规格id") + private Long typeId; + + /** 规格id */ + @ApiModelProperty(value = "类型id") private Long modelId; + /** 规格id */ + @ApiModelProperty(value = "类型id") + private Long deviceTypeId; + @ApiModelProperty(value = "采购单号") @Excel(name = "采购单号") private String code; @@ -432,6 +440,22 @@ public class PurchasePartDetails extends BaseEntity this.purchaserName = purchaserName; } + public Long getTypeId() { + return typeId; + } + + public void setTypeId(Long typeId) { + this.typeId = typeId; + } + + public Long getDeviceTypeId() { + return deviceTypeId; + } + + public void setDeviceTypeId(Long deviceTypeId) { + this.deviceTypeId = deviceTypeId; + } + @Override public String getCreateBy() { return createBy; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java index be3c6dd1..7dfdb6ed 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseAccessoryMapper.java @@ -38,28 +38,29 @@ public interface PurchaseAccessoryMapper /** *查询新购配件任务验收列表 * @param purchasePartInfo - * @return + * @return 结果 */ List selectPurchasePartInfoList(PurchasePartInfo purchasePartInfo); /** * 查询 * @param taskId - * @return + * @param type + * @return String */ - String selectTypeNameByTaskId(Long taskId); + String selectTypeNameByTaskId(@Param("taskId") Long taskId,@Param("type") String type); /** * 查询 * @param taskId - * @return + * @return 结果 */ PurchasePartInfo selectPurchasePartInfoByTaskId(Long taskId); /** * 查询 * @param purchasePartDetails - * @return + * @return 结果 */ List selectPurchasePartDetailsList(PurchasePartDetails purchasePartDetails); @@ -94,17 +95,16 @@ public interface PurchaseAccessoryMapper /** * 修改 * @param purchasePartDetails - * @return + * @return 结果 */ int updatePurchasePartDetails(PurchasePartDetails purchasePartDetails); /** * 查询 * @param taskId - * @param status - * @return + * @return 结果 */ - int selectPurchasePartDetailsStatus(@Param("taskId") Long taskId,@Param("status") int status); + int selectPurchasePartDetailsStatus(@Param("taskId") Long taskId); /** * 获取配件信息 @@ -116,7 +116,7 @@ public interface PurchaseAccessoryMapper /** * 查询 * @param purchasePartDetails - * @return + * @return 结果 */ List selectPutinDetails(PurchasePartDetails purchasePartDetails); @@ -124,14 +124,14 @@ public interface PurchaseAccessoryMapper * 修改 * @param partId * @param inputNum - * @return + * @return 结果 */ int updatePartTypeNum(@Param("partId") Long partId,@Param("inputNum") BigDecimal inputNum); /** * 查询 * @param id - * @return + * @return 结果 */ int setlectStatusById(Long id); @@ -148,4 +148,32 @@ public interface PurchaseAccessoryMapper * @return List */ List inputExport(PurchasePartDetails bean); + + /** + * 判断是否全部已操作（不通过或通过） + * @param taskId + * @return int + */ + int isOperateAll(Long taskId); + + /** + * 是否为全部不通过 + * @param taskId + * @return 结果 + */ + int selectPurchasePartDetailsStatusIsNoPass(Long taskId); + + /** + * 新购验收单 + * @param purchasePartDetails + * @return 结果 + */ + List getAcceptanceForm(PurchasePartDetails purchasePartDetails); + + /** + * 新购入库单 + * @param purchasePartDetails + * @return 结果 + */ + List warehousingEntry(PurchasePartDetails purchasePartDetails); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java index b22646ba..908d2c44 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java @@ -135,4 +135,11 @@ public interface PurchaseCheckDetailsMapper { * @return int */ int updatePurchaseCheckDetailsByTaskId(@Param("taskId") Long taskId,@Param("typeId") Long typeId); + + /** + * 新购验收单 + * @param purchaseCheckDetails + * @return List + */ + List getAcceptanceForm(PurchaseCheckDetails purchaseCheckDetails); } 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 dbb1ba08..e3c80377 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 @@ -255,4 +255,11 @@ public interface PurchaseMacodeInfoMapper { * @return int */ int deleteMaLabelBindByMaId(Long maId); + + /** + * 新购入库单 + * @param purchaseMacodeInfo + * @return List + */ + List warehousingEntry(PurchaseMacodeInfo purchaseMacodeInfo); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseAccessoryService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseAccessoryService.java index 9c0a51d9..a5c7be13 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseAccessoryService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseAccessoryService.java @@ -101,4 +101,19 @@ public interface IPurchaseAccessoryService * @return List */ List inputExport(PurchasePartDetails bean); + + /** + * 新购配件验收单 + * @param taskId + * @param keyWord + * @return 结果 + */ + PurchasePartInfo getAcceptanceForm(Long taskId, String keyWord); + + /** + * 新购配件入库单 + * @param purchasePartDetails + * @return 结果 + */ + List warehousingEntry(PurchasePartDetails purchasePartDetails); } 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 3a5b6618..396bcbc9 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 @@ -91,4 +91,11 @@ public interface IPurchaseCheckInfoService * @return */ List putInExportList(PurchaseCheckInfo purchaseCheckInfo); + + /** + * + * @param + * @return + */ + PurchaseCheckInfo getAcceptanceForm(Long taskId, String keyWord); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java index 842a6661..52a1b76c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java @@ -106,4 +106,10 @@ public interface IPurchaseMacodeInfoService */ List selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo); + /** + * 新购入库单 + * @param purchaseMacodeInfo + * @return List + */ + List warehousingEntry(PurchaseMacodeInfo purchaseMacodeInfo); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java index 23fb9c1b..d569ab25 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java @@ -90,7 +90,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { public List selectPurchasePartInfoList(PurchasePartInfo purchasePartInfo) { List purchasePartInfos = purchaseAccessoryMapper.selectPurchasePartInfoList(purchasePartInfo); for (PurchasePartInfo partInfo : purchasePartInfos) { - String typeName = purchaseAccessoryMapper.selectTypeNameByTaskId(partInfo.getTaskId()); + String typeName = purchaseAccessoryMapper.selectTypeNameByTaskId(partInfo.getTaskId(),"1"); partInfo.setPurchasingTypeName(typeName); } return purchasePartInfos; @@ -170,7 +170,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { public List selectPutInListList(PurchasePartInfo purchasePartInfo) { List purchasePartInfos = purchaseAccessoryMapper.selectPutInListList(purchasePartInfo); for (PurchasePartInfo partInfo : purchasePartInfos) { - String typeName = purchaseAccessoryMapper.selectTypeNameByTaskId(partInfo.getTaskId()); + String typeName = purchaseAccessoryMapper.selectTypeNameByTaskId(partInfo.getTaskId(),"2"); partInfo.setPurchasingTypeName(typeName); } return purchasePartInfos; @@ -197,18 +197,27 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { throw new RuntimeException("验收失败,修改状态未成功"); } } - // 当全部为已验收,修改任务验收状态 - int status = 1; - int count = purchaseAccessoryMapper.selectPurchasePartDetailsStatus(taskId, status); - if (count <= 0) { - TmTask task = new TmTask(); - task.setTaskId(taskId); - task.setTaskStatus(69); - task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); - task.setUpdateTime(DateUtils.getNowDate()); - res = taskMapper.updateTmTask(task); - if (res == 0) { - throw new RuntimeException("验收失败,修改任务状态未成功"); + //判断是否全部已操作（不通过或通过） + int count=purchaseAccessoryMapper.isOperateAll(taskId); + if (count<=0){ + //是否为全部不通过 + int count1 = purchaseAccessoryMapper.selectPurchasePartDetailsStatusIsNoPass(taskId); + if (count1<=0){ + //是则将任务状态改为验收不通过 + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(71); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + taskMapper.updateTmTask(task); + }else { + // 当全部操作,修改任务为验收状态 + TmTask task = new TmTask(); + task.setTaskId(taskId); + task.setTaskStatus(69); + task.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + task.setUpdateTime(DateUtils.getNowDate()); + taskMapper.updateTmTask(task); } } } catch (Exception e) { @@ -224,6 +233,16 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { @Override public List selectPutinDetails(PurchasePartDetails purchasePartDetails) { + //因传入status=0时在SQL中处理有问题所以在此处理 + if (purchasePartDetails.getStatus()!=null){ + if (purchasePartDetails.getStatus()==0){ + purchasePartDetails.setStatus(1); + }else if (purchasePartDetails.getStatus()==1){ + purchasePartDetails.setStatus(3); + }else if (purchasePartDetails.getStatus()==2){ + purchasePartDetails.setStatus(4); + } + } return purchaseAccessoryMapper.selectPutinDetails(purchasePartDetails); } @@ -235,7 +254,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { Long taskId = 0L; for (PurchasePartDetails partDetails : purchasePartDetailsList) { taskId = partDetails.getTaskId(); - //暂时只处理审核通过的 + //处理审核通过的 if ("1".equals(partDetails.getCheckResult())) { partDetails.setStatus(3); partDetails.setInputNum(partDetails.getCheckNum()); @@ -245,7 +264,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { partDetails.setUpdateTime(DateUtils.getNowDate()); //查询该任务是否已审核 res = purchaseAccessoryMapper.setlectStatusById(partDetails.getId()); - if (res > 0) { + if (res <= 0) { res = purchaseAccessoryMapper.updatePurchasePartDetails(partDetails); if (res == 0) { throw new RuntimeException("审核入库失败,修改状态未成功"); @@ -254,17 +273,24 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { if (res == 0) { throw new RuntimeException("审核入库失败,修改配件库存未成功"); } - } else { - continue; } } else { - res = 1; + partDetails.setStatus(4); + partDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + partDetails.setUpdateTime(DateUtils.getNowDate()); + //查询该任务是否已审核 + res = purchaseAccessoryMapper.setlectStatusById(partDetails.getId()); + if (res <= 0) { + res = purchaseAccessoryMapper.updatePurchasePartDetails(partDetails); + if (res == 0) { + throw new RuntimeException("审核入库失败,修改状态未成功"); + } + } } } - // 当全部审核通过,修改任务入库状态 - int status = 3; - int count = purchaseAccessoryMapper.selectPurchasePartDetailsStatus(taskId, status); + // 当全部审核,修改任务入库状态 + int count = purchaseAccessoryMapper.selectPurchasePartDetailsStatus(taskId); if (count <= 0) { TmTask task = new TmTask(); task.setTaskId(taskId); @@ -292,6 +318,22 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { return purchaseAccessoryMapper.inputExport(bean); } + @Override + public PurchasePartInfo getAcceptanceForm(Long taskId, String keyWord) { + PurchasePartInfo purchasePartInfo = purchaseAccessoryMapper.selectPurchasePartInfoByTaskId(taskId); + PurchasePartDetails purchasePartDetails = new PurchasePartDetails(); + purchasePartDetails.setTaskId(purchasePartInfo.getTaskId()); + purchasePartDetails.setKeyWord(keyWord); + List purchasePartDetailsList = purchaseAccessoryMapper.getAcceptanceForm(purchasePartDetails); + purchasePartInfo.setPartDetailsList(purchasePartDetailsList); + return purchasePartInfo; + } + + @Override + public List warehousingEntry(PurchasePartDetails purchasePartDetails) { + return purchaseAccessoryMapper.warehousingEntry(purchasePartDetails); + } + /** * 新购配件--采购单号编码生成规则 */ 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 5b536f19..3fb7eb68 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 @@ -83,6 +83,20 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { return purchaseCheckInfoMapper.putInExportList(purchaseCheckInfo); } + /** + * 新购验收单 + */ + @Override + public PurchaseCheckInfo getAcceptanceForm(Long taskId, String keyword) { + PurchaseCheckInfo purchaseCheckInfo = purchaseCheckInfoMapper.selectPurchaseCheckInfoByTaskId(taskId); + PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails(); + purchaseCheckDetails.setTaskId(purchaseCheckInfo.getTaskId()); + purchaseCheckDetails.setKeyWord(keyword); + List purchaseCheckDetailsList = purchaseCheckDetailsMapper.getAcceptanceForm(purchaseCheckDetails); + purchaseCheckInfo.setCheckDetailsList(purchaseCheckDetailsList); + return purchaseCheckInfo; + } + /** * 查询新购验收任务列表 * diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 287d564f..e09605f7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -339,7 +339,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService } } - // 当全部为已入库的时候任务改为入库状态 + // 当全部审核的时候任务改为入库状态 Integer count = purchaseMacodeInfoMapper.selectMacodeInfoStatusByTaskId(taskId); if (count <= 0) { TmTask task = new TmTask(); @@ -389,4 +389,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService return purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo); } + @Override + public List warehousingEntry(PurchaseMacodeInfo purchaseMacodeInfo) { + return purchaseMacodeInfoMapper.warehousingEntry(purchaseMacodeInfo); + } + } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml index 02ac5b35..1ef46834 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml @@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" purchase_part_details WHERE id=#{id} - and `status`='1' + and (`status`='3' or `status`='4') @@ -221,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_part_type mpt on ppd.part_id = mpt.pa_id left join ma_part_type mpt1 on mpt.parent_id = mpt1.pa_id where ppd.task_id = #{taskId} + and ppd.`status`!=2 ) t GROUP BY task_id @@ -240,6 +241,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHEN pcd.`status` = 1 THEN '已验收' WHEN pcd.`status` = 2 THEN '验收不通过' WHEN pcd.`status` = 3 THEN '已入库' + WHEN pcd.`status` = 4 THEN '入库不通过' ELSE '' END AS statusResult, pcd.supplier_id, msi.supplier, pcd.create_by, pcd.production_time, pcd.create_time, @@ -293,7 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc SELECT pcd.id, - mt.pa_id as partId, - mt1.pa_id as modelId, - mt.pa_name specificationType, - mt1.pa_name typeName, - pcd.check_num as checkNum, - pcd.`status`, - CASE - WHEN pcd.`status` = 0 THEN '待验收' - WHEN pcd.`status` = 1 THEN '待入库' - WHEN pcd.`status` = 2 THEN '验收不通过' - WHEN pcd.`status` = 3 THEN '已入库' - ELSE '' - END AS statusResult, + mt.pa_id as partId, + mt1.pa_id as modelId, + mt.pa_name specificationType, + mt1.pa_name typeName, + pcd.check_num as checkNum, + pcd.`status`, + CASE + WHEN pcd.`status` = 0 THEN '待验收' + WHEN pcd.`status` = 1 THEN '待入库' + WHEN pcd.`status` = 2 THEN '验收不通过' + WHEN pcd.`status` = 3 THEN '已入库' + WHEN pcd.`status` = 4 THEN '入库不通过' + ELSE '' + END AS statusResult, - pcd.task_id taskId, + pcd.task_id taskId, - CASE tt.task_status - WHEN 70 THEN - tt.update_time - ELSE - '' - END as inputTime, - CASE tt.task_status - WHEN 70 THEN - us.user_name - ELSE - '' - END as inputBy + CASE tt.task_status + WHEN 70 THEN + tt.update_time + ELSE + '' + END as inputTime, + CASE tt.task_status + WHEN 70 THEN + us.user_name + ELSE + '' + END as inputBy FROM purchase_part_details pcd - LEFT JOIN ma_part_type mt ON pcd.part_id = mt.pa_id - LEFT JOIN ma_part_type mt1 ON mt.parent_id = mt1.pa_id - LEFT JOIN tm_task tt on tt.task_id = pcd.task_id - LEFT JOIN sys_user us on us.user_id = tt.update_by + LEFT JOIN ma_part_type mt ON pcd.part_id = mt.pa_id + LEFT JOIN ma_part_type mt1 ON mt.parent_id = mt1.pa_id + LEFT JOIN tm_task tt on tt.task_id = pcd.task_id + LEFT JOIN sys_user us on us.user_id = tt.update_by WHERE pcd.task_id = #{taskId} + and pcd.`status`!=2 - and (mt.pa_name like concat('%',#{keyWord},'%') or + and (mt.pa_name like concat('%',#{keyWord},'%') or mt1.pa_name like concat('%',#{keyWord},'%')) - - and mt1.pa_id = #{modelId} + + and mt1.pa_id = #{deviceTypeId} - - and mt.pa_id = #{partId} + + and mt.pa_id = #{typeId} + + + AND pcd.`status` = #{status} @@ -419,4 +426,88 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mpt2.pa_id in (#{partId}) ORDER BY tk.task_id DESC + + + + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml index 451e55b6..4630c466 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml @@ -212,6 +212,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE task_id = #{taskId} and status != 1 and status!=3 + delete from purchase_check_details where task_id = #{taskId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index 9c134137..cce006e9 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -351,17 +351,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + update ma_type set num = #{num} where type_id = #{typeId}