From 4f620f444f523c0da2a10bcebe897b2b7fd06499 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Fri, 15 Dec 2023 12:34:21 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SupplierdeliverRecordDetailController.java | 16 ++--- .../SupplierdeliverRecordDetailMapper.java | 6 ++ .../SupplierdeliverRecordDetailService.java | 7 ++ ...upplierdeliverRecordDetailServiceImpl.java | 23 +++++++ ...SupplierdeliverRequestMainServiceImpl.java | 64 +++++++++---------- 5 files changed, 75 insertions(+), 41 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java index 67fdec3d..b7a67384 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java @@ -119,13 +119,13 @@ public class SupplierdeliverRecordDetailController { ExcelUtils.write(response, "供应商发货记录子.xls", "数据", SupplierdeliverRecordDetailExcelVO.class, datas); } -// @GetMapping("/allList") -// @Operation(summary = "高级搜索获得供应商发货记录子信息") -// @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-detail:allList')") -// public CommonResult> selectAllList(@RequestParam String number) { -// List list = supplierdeliverRecordDetailService.selectAllList(number); -// List result = SupplierdeliverRecordDetailConvert.INSTANCE.convertList(list); -// return success(result); -// } + @GetMapping("/allList") + @Operation(summary = "高级搜索获得供应商发货记录子信息") + @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-detail:allList')") + public CommonResult> selectAllList(@RequestParam String asnNumber) { + List list = supplierdeliverRecordDetailService.selectAllList(asnNumber); + List result = SupplierdeliverRecordDetailConvert.INSTANCE.convertList(list); + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java index 32e5cba9..63c2e5e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java @@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailPageReqVO; +import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -107,4 +108,9 @@ public interface SupplierdeliverRecordDetailMapper extends BaseMapperX selectAllList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(SupplierdeliverRecordDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java index 113612c7..32f2bb36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java @@ -78,4 +78,11 @@ public interface SupplierdeliverRecordDetailService { */ List getSupplierdeliverRecordDetailList(SupplierdeliverRecordDetailExportReqVO exportReqVO); + /** + * 高级搜索获得供应商发货记录子信息 + * @param asnNumber + * @return + */ + List selectAllList( String asnNumber); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java index 3522238a..fd4e5667 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java @@ -1,13 +1,20 @@ package com.win.module.wms.service.supplierdeliverRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; +import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordMainMapper; import org.springframework.stereotype.Service; + import javax.annotation.Resource; + import org.springframework.validation.annotation.Validated; import java.util.*; @@ -32,6 +39,8 @@ public class SupplierdeliverRecordDetailServiceImpl implements SupplierdeliverRe @Resource private SupplierdeliverRecordDetailMapper supplierdeliverRecordDetailMapper; + @Resource + private SupplierdeliverRecordMainMapper supplierdeliverRecordMainMapper; @Override public Long createSupplierdeliverRecordDetail(SupplierdeliverRecordDetailCreateReqVO createReqVO) { @@ -50,10 +59,12 @@ public class SupplierdeliverRecordDetailServiceImpl implements SupplierdeliverRe SupplierdeliverRecordDetailDO updateObj = SupplierdeliverRecordDetailConvert.INSTANCE.convert(updateReqVO); supplierdeliverRecordDetailMapper.updateById(updateObj); } + @Override public PageResult getSupplierdeliverRecordDetailSenior(CustomConditions conditions) { return supplierdeliverRecordDetailMapper.selectSenior(conditions); } + @Override public void deleteSupplierdeliverRecordDetail(Long id) { // 校验存在 @@ -88,4 +99,16 @@ public class SupplierdeliverRecordDetailServiceImpl implements SupplierdeliverRe return supplierdeliverRecordDetailMapper.selectList(exportReqVO); } + @Override + public List selectAllList(String asnNumber) { + List supplierdeliverRecordDetailDOList = new ArrayList<>(); + QueryWrapper supplierdeliverRecordMainDOQueryWrapper = new QueryWrapper<>(); + supplierdeliverRecordMainDOQueryWrapper.eq("asn_number", asnNumber); + SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = supplierdeliverRecordMainMapper.selectOne(supplierdeliverRecordMainDOQueryWrapper); + if (supplierdeliverRecordMainDO != null) { + supplierdeliverRecordDetailDOList = supplierdeliverRecordDetailMapper.selectAllList(supplierdeliverRecordMainDO.getId()); + } + return supplierdeliverRecordDetailDOList; + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index e122a710..fa83ac9d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -12,6 +12,10 @@ import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailCreateReqVO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainCreateReqVO; +import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO; +import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; @@ -50,6 +54,7 @@ import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.packageMassage.PackageService; import com.win.module.wms.service.purchase.PurchaseMainService; import com.win.module.wms.service.purchasePlan.PurchasePlanMainService; +import com.win.module.wms.service.purchasereceiptRequest.PurchasereceiptRequestMainService; import com.win.module.wms.service.requestsetting.RequestsettingService; import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.service.shift.ShiftService; @@ -124,6 +129,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq private PurchaseMainService purchaseMainService; @Resource private LocationService locationService; + @Resource + PurchasereceiptRequestMainService purchasereceiptRequestMainService; @Override @Transactional @@ -710,18 +717,10 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq supplierdeliverRecordDetailDO.setUpdateTime(null); supplierdeliverRecordDetailMapper.insert(supplierdeliverRecordDetailDO); } - //生成采购收货申请 叶佳兴 - PurchasereceiptRequestMainDO purchasereceiptRequestMainDO = new PurchasereceiptRequestMainDO(); - BeanUtils.copyProperties(mainDO, purchasereceiptRequestMainDO); - String number2 = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); - purchasereceiptRequestMainDO.setNumber(number2); - purchasereceiptRequestMainDO.setId(null); - purchasereceiptRequestMainDO.setCreator(null); - purchasereceiptRequestMainDO.setCreateTime(null); - purchasereceiptRequestMainDO.setUpdater(null); - purchasereceiptRequestMainDO.setUpdateTime(null); - purchasereceiptRequestMainMapper.insert(purchasereceiptRequestMainDO); + PurchasereceiptRequestMainCreateReqVO purchasereceiptRequestMainCreateReqVO = new PurchasereceiptRequestMainCreateReqVO(); + BeanUtils.copyProperties(mainDO, purchasereceiptRequestMainCreateReqVO); + List purchasereceiptRequestDetailCreateReqVOList = new ArrayList<>(); for (SupplierdeliverRequestDetailDO detailDO : detailDOList) { //包装 QueryWrapper packageDOQueryWrapper = new QueryWrapper(); @@ -731,30 +730,20 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq packageDOQueryWrapper.eq("item_code", detailDO.getItemCode()); List packageDOList = packageMapper.selectList(packageDOQueryWrapper); for (PackageDO packageDO : packageDOList) { - PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO = new PurchasereceiptRequestDetailDO(); + PurchasereceiptRequestDetailCreateReqVO purchasereceiptRequestDetailCreateReqVO = new PurchasereceiptRequestDetailCreateReqVO(); //供应商子表 - BeanUtils.copyProperties(detailDO, purchasereceiptRequestDetailDO); - purchasereceiptRequestDetailDO.setMasterId(purchasereceiptRequestMainDO.getId()); - purchasereceiptRequestDetailDO.setNumber(number2); - purchasereceiptRequestDetailDO.setContainerNumber(null); - purchasereceiptRequestDetailDO.setBatch(packageDO.getBatch()); - purchasereceiptRequestDetailDO.setAltBatch(packageDO.getAltBatch()); - purchasereceiptRequestDetailDO.setArriveDate(detailDO.getArriveDate()); - purchasereceiptRequestDetailDO.setProduceDate(packageDO.getProduceDate()); - purchasereceiptRequestDetailDO.setExpireDate(packageDO.getExpireDate()); - purchasereceiptRequestDetailDO.setPackingNumber(packageDO.getNumber()); - purchasereceiptRequestDetailDO.setInventoryStatus("INS"); - purchasereceiptRequestDetailDO.setFromLocationCode(null); + BeanUtils.copyProperties(detailDO, purchasereceiptRequestDetailCreateReqVO); + purchasereceiptRequestDetailCreateReqVO.setBatch(packageDO.getBatch()); + purchasereceiptRequestDetailCreateReqVO.setAltBatch(packageDO.getAltBatch()); + purchasereceiptRequestDetailCreateReqVO.setArriveDate(detailDO.getArriveDate()); + purchasereceiptRequestDetailCreateReqVO.setProduceDate(packageDO.getProduceDate()); + purchasereceiptRequestDetailCreateReqVO.setExpireDate(packageDO.getExpireDate()); + purchasereceiptRequestDetailCreateReqVO.setPackingNumber(packageDO.getNumber()); + purchasereceiptRequestDetailCreateReqVO.setInventoryStatus("INS"); SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), detailDO.getItemCode()); - purchasereceiptRequestDetailDO.setDefaultToLocationCode(supplieritemDO.getDefaultLocationCode()); - purchasereceiptRequestDetailDO.setRemark(null); - purchasereceiptRequestDetailDO.setSiteId(null); - purchasereceiptRequestDetailDO.setId(null); - purchasereceiptRequestDetailDO.setCreator(null); - purchasereceiptRequestDetailDO.setCreateTime(null); - purchasereceiptRequestDetailDO.setUpdater(null); - purchasereceiptRequestDetailDO.setUpdateTime(null); - purchasereceiptRequestDetailMapper.insert(purchasereceiptRequestDetailDO); + purchasereceiptRequestDetailCreateReqVO.setDefaultToLocationCode(supplieritemDO.getDefaultLocationCode()); + purchasereceiptRequestDetailCreateReqVO.setId(null); + purchasereceiptRequestDetailCreateReqVOList.add(purchasereceiptRequestDetailCreateReqVO); } //更新要货计划的已发货数量 purchasePlanMainService.updatePlanPurchaseShippedQty(detailDO.getNumber(), mainDO.getPpNumber(), detailDO.getPoLine() @@ -762,6 +751,15 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq //更新要货计划的已发货数量 purchaseMainService.updateOrderPurchaseShippedQty(detailDO.getPoNumber(), detailDO.getPoLine(), detailDO.getItemCode(), detailDO.getQty()); } + purchasereceiptRequestMainCreateReqVO.setId(null); + purchasereceiptRequestMainCreateReqVO.setCreateTime(null); + purchasereceiptRequestMainCreateReqVO.setCreator(null); + purchasereceiptRequestMainCreateReqVO.setUpdateTime(null); + purchasereceiptRequestMainCreateReqVO.setUpdater(null); + purchasereceiptRequestMainCreateReqVO.setSubList(purchasereceiptRequestDetailCreateReqVOList); + if(!purchasereceiptRequestDetailCreateReqVOList.isEmpty()) { + purchasereceiptRequestMainService.createPurchasereceiptRequestMain(purchasereceiptRequestMainCreateReqVO); + } SupplierdeliverRequestMainDO supplierdeliverRequestMain = supplierdeliverRequestMainMapper.selectById(id); supplierdeliverRequestMain.setStatus(RequestStatusEnum.COMPLETED.getCode());