BUG修改

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")
+    @GetMapping("/allList")
-//    @Operation(summary = "高级搜索获得供应商发货记录子信息")
+    @Operation(summary = "高级搜索获得供应商发货记录子信息")
-//    @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-detail:allList')")
+    @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-detail:allList')")
-//    public CommonResult<List<SupplierdeliverRecordDetailRespVO>> selectAllList(@RequestParam String number) {
+    public CommonResult<List<SupplierdeliverRecordDetailRespVO>> selectAllList(@RequestParam String asnNumber) {
-//        List<SupplierdeliverRecordDetailDO> list = supplierdeliverRecordDetailService.selectAllList(number);
+        List<SupplierdeliverRecordDetailDO> list = supplierdeliverRecordDetailService.selectAllList(asnNumber);
-//        List<SupplierdeliverRecordDetailRespVO> result = SupplierdeliverRecordDetailConvert.INSTANCE.convertList(list);
+        List<SupplierdeliverRecordDetailRespVO> result = SupplierdeliverRecordDetailConvert.INSTANCE.convertList(list);
-//        return success(result);
+        return success(result);
-//    }
+    }
 
 }

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<Supplierd
                 .orderByDesc(SupplierdeliverRecordDetailDO::getId));
     }
 
+    default List<SupplierdeliverRecordDetailDO> selectAllList(Long masterId) {
+        return selectList(new LambdaQueryWrapperX<SupplierdeliverRecordDetailDO>()
+                .eq(SupplierdeliverRecordDetailDO::getMasterId, masterId));
+    }
+
 }

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<SupplierdeliverRecordDetailDO> getSupplierdeliverRecordDetailList(SupplierdeliverRecordDetailExportReqVO exportReqVO);
 
+    /**
+     * 高级搜索获得供应商发货记录子信息
+     * @param asnNumber
+     * @return
+     */
+    List<SupplierdeliverRecordDetailDO> selectAllList( String asnNumber);
+
 }

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<SupplierdeliverRecordDetailDO> 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<SupplierdeliverRecordDetailDO> selectAllList(String asnNumber) {
+        List<SupplierdeliverRecordDetailDO> supplierdeliverRecordDetailDOList = new ArrayList<>();
+        QueryWrapper<SupplierdeliverRecordMainDO> supplierdeliverRecordMainDOQueryWrapper = new QueryWrapper<>();
+        supplierdeliverRecordMainDOQueryWrapper.eq("asn_number", asnNumber);
+        SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = supplierdeliverRecordMainMapper.selectOne(supplierdeliverRecordMainDOQueryWrapper);
+        if (supplierdeliverRecordMainDO != null) {
+            supplierdeliverRecordDetailDOList = supplierdeliverRecordDetailMapper.selectAllList(supplierdeliverRecordMainDO.getId());
+        }
+        return supplierdeliverRecordDetailDOList;
+    }
+
 }

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();
+        PurchasereceiptRequestMainCreateReqVO purchasereceiptRequestMainCreateReqVO = new PurchasereceiptRequestMainCreateReqVO();
-        BeanUtils.copyProperties(mainDO, purchasereceiptRequestMainDO);
+        BeanUtils.copyProperties(mainDO, purchasereceiptRequestMainCreateReqVO);
-        String number2 = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode());
+        List<PurchasereceiptRequestDetailCreateReqVO> purchasereceiptRequestDetailCreateReqVOList = new ArrayList<>();
-        purchasereceiptRequestMainDO.setNumber(number2);
-        purchasereceiptRequestMainDO.setId(null);
-        purchasereceiptRequestMainDO.setCreator(null);
-        purchasereceiptRequestMainDO.setCreateTime(null);
-        purchasereceiptRequestMainDO.setUpdater(null);
-        purchasereceiptRequestMainDO.setUpdateTime(null);
-        purchasereceiptRequestMainMapper.insert(purchasereceiptRequestMainDO);
         for (SupplierdeliverRequestDetailDO detailDO : detailDOList) {
             //包装
             QueryWrapper<PackageDO> packageDOQueryWrapper = new QueryWrapper();
@@ -731,30 +730,20 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
             packageDOQueryWrapper.eq("item_code", detailDO.getItemCode());
             List<PackageDO> packageDOList = packageMapper.selectList(packageDOQueryWrapper);
             for (PackageDO packageDO : packageDOList) {
-                PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO = new PurchasereceiptRequestDetailDO();
+                PurchasereceiptRequestDetailCreateReqVO purchasereceiptRequestDetailCreateReqVO = new PurchasereceiptRequestDetailCreateReqVO();
                 //供应商子表
-                BeanUtils.copyProperties(detailDO, purchasereceiptRequestDetailDO);
+                BeanUtils.copyProperties(detailDO, purchasereceiptRequestDetailCreateReqVO);
-                purchasereceiptRequestDetailDO.setMasterId(purchasereceiptRequestMainDO.getId());
+                purchasereceiptRequestDetailCreateReqVO.setBatch(packageDO.getBatch());
-                purchasereceiptRequestDetailDO.setNumber(number2);
+                purchasereceiptRequestDetailCreateReqVO.setAltBatch(packageDO.getAltBatch());
-                purchasereceiptRequestDetailDO.setContainerNumber(null);
+                purchasereceiptRequestDetailCreateReqVO.setArriveDate(detailDO.getArriveDate());
-                purchasereceiptRequestDetailDO.setBatch(packageDO.getBatch());
+                purchasereceiptRequestDetailCreateReqVO.setProduceDate(packageDO.getProduceDate());
-                purchasereceiptRequestDetailDO.setAltBatch(packageDO.getAltBatch());
+                purchasereceiptRequestDetailCreateReqVO.setExpireDate(packageDO.getExpireDate());
-                purchasereceiptRequestDetailDO.setArriveDate(detailDO.getArriveDate());
+                purchasereceiptRequestDetailCreateReqVO.setPackingNumber(packageDO.getNumber());
-                purchasereceiptRequestDetailDO.setProduceDate(packageDO.getProduceDate());
+                purchasereceiptRequestDetailCreateReqVO.setInventoryStatus("INS");
-                purchasereceiptRequestDetailDO.setExpireDate(packageDO.getExpireDate());
-                purchasereceiptRequestDetailDO.setPackingNumber(packageDO.getNumber());
-                purchasereceiptRequestDetailDO.setInventoryStatus("INS");
-                purchasereceiptRequestDetailDO.setFromLocationCode(null);
                 SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), detailDO.getItemCode());
-                purchasereceiptRequestDetailDO.setDefaultToLocationCode(supplieritemDO.getDefaultLocationCode());
+                purchasereceiptRequestDetailCreateReqVO.setDefaultToLocationCode(supplieritemDO.getDefaultLocationCode());
-                purchasereceiptRequestDetailDO.setRemark(null);
+                purchasereceiptRequestDetailCreateReqVO.setId(null);
-                purchasereceiptRequestDetailDO.setSiteId(null);
+                purchasereceiptRequestDetailCreateReqVOList.add(purchasereceiptRequestDetailCreateReqVO);
-                purchasereceiptRequestDetailDO.setId(null);
-                purchasereceiptRequestDetailDO.setCreator(null);
-                purchasereceiptRequestDetailDO.setCreateTime(null);
-                purchasereceiptRequestDetailDO.setUpdater(null);
-                purchasereceiptRequestDetailDO.setUpdateTime(null);
-                purchasereceiptRequestDetailMapper.insert(purchasereceiptRequestDetailDO);
             }
             //更新要货计划的已发货数量
             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());