Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@@ -354,6 +354,7 @@ public interface ErrorCodeConstants {
     //标签定义ErrorCode
     ErrorCode LABLE_TYPE_NOT_EXISTS = new ErrorCode(1_000_059_000, "标签定义不存在");
     ErrorCode LABLE_AND_PACK_TYPE_NOT_EXISTS = new ErrorCode(1_000_059_000, "包装和标签已存在,无法再次生成");
+    ErrorCode LABLE_AND_PACK_TYPE_NO_EXISTS = new ErrorCode(1_000_059_000, "包装和标签不存在,请生成标签后再进行处理操作");
     //条码片段ErrorCode
     ErrorCode BARCODE_NOT_EXISTS = new ErrorCode(1_000_060_000, "条码片段不存在");
     ErrorCode BARCODE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_060_001, "导入条码片段不能为空");

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java

@@ -233,4 +233,20 @@ public class CountRequestMainController {
         return success(count > 0);
     }
 
+    @PutMapping("/reCount")
+    @Operation(summary = "重盘")
+    @PreAuthorize("@ss.hasPermission('wms:count-request-main:reCount')")
+    public CommonResult<Boolean> createReCountJob(@Valid @RequestBody CountRequestMainUpdateReqVO updateReqVO) {
+        int result = countRequestMainService.createReCountJob(updateReqVO);
+        return success(result > 0);
+    }
+
+    @PutMapping("/supervise")
+    @Operation(summary = "监盘")
+    @PreAuthorize("@ss.hasPermission('wms:count-request-main:supervise')")
+    public CommonResult<Boolean> createSuperviseCountJob(@Valid @RequestBody CountRequestMainUpdateReqVO updateReqVO) {
+        int result = countRequestMainService.createSuperviseCountJob(updateReqVO);
+        return success(result > 0);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java

@@ -81,4 +81,16 @@ public class CountRequestMainBaseVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+
+    @Schema(description = "初盘任务状态")
+    private String jobStatus1;
+
+    @Schema(description = "重盘任务状态")
+    private String jobStatus2;
+
+    @Schema(description = "监盘任务状态")
+    private String jobStatus3;
+
+    @Schema(description = "生成盘点调整状态")
+    private String countAdjustStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainUpdateReqVO.java

@@ -1,12 +1,24 @@
 package com.win.module.wms.controller.countRequest.vo;
 
+import com.win.framework.excel.core.annotations.SubObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 盘点申请主更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CountRequestMainUpdateReqVO extends CountRequestMainBaseVO {
 
+    @Schema(description = "类型")
+    private String type;
+
+    @Schema(description = "数量")
+    private Integer count;
+
+    @SubObject
+    @Schema(description = "子表数据")
+    private List<CountRequestDetailUpdateReqVO> subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java

@@ -3,6 +3,7 @@ package com.win.module.wms.controller.index;
 import com.win.framework.common.pojo.CommonResult;
 import com.win.module.wms.service.purchase.PurchaseMainService;
 import com.win.module.wms.service.purchasePlan.PurchasePlanMainService;
+import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
@@ -26,15 +27,20 @@ public class IndexController {
     private PurchaseMainService purchaseMainService;
     @Resource
     private PurchasePlanMainService purchasePlanMainService;
+    @Resource
+    private SupplierdeliverRecordMainService supplierdeliverRecordMainService;
 
     @GetMapping("/index")
     @Operation(summary = "开放订单数")
     public CommonResult<Map<String, Object>> index() {
         Map<String, Object> dataMap = new HashMap<>();
-        dataMap.put("openPurchaseNum", purchaseMainService.getPurchaseCount(true));
-        dataMap.put("allPurchaseNum", purchaseMainService.getPurchaseCount(false));
-        dataMap.put("openPurchasePlanNum", purchasePlanMainService.getPurchasePlanCount(true));
-        dataMap.put("allPurchasePlanNum", purchasePlanMainService.getPurchasePlanCount(false));
+        dataMap.put("openPurchaseCount", purchaseMainService.getPurchaseCount(true));//开放订单数
+        dataMap.put("allPurchaseCount", purchaseMainService.getPurchaseCount(false));//全部订单数
+        dataMap.put("openPurchasePlanCount", purchasePlanMainService.getPurchasePlanCount(true));//开放计划数
+        dataMap.put("allPurchasePlanCount", purchasePlanMainService.getPurchasePlanCount(false));//全部计划数
+        dataMap.put("takeSupplierdeliverCount", supplierdeliverRecordMainService.getSupplierdeliverCount(true));//已收货订单数
+        dataMap.put("notTakeSupplierdeliverCount", supplierdeliverRecordMainService.getSupplierdeliverCount(false));//未收货订单数
+        dataMap.put("supplierdeliverMonthCount", supplierdeliverRecordMainService.getSupplierdeliverMonthCount());//本月发货单趋势
         return success(dataMap);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java

@@ -143,14 +143,14 @@ public class InspectJobMainController {
     public CommonResult<InspectJobMainRespVO> getInspectJobById(@RequestParam("id") Long id) {
         InspectJobMainDO inspectJobMain = inspectJobMainService.getInspectJobMain(id);
         InspectJobMainRespVO result = InspectJobMainConvert.INSTANCE.convert(inspectJobMain);
-        if(result==null) {
-            return success(result);
-        };
+        if(result == null) {
+            return success(null);
+        }
         InspectJobDetailExportReqVO inspectJobDetailExportReqVO = new InspectJobDetailExportReqVO();
         inspectJobDetailExportReqVO.setMasterId(result.getId());
         List<InspectJobDetailDO> inspectJobDetailList = inspectJobDetailService.getInspectJobDetailList(inspectJobDetailExportReqVO);
-        List<InspectJobDetailExcelVO> inspectJobDetailExcelVOS = InspectJobDetailConvert.INSTANCE.convertList02(inspectJobDetailList);
-        result.setSubList(inspectJobDetailExcelVOS);
+        List<InspectJobDetailRespVO> inspectJobDetailRespVOList = InspectJobDetailConvert.INSTANCE.convertList(inspectJobDetailList);
+        result.setSubList(inspectJobDetailRespVOList);
         return success(result);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainRespVO.java

@@ -12,5 +12,5 @@ import java.util.List;
 public class InspectJobMainRespVO extends InspectJobMainBaseVO {
 
     @Schema(description = "检验任务任务子表job_inspect_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List subList;
+    private List<InspectJobDetailRespVO> subList;
 }

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countRequest/CountRequestDetailConvert.java

@@ -35,6 +35,8 @@ public interface CountRequestDetailConvert {
 
     List<CountRequestDetailDO> convertList03(List<CountRequestDetailCreateReqVO> list);
 
+    List<CountRequestDetailDO> convertList04(List<CountRequestDetailUpdateReqVO> list);
+
     CountRequestDetailCreateReqVO convert1(CountRequestDetailDO bean);
 
     @Mappings({

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java

@@ -79,8 +79,6 @@ public class CountRequestMainDO extends BaseDO {
     private String departmentCode;
     /**
      * 状态
-     *
-     * 枚举 {@link TODO request_status 对应的类}
      */
     private String status;
     /**
@@ -107,5 +105,20 @@ public class CountRequestMainDO extends BaseDO {
      * 直接生成记录
      */
     private String directCreateRecord;
-
+    /**
+     * 初盘任务状态
+     */
+    private String jobStatus1;
+    /**
+     * 重盘任务状态
+     */
+    private String jobStatus2;
+    /**
+     * 监盘任务状态
+     */
+    private String jobStatus3;
+    /**
+     * 生成盘点调整状态1不可生成2可生成3已生成4不需要生成
+     */
+    private String countAdjustStatus;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestDetailMapper.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.mysql.countRequest;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
@@ -48,9 +49,40 @@ public interface CountRequestDetailMapper extends BaseMapperX<CountRequestDetail
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
 
+    /**
+     * 根据主表id查询全部
+     * @param masterId 主表id
+     * @return 子表数据
+     */
     default List<CountRequestDetailDO> selectList(Long masterId) {
         return selectList(new LambdaQueryWrapperX<CountRequestDetailDO>()
                 .eq(CountRequestDetailDO::getMasterId, masterId));
     }
 
+    /**
+     * 根据主表id随机查询
+     * @param masterId 主表id
+     * @param count 查询数量
+     * @return 子表数据
+     */
+    default List<CountRequestDetailDO> selectList(Long masterId, int count) {
+        QueryWrapper<CountRequestDetailDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("master_id", masterId);
+        queryWrapper.orderByDesc("RAND()");
+        queryWrapper.last("LIMIT " + count);
+        return selectList(queryWrapper);
+    }
+
+    /**
+     * 根据主表id随机查询
+     * @param masterId 主表id
+     * @return 子表数据
+     */
+    default List<CountRequestDetailDO> selectDifferenceList(Long masterId, String requestNumber) {
+        QueryWrapper<CountRequestDetailDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("master_id", masterId);
+        queryWrapper.inSql("", "SELECT d1.count_detail_number FROM record_count_detail d1,(SELECT master_id,count_detail_number,MAX(create_time) create_time FROM record_count_detail WHERE master_id IN(SELECT id FROM record_count_main WHERE request_number='" + requestNumber + "')GROUP BY master_id,count_detail_number) d2 WHERE d1.master_id=d2.master_id AND d1.count_detail_number=d2.count_detail_number AND d1.create_time=d2.create_time AND d1.qty!=d1.count_qty");
+        return selectList(queryWrapper);
+    }
+
 }

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/countRequest/CountRequestMainService.java

@@ -115,5 +115,18 @@ public interface CountRequestMainService {
      * @return 更新数量
      */
     Integer abortCountRequestMain(Long id);
-
+    /**
+     * 生成重盘任务
+     *
+     * @param updateReqVO 盘点申请
+     * @return 更新数量
+     */
+    Integer createReCountJob(CountRequestMainUpdateReqVO updateReqVO);
+    /**
+     * 生成监盘务
+     *
+     * @param updateReqVO 盘点申请
+     * @return 更新数量
+     */
+    Integer createSuperviseCountJob(CountRequestMainUpdateReqVO updateReqVO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@@ -311,6 +311,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             throw new ServiceException(COUNT_REQUEST_CANNOT_HANDLE);
         }
         mainDO.setStatus(requestStatusState.getState().getCode());
+        mainDO.setJobStatus1("1");
         //调用执行方法
         this.generateJob(mainDO, countRequestDetailMapper.selectList(mainDO.getId()));
         trendsApi.createTrends(id, "countRequest", "执行了盘点申请", TrendsTypeEnum.UPDATE);
@@ -332,6 +333,38 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
         return countRequestMainMapper.updateById(mainDO);
     }
 
+    @Override
+    public Integer createReCountJob(CountRequestMainUpdateReqVO updateReqVO) {
+        CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO);
+        mainDO.setStage("RECOUNT");//重盘
+        mainDO.setJobStatus2("1");
+        List<CountRequestDetailDO> detailDOList;
+        if(updateReqVO.getType().equals("1")) {//全部
+            detailDOList = countRequestDetailMapper.selectList(updateReqVO.getId());
+        } else if(updateReqVO.getType().equals("2")) {//差异
+            detailDOList = countRequestDetailMapper.selectDifferenceList(updateReqVO.getId(), updateReqVO.getNumber());
+        } else {//选择
+            detailDOList = CountRequestDetailConvert.INSTANCE.convertList04(updateReqVO.getSubList());
+        }
+        this.generateJob(mainDO, detailDOList);
+        return countRequestMainMapper.updateById(mainDO);
+    }
+
+    @Override
+    public Integer createSuperviseCountJob(CountRequestMainUpdateReqVO updateReqVO) {
+        CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO);
+        mainDO.setStage("AUDIT_COUNT");//监盘
+        mainDO.setJobStatus2("1");
+        List<CountRequestDetailDO> detailDOList;
+        if(updateReqVO.getType().equals("1")) {//数量
+            detailDOList = countRequestDetailMapper.selectList(updateReqVO.getId(), updateReqVO.getCount());
+        } else {//选择
+            detailDOList = CountRequestDetailConvert.INSTANCE.convertList04(updateReqVO.getSubList());
+        }
+        this.generateJob(mainDO, detailDOList);
+        return countRequestMainMapper.updateById(mainDO);
+    }
+
     /**
      * 生成盘点任务
      * @param mainDO 盘点申请主

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@@ -35,6 +35,7 @@ import com.win.module.wms.enums.job.JobStatusState;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.documentSwitch.SwitchService;
 import com.win.module.wms.service.expectin.ExpectinService;
+import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.putawayRequest.PutawayRequestMainService;
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
@@ -85,6 +86,8 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
     @Resource
     private TransactionService transactionService;
     @Resource
+    private ExpectoutService expectoutService;
+    @Resource
     private ExpectinService expectinService;
     @Resource
     private BalanceMapper balanceMapper;
@@ -287,6 +290,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
                 BeanUtils.copyProperties(transactionCreateReqVOIn, transactionCreateReqVO);
                 transactionCreateReqVO.setInventoryStatus("SCRAP");
                 transactionCreateReqVO.setQty(inspectJobDetailUpdateReqVO.getCrackQty());
+                transactionCreateReqVO.setLocationCode("HOLD");
                 transactionCreateReqVOList.add(transactionCreateReqVO);
             }
             if (inspectJobDetailUpdateReqVO.getFailedQty() != null && inspectJobDetailUpdateReqVO.getFailedQty().compareTo(BigDecimal.ZERO) > 0) {
@@ -294,6 +298,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
                 BeanUtils.copyProperties(transactionCreateReqVOIn, transactionCreateReqVO);
                 transactionCreateReqVO.setInventoryStatus("NOK");
                 transactionCreateReqVO.setQty(inspectJobDetailUpdateReqVO.getFailedQty());
+                transactionCreateReqVO.setLocationCode("HOLD");
                 transactionCreateReqVOList.add(transactionCreateReqVO);
             }
             //添加库存事务出list
@@ -372,7 +377,9 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             //增加库存事务
             transactionService.createTransaction(transactionCreateReqVOList);
         }
-        //移除预计入
+        //移除预计出
+        expectoutService.deleteExpectoutByJobNumber(inspectJobMainDO.getNumber());
+        //移除预计出
         expectinService.deleteExpectinByJobNumber(inspectJobMainDO.getNumber());
         //上架申请子
         SwitchDO switchDO = switchService.selectSwitchExist("CreatePutawayRequestAfterInspectRecordCreated");
@@ -382,7 +389,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             BeanUtils.copyProperties(inspectRecordMainDO, putawayRequestMainCreateReqVO);
             List<PutawayRequestDetailCreateReqVO> putawayRequestDetailCreateReqVOList = new ArrayList<>();
             for(InspectJobDetailUpdateReqVO inspectJobDetailUpdateReqVO : inspectJobDetailUpdateReqVOList) {
-                if(!inspectJobDetailUpdateReqVO.getToInventoryStatus().equals("OK")) {
+                if(inspectJobDetailUpdateReqVO.getGoodQty().compareTo(BigDecimal.ZERO) <= 0) {
                     continue;
                 }
                 PutawayRequestDetailCreateReqVO putawayRequestDetailCreateReqVO = new PutawayRequestDetailCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -16,6 +16,7 @@ import com.win.module.system.api.dict.DictDataApi;
 import com.win.module.system.api.dict.dto.DictDataRespDTO;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
+import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
 import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
 import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO;
 import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO;
@@ -44,6 +45,7 @@ import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestMainMapper;
 import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
+import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.location.LocationService;
@@ -111,6 +113,8 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
     private InspectRecordDetailMapper inspectRecordDetailMapper;
     @Resource
     private ExpectoutService expectoutService;
+    @Resource
+    private ExpectinService expectinService;
 
     @Override
     @Transactional
@@ -394,6 +398,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             return;
         }
         List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
+        List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>();
         InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO);
         inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
         inspectJobMainDO.setRequestNumber(mainDO.getNumber());
@@ -433,10 +438,22 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             expectoutCreateReqVO.setLocationCode(inspectJobDetailDO.getFromLocationCode());
             expectoutCreateReqVO.setOwnerCode(mainDO.getOwnerCode());
             expectoutCreateReqVOList.add(expectoutCreateReqVO);
+            //预计入
+            ExpectinCreateReqVO expectinCreateReqVO = new ExpectinCreateReqVO();
+            BeanUtils.copyProperties(inspectJobDetailDO, expectinCreateReqVO);
+            expectinCreateReqVO.setId(null);
+            expectinCreateReqVO.setJobNumber(number);
+            expectinCreateReqVO.setBatch(inspectJobMainDO.getBatch());
+            expectinCreateReqVO.setBusinessType(inspectJobMainDO.getBusinessType());
+            expectinCreateReqVO.setLocationCode(inspectJobDetailDO.getFromLocationCode());
+            expectinCreateReqVO.setOwnerCode(mainDO.getOwnerCode());
+            expectinCreateReqVOList.add(expectinCreateReqVO);
         }
         inspectJobDetailMapper.insertBatch(inspectJobDetailDOList);
         //增加预计出
         expectoutService.createExpectout(expectoutCreateReqVOList);
+        //增加预计出
+        expectinService.createExpectin(expectinCreateReqVOList);
         trendsApi.createTrends(inspectJobMainDO.getId(), "purchasereceiptJob", "到货检验申请生成到货检验任务", TrendsTypeEnum.CREATE);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java

@@ -164,7 +164,7 @@ public interface PurchaseMainService {
     void updateOrderPurchaseReturnQty(String poNumber , String poLine, String itemCode, BigDecimal returnedQty);
 
     /**
-     * 放订单数
+     * 首页查询订单数
      * @param isOpen 是否开放true开放false全部
      * @return
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java

@@ -530,7 +530,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
                 if (businesstypeDO != null) {
                     purchasePlanMainDO.setBusinessType(businesstypeDO.getCode());
                 }
-                purchasePlanMainDO.setNumber(mainDO.getNumber());
+                String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PLAN.getCode());
+                purchasePlanMainDO.setNumber(number);
                 purchasePlanMainDO.setAvailable("TRUE");
                 //供应商代码
                 purchasePlanMainDO.setSupplierCode(mainDO.getSupplierCode());
@@ -558,6 +559,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
                 for (PurchaseDetailDO purchaseDetailDO : purchasePlanDetailDOList) {
                     PurchasePlanDetailDO purchasePlanDetailDO = new PurchasePlanDetailDO();
                     purchasePlanDetailDO.setMasterId(purchasePlanMainDO.getId());
+                    purchasePlanDetailDO.setNumber(number);
                     purchasePlanDetailDO.setPlanQty(purchaseDetailDO.getOrderQty());
                     purchasePlanDetailDO.setPoNumber(purchaseDetailDO.getNumber());
                     purchasePlanDetailDO.setPoLine(purchaseDetailDO.getLineNumber());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java

@@ -222,8 +222,9 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
     //校验子表公共方法(适用于新增/修改)
     private void validatorDetailMethod(PurchasePlanDetailDO detailDo, PurchasePlanMainDO mainDo) {
         this.validatorItembasic(detailDo.getItemCode());
-        this.validatorSupplierItemExist(mainDo.getSupplierCode(),detailDo.getItemCode());
+        this.validatorSupplierItemExist(mainDo.getSupplierCode(), detailDo.getItemCode());
     }
+
     @Override
     @Transactional
     public List<PurchasePlanMainImportErrorVO> importPurchasePlanMainList(List<PurchasePlanMainCreateReqVO> datas, Integer mode, boolean updatePart) {
@@ -268,7 +269,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
                     detailDO.setNumber(mainDo.getNumber());
                     detailDO.setShippedQty(BigDecimal.ZERO);
                     detailDO.setAvailable("TRUE");
-                    DictDataRespDTO uom =  dictDataApi.selectDictTypeAndLabel(DictTypeConstants.UOM,detailDO.getUom());
+                    DictDataRespDTO uom = dictDataApi.selectDictTypeAndLabel(DictTypeConstants.UOM, detailDO.getUom());
                     detailDO.setUom(uom.getValue());
                     //选择已发布状态下订单号、订单行、零件号  判断订单类型
                     QueryWrapper<PurchaseDetailDO> purchaseDetailDOQueryWrapper = new QueryWrapper<>();
@@ -276,7 +277,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
                     purchaseDetailDOQueryWrapper.eq("item_code", detailDO.getItemCode());
                     purchaseDetailDOQueryWrapper.eq("line_number ", detailDO.getPoLine());
                     PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(purchaseDetailDOQueryWrapper);
-                    if(purchaseDetailDO!=null){
+                    if (purchaseDetailDO != null) {
                         PurchaseMainDO purchaseMainDO = purchaseMainService.getPurchaseMain(purchaseDetailDO.getMasterId());
                         //如果是离散单
                         if ("DISCRETE".equals(purchaseMainDO.getType())) {
@@ -333,6 +334,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
         }
         return messageDetail;
     }
+
     //新增校验
     private PurchasePlanMainDO validatorToCreate(PurchasePlanMainCreateReqVO createReqVO) {
         PurchasePlanMainDO purchasePlanMainDO = validatorMainMethod(createReqVO);
@@ -353,7 +355,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
             purchaseDetailDOQueryWrapper.eq("item_code", purchasePlanDetailDO.getItemCode());
             purchaseDetailDOQueryWrapper.eq("line_number ", purchasePlanDetailDO.getPoLine());
             PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(purchaseDetailDOQueryWrapper);
-            if(purchaseDetailDO!=null){
+            if (purchaseDetailDO != null) {
                 PurchaseMainDO purchaseMainDO = purchaseMainService.getPurchaseMain(purchaseDetailDO.getMasterId());
                 //如果是离散单
                 if ("DISCRETE".equals(purchaseMainDO.getType())) {
@@ -451,35 +453,22 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
         QueryWrapper<PurchasePlanMainDO> purchasePlanMainDOQueryWrapper = new QueryWrapper<>();
         purchasePlanMainDOQueryWrapper.eq("number", poNumber);
         purchasePlanMainDOQueryWrapper.eq("status", PurchasePlanStatusEnum.ACCEPTED.getCode());
-        List<PurchasePlanMainDO> purchasePlanMainDOList = purchasePlanMainMapper.selectList(purchasePlanMainDOQueryWrapper);
-        if (purchasePlanMainDOList != null && !purchasePlanMainDOList.isEmpty()) {
-            for (PurchasePlanMainDO purchasePlanMainDO : purchasePlanMainDOList) {
-                int i = 0;
-                QueryWrapper<PurchasePlanDetailDO> purchasePlanDetailDOQueryWrapper = new QueryWrapper<>();
-                purchasePlanDetailDOQueryWrapper.eq("number", poNumber);
-                purchasePlanDetailDOQueryWrapper.eq("po_line", poLine);
-                purchasePlanDetailDOQueryWrapper.eq("item_code", itemCode);
-                purchasePlanDetailDOQueryWrapper.eq("available", "TRUE");
-                List<PurchasePlanDetailDO> purchasePlanDetailDOList = purchasePlanDetailMapper.selectList(purchasePlanDetailDOQueryWrapper);
-                if (purchasePlanDetailDOList != null && !purchasePlanDetailDOList.isEmpty()) {
-                    for (PurchasePlanDetailDO purchasePlanDetailDO : purchasePlanDetailDOList) {
-                        purchasePlanDetailDO.setShippedQty(shippedQty);
-                        if (purchasePlanDetailDO.getPlanQty().compareTo(purchasePlanDetailDO.getShippedQty()) == 0) {
-                            purchasePlanDetailDO.setAvailable("FALSE");
-                        }
-                        purchasePlanDetailMapper.updateById(purchasePlanDetailDO);
-                    }
-                    for (PurchasePlanDetailDO purchasePlanDetailDO : purchasePlanDetailDOList) {
-                        if ("TRUE".equals(purchasePlanDetailDO.getAvailable())) {
-                            i = 1;
-                        }
-                    }
-                }
-                if (i == 0) {
-                    purchasePlanMainDO.setStatus(PurchasePlanStatusEnum.COMPLETED.getCode());
+        PurchasePlanMainDO purchasePlanMainDO = purchasePlanMainMapper.selectOne(purchasePlanMainDOQueryWrapper);
+        if (purchasePlanMainDO != null) {
+            QueryWrapper<PurchasePlanDetailDO> purchasePlanDetailDOQueryWrapper = new QueryWrapper<>();
+            purchasePlanDetailDOQueryWrapper.eq("number", poNumber);
+            purchasePlanDetailDOQueryWrapper.eq("po_line", poLine);
+            purchasePlanDetailDOQueryWrapper.eq("item_code", itemCode);
+            purchasePlanDetailDOQueryWrapper.eq("available", "TRUE");
+            List<PurchasePlanDetailDO> purchasePlanDetailDOList = purchasePlanDetailMapper.selectList(purchasePlanDetailDOQueryWrapper);
+            for (PurchasePlanDetailDO purchasePlanDetailDO : purchasePlanDetailDOList) {
+                purchasePlanDetailDO.setShippedQty(shippedQty);
+                if (purchasePlanDetailDO.getPlanQty().compareTo(purchasePlanDetailDO.getShippedQty()) == 0) {
+                    purchasePlanDetailDO.setAvailable("FALSE");
                 }
-                purchasePlanMainMapper.updateById(purchasePlanMainDO);
+                purchasePlanDetailMapper.updateById(purchasePlanDetailDO);
             }
+            //叶佳兴
         } else {
             throw new ServiceException(PURCHASE_PLAN_DETAIL_ACCEPTED);
         }
@@ -489,7 +478,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
     public long getPurchasePlanCount(boolean isOpen) {
         QueryWrapper<PurchasePlanMainDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("available", "TRUE");
-        if(isOpen) {
+        if (isOpen) {
             queryWrapper.ne("status", OrderStatusEnum.CLOSED.getCode());
         }
         return purchasePlanMainMapper.selectCount(queryWrapper);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@@ -300,10 +300,12 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 purchasereceiptRecordDetailDO.setQty(purchasereceiptJobDetailUpdateReqVOTemp.getHandleQty());
                 purchasereceiptRecordDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
                 purchasereceiptRecordDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
-                LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
-                purchasereceiptRecordDetailDO.setFromAreaCode(locationDO1.getAreaCode());
-                purchasereceiptRecordDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode());
-                LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
+                if(purchasereceiptJobDetailDO.getFromLocationCode() != null && !purchasereceiptJobDetailDO.getFromLocationCode().isEmpty()) {
+                    LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
+                    purchasereceiptRecordDetailDO.setFromAreaCode(locationDO1.getAreaCode());
+                    purchasereceiptRecordDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode());
+                }
+                LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getToLocationCode());
                 purchasereceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode());
                 purchasereceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
                 PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode());
@@ -350,10 +352,12 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 purchaseshortageDetailDO.setToPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
                 purchaseshortageDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
                 purchaseshortageDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
-                LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
-                purchaseshortageDetailDO.setFromAreaCode(locationDO1.getAreaCode());
-                purchaseshortageDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode());
-                LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
+                if(purchasereceiptJobDetailDO.getFromLocationCode() != null && !purchasereceiptJobDetailDO.getFromLocationCode().isEmpty()) {
+                    LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
+                    purchaseshortageDetailDO.setFromAreaCode(locationDO1.getAreaCode());
+                    purchaseshortageDetailDO.setFromLocationGroupCode(locationDO1.getLocationGroupCode());
+                }
+                LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getToLocationCode());
                 purchaseshortageDetailDO.setToAreaCode(locationDO2.getAreaCode());
                 purchaseshortageDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
                 PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@@ -423,6 +423,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
             for(PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO : detailDOList) {
                 PurchasereceiptRecordDetailCreateReqVO purchasereceiptRecordDetailCreateReqVO = new PurchasereceiptRecordDetailCreateReqVO();
                 BeanUtils.copyProperties(purchasereceiptRequestDetailDO, purchasereceiptRecordDetailCreateReqVO);
+                purchasereceiptRecordDetailCreateReqVO.setToLocationCode(purchasereceiptRequestDetailDO.getDefaultToLocationCode());
                 purchasereceiptRecordDetailCreateReqVO.setNumber(number);
                 purchasereceiptRecordDetailMapper.insert(PurchasereceiptRecordDetailConvert.INSTANCE.convert(purchasereceiptRecordDetailCreateReqVO));
             }
@@ -540,7 +541,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
                 BeanUtils.copyProperties(purchasereceiptJobDetailDO, expectinCreateReqVO);
                 expectinCreateReqVO.setJobNumber(number);
                 expectinCreateReqVO.setBusinessType(purchasereceiptJobMainDO.getBusinessType());
-                expectinCreateReqVO.setLocationCode(purchasereceiptJobDetailDO.getFromLocationCode());
+                expectinCreateReqVO.setLocationCode(purchasereceiptJobDetailDO.getToLocationCode());
                 expectinCreateReqVO.setOwnerCode(purchasereceiptJobDetailDO.getFromOwnerCode());
                 expectinCreateReqVOList.add(expectinCreateReqVO);
             }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@@ -474,15 +474,15 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         detailDo.setItemDesc2(itembasicDO.getDesc2());
         detailDo.setItemName(itembasicDO.getName());
         detailDo.setProjectCode(itembasicDO.getProject());
-        this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom());
-        validatorLocation(detailDo.getFromLocationCode());
-        if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) {
-            PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
-            PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
-            mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber());
-            mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber());
-            ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
-        }
+//        this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom());
+//        validatorLocation(detailDo.getFromLocationCode());
+//        if(mainDo.getPurchaseReceiptRecordNumber() != null && !mainDo.getPurchaseReceiptRecordNumber().isEmpty()) {
+//            PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
+//            PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
+//            mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber());
+//            mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber());
+//            ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
+//        }
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
         List<String> inventoryStatusList = Arrays.asList(businesstypeDO.getOutInventoryStatuses().split(","));
         BigDecimal bigDecimal = validatorBalance(detailDo, mainDo, inventoryStatusList);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@@ -329,7 +329,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             //增加业务类型
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayRecord");
             putawayRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
-            int result = putawayRecordMainMapper.insert(PutawayRecordMainConvert.INSTANCE.convert(putawayRecordMainCreateReqVO));
+            putawayRecordMainMapper.insert(PutawayRecordMainConvert.INSTANCE.convert(putawayRecordMainCreateReqVO));
             for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {
                 PutawayRecordDetailCreateReqVO putawayRecordDetailCreateReqVO = new PutawayRecordDetailCreateReqVO();
                 BeanUtils.copyProperties(putawayRequestDetailDO, putawayRecordDetailCreateReqVO);
@@ -359,6 +359,11 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         putawayJobMainDO.setBusinessType(businesstypeDO.getCode());
         putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
         putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
+        putawayJobMainDO.setId(null);
+        putawayJobMainDO.setCreateTime(null);
+        putawayJobMainDO.setCreator(null);
+        putawayJobMainDO.setUpdateTime(null);
+        putawayJobMainDO.setUpdater(null);
         putawayJobMainMapper.insert(putawayJobMainDO);
         List<PutawayJobDetailDO> putawayJobDetailDOList = new ArrayList<>();
         for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {
@@ -367,7 +372,12 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
             LocationDO locationDO = locationService.inspectLocation(groundingRuleRespVO, putawayRequestDetailDO.getItemCode(), putawayJobDetailDO.getBatch(), putawayJobDetailDO.getInventoryStatus());
             putawayJobDetailDO.setToLocationCode(locationDO.getCode());
             putawayJobDetailDO.setNumber(number);
-            putawayJobDetailDO.setMasterId(putawayJobDetailDO.getId());
+            putawayJobDetailDO.setMasterId(putawayJobMainDO.getId());
+            putawayJobDetailDO.setId(null);
+            putawayJobDetailDO.setCreateTime(null);
+            putawayJobDetailDO.setCreator(null);
+            putawayJobDetailDO.setUpdateTime(null);
+            putawayJobDetailDO.setUpdater(null);
             putawayJobDetailDOList.add(putawayJobDetailDO);
             //预计出
             ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO();

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/supplierdeliverRecord/SupplierdeliverRecordMainService.java

@@ -1,16 +1,18 @@
 package com.win.module.wms.service.supplierdeliverRecord;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 供应商发货记录主 Service 接口
@@ -91,4 +93,17 @@ public interface SupplierdeliverRecordMainService {
      * @return 供应商发货记录子
      */
     public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pasnNumber, String pitemCode, String ppoNumber, String ppoLine);
+
+    /**
+     * 首页查询收货订单数
+     * @param isTake 是否收货true已收货false全部
+     * @return 收货订单数
+     */
+    long getSupplierdeliverCount(boolean isTake);
+
+    /**
+     * 本月发货单趋势
+     * @return 每天发货数量
+     */
+    List<Map<String , Object>> getSupplierdeliverMonthCount();
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java

@@ -3,26 +3,27 @@ package com.win.module.wms.service.supplierdeliverRecord;
 import cn.hutool.core.exceptions.UtilException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO;
+import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMainConvert;
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
+import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO;
 import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordDetailMapper;
+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.*;
-
-import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMainConvert;
-import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordMainMapper;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.SUPPLIERDELIVER_RECORD_MAIN_NOT_EXISTS;
 
 /**
  * 供应商发货记录主 Service 实现类
@@ -55,10 +56,12 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco
         SupplierdeliverRecordMainDO updateObj = SupplierdeliverRecordMainConvert.INSTANCE.convert(updateReqVO);
         supplierdeliverRecordMainMapper.updateById(updateObj);
     }
+
     @Override
     public PageResult<SupplierdeliverRecordMainDO> getSupplierdeliverRecordMainSenior(CustomConditions conditions) {
         return supplierdeliverRecordMainMapper.selectSenior(conditions);
     }
+
     @Override
     public void deleteSupplierdeliverRecordMain(Long id) {
         // 校验存在
@@ -92,27 +95,52 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco
     public List<SupplierdeliverRecordMainDO> getSupplierdeliverRecordMainList(SupplierdeliverRecordMainExportReqVO exportReqVO) {
         return supplierdeliverRecordMainMapper.selectList(exportReqVO);
     }
+
     @Override
-    public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("asn_number",pasnNumber);
-        queryWrapper.eq("supplier_code",psupplierCode);
+    public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode, String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) {
+        QueryWrapper<SupplierdeliverRecordMainDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("asn_number", pasnNumber);
+        queryWrapper.eq("supplier_code", psupplierCode);
         SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = supplierdeliverRecordMainMapper.selectOne(queryWrapper);
-        if(supplierdeliverRecordMainDO != null && "TRUE".equals(supplierdeliverRecordMainDO.getAvailable())){
-            QueryWrapper queryWrapper1 = new QueryWrapper();
-            queryWrapper1.eq("master_id",supplierdeliverRecordMainDO.getId());
-            queryWrapper1.eq("item_code",pitemCode);
-            queryWrapper1.eq("po_number",ppoNumber);
-            queryWrapper1.eq("po_line",ppoLine);
+        if (supplierdeliverRecordMainDO != null && "TRUE".equals(supplierdeliverRecordMainDO.getAvailable())) {
+            QueryWrapper<SupplierdeliverRecordDetailDO> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("master_id", supplierdeliverRecordMainDO.getId());
+            queryWrapper1.eq("item_code", pitemCode);
+            queryWrapper1.eq("po_number", ppoNumber);
+            queryWrapper1.eq("po_line", ppoLine);
             SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordDetailMapper.selectOne(queryWrapper1);
-            if(supplierdeliverRecordDetailDO != null){
+            if (supplierdeliverRecordDetailDO != null) {
                 return supplierdeliverRecordDetailDO;
-            }else {
-                throw new UtilException( "供应商发货明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效");
+            } else {
+                throw new UtilException("供应商发货明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效");
 
             }
-        }else {
-            throw new UtilException( "发货订单" + pasnNumber + "无效");
+        } else {
+            throw new UtilException("发货订单" + pasnNumber + "无效");
         }
     }
+
+    @Override
+    public long getSupplierdeliverCount(boolean isTake) {
+        QueryWrapper<SupplierdeliverRecordMainDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("available", "TRUE");
+        if (isTake) {
+            queryWrapper.inSql("asn_number", "SELECT asn_number FROM record_purchasereceipt_main WHERE available='TRUE'");
+        } else {
+            queryWrapper.notInSql("asn_number", "SELECT asn_number FROM record_purchasereceipt_main WHERE available='TRUE'");
+        }
+        return supplierdeliverRecordMainMapper.selectCount(queryWrapper);
+    }
+
+    @Override
+    public List<Map<String , Object>> getSupplierdeliverMonthCount() {
+        LocalDateTime endTime = LocalDateTime.now();
+        LocalDateTime beginTime = endTime.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).withNano(0);
+        QueryWrapper<SupplierdeliverRecordMainDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("DATE_FORMAT(create_time, '%Y-%m-%d') `date`", "count(1) c");
+        queryWrapper.between("create_time", beginTime, endTime);
+        queryWrapper.groupBy("`date`");
+        queryWrapper.orderByAsc("`date`");
+        return supplierdeliverRecordMainMapper.selectMaps(queryWrapper);
+    }
 }

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
@@ -353,6 +360,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
             supplierdeliverRequestDetailDO.setCreateTime(null);
             supplierdeliverRequestDetailDO.setUpdater(null);
             supplierdeliverRequestDetailDO.setUpdateTime(null);
+            ItembasicDO itembasicDO = itembasicService.selectItembasic(supplierdeliverRequestDetailDO.getItemCode());
+            supplierdeliverRequestDetailDO.setItemName(itembasicDO.getName());
         }
         supplierdeliverRequestDetailMapper.insertBatch(subDOList);
         return supplierdeliverRequestMainDO;
@@ -655,6 +664,13 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         QueryWrapper<SupplierdeliverRequestMainDO> queryWrapper = new QueryWrapper();
         queryWrapper.eq("id", id);
         SupplierdeliverRequestMainDO mainDO = supplierdeliverRequestMainMapper.selectOne(queryWrapper);
+        //判断ASN单号 是否重复，如果重复不生成
+        QueryWrapper<PackageDO> doQueryWrapper = new QueryWrapper();
+        doQueryWrapper.eq("asn_number", mainDO.getAsnNumber());
+        Long count = packageMapper.selectCount(doQueryWrapper);
+        if (count == 0) {
+            throw exception(LABLE_AND_PACK_TYPE_NO_EXISTS);
+        }
         //子表
         QueryWrapper<SupplierdeliverRequestDetailDO> supplierdeliverRequestDetailDOQueryWrapper = new QueryWrapper();
         supplierdeliverRequestDetailDOQueryWrapper.eq("master_id", id);
@@ -683,11 +699,13 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
             SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = new SupplierdeliverRecordDetailDO();
             BeanUtils.copyProperties(supplierdeliverRequestDetailDO, supplierdeliverRecordDetailDO);
             supplierdeliverRecordDetailDO.setNumber(number);
+            ItembasicDO itembasicDO = itembasicService.selectItembasic(supplierdeliverRecordDetailDO.getItemCode());
+            supplierdeliverRecordDetailDO.setItemName(itembasicDO.getName());
             supplierdeliverRecordDetailDO.setMasterId(supplierdeliverRecordMainDO.getId());
             supplierdeliverRecordDetailDO.setFromPackingNumber("");
             supplierdeliverRecordDetailDO.setToPackingNumber("");
-            supplierdeliverRecordDetailDO.setFromBatch("");
-            supplierdeliverRecordDetailDO.setToBatch("");
+            supplierdeliverRecordDetailDO.setFromBatch(supplierdeliverRequestDetailDO.getBatch());
+            supplierdeliverRecordDetailDO.setToBatch(supplierdeliverRequestDetailDO.getBatch());
             supplierdeliverRecordDetailDO.setAltBatch("");
             supplierdeliverRecordDetailDO.setFromContainerNumber("");
             supplierdeliverRecordDetailDO.setToContainerNumber("");
@@ -703,18 +721,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<PurchasereceiptRequestDetailCreateReqVO> purchasereceiptRequestDetailCreateReqVOList = new ArrayList<>();
         for (SupplierdeliverRequestDetailDO detailDO : detailDOList) {
             //包装
             QueryWrapper<PackageDO> packageDOQueryWrapper = new QueryWrapper();
@@ -724,30 +734,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();
-                purchasereceiptRequestDetailDO.setMasterId(purchasereceiptRequestMainDO.getId());
-                purchasereceiptRequestDetailDO.setNumber(number2);
+                PurchasereceiptRequestDetailCreateReqVO purchasereceiptRequestDetailCreateReqVO = new PurchasereceiptRequestDetailCreateReqVO();
                 //供应商子表
-                BeanUtils.copyProperties(detailDO, purchasereceiptRequestDetailDO);
-                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("INSP");
                 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()
@@ -755,6 +755,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());