后端代码修改

win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/serialNumber/RuleCodeEnum.java

@@ -140,6 +140,7 @@ public enum RuleCodeEnum {
     INVENTORY_TRANSACTION("InventoryTransaction"), // 库存事务
     TRANSFER_LOG("TransferLog"),  // 库存转移日志
     PACKING_NUMBER("PackingNumber"),  // 包装号
+    CUSTOMER_DELIVER_NUMBER("CustomerDeliverNumber"),  // 客户发货单号
     ;
 
     private final String code;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java

@@ -21,7 +21,7 @@ public interface PurchasereceiptJobDetailMapper extends BaseMapperX<Purchaserece
 
     default PageResult<PurchasereceiptJobDetailDO> selectPage(PurchasereceiptJobDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereceiptJobDetailDO>()
-                .eq(PurchasereceiptJobDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PurchasereceiptJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PurchasereceiptJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PurchasereceiptJobDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java

@@ -21,7 +21,7 @@ public interface PurchasereceiptRecordDetailMapper extends BaseMapperX<Purchaser
 
     default PageResult<PurchasereceiptRecordDetailDO> selectPage(PurchasereceiptRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereceiptRecordDetailDO>()
-                .eq(PurchasereceiptRecordDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PurchasereceiptRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereceiptRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
                 .eqIfPresent(PurchasereceiptRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
                 .eqIfPresent(PurchasereceiptRecordDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java

@@ -21,7 +21,7 @@ public interface PurchasereceiptRequestDetailMapper extends BaseMapperX<Purchase
 
     default PageResult<PurchasereceiptRequestDetailDO> selectPage(PurchasereceiptRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereceiptRequestDetailDO>()
-                .eq(PurchasereceiptRequestDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PurchasereceiptRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PurchasereceiptRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PurchasereceiptRequestDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java

@@ -21,7 +21,7 @@ public interface PurchasereturnJobDetailMapper extends BaseMapperX<Purchaseretur
 
     default PageResult<PurchasereturnJobDetailDO> selectPage(PurchasereturnJobDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnJobDetailDO>()
-                .eq(PurchasereturnJobDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PurchasereturnJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereturnJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(PurchasereturnJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PurchasereturnJobDetailDO::getContainerNumber, reqVO.getContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java

@@ -21,7 +21,7 @@ public interface PurchasereturnRecordDetailMapper extends BaseMapperX<Purchasere
 
     default PageResult<PurchasereturnRecordDetailDO> selectPage(PurchasereturnRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnRecordDetailDO>()
-                .eq(PurchasereturnRecordDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PurchasereturnRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereturnRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
                 .eqIfPresent(PurchasereturnRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
                 .eqIfPresent(PurchasereturnRecordDetailDO::getFromContainerNumber, reqVO.getFromContainerNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java

@@ -21,7 +21,7 @@ public interface PurchasereturnRequestDetailMapper extends BaseMapperX<Purchaser
 
     default PageResult<PurchasereturnRequestDetailDO> selectPage(PurchasereturnRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnRequestDetailDO>()
-                .eq(PurchasereturnRequestDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PurchasereturnRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PurchasereturnRequestDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java

@@ -22,7 +22,7 @@ public interface PutawayJobDetailMapper extends BaseMapperX<PutawayJobDetailDO>
 
     default PageResult<PutawayJobDetailDO> selectPage(PutawayJobDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PutawayJobDetailDO>()
-                .eq(PutawayJobDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PutawayJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PutawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PutawayJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PutawayJobDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java

@@ -23,7 +23,7 @@ public interface PutawayRecordDetailMapper extends BaseMapperX<PutawayRecordDeta
 
     default PageResult<PutawayRecordDetailDO> selectPage(PutawayRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PutawayRecordDetailDO>()
-                .eq(PutawayRecordDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PutawayRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PutawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
                 .eqIfPresent(PutawayRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
                 .eqIfPresent(PutawayRecordDetailDO::getFromBatch, reqVO.getFromBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java

@@ -22,7 +22,7 @@ public interface PutawayRequestDetailMapper extends BaseMapperX<PutawayRequestDe
 
     default PageResult<PutawayRequestDetailDO> selectPage(PutawayRequestDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PutawayRequestDetailDO>()
-                .eq(PutawayRequestDetailDO::getMasterId, reqVO.getMasterId())
+                .eqIfPresent(PutawayRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(PutawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(PutawayRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(PutawayRequestDetailDO::getBatch, reqVO.getBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java

@@ -10,7 +10,6 @@ import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailCreateReqVO;
-import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestDetailRespVO;
 import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainCreateReqVO;
 import com.win.module.wms.controller.deliverJob.vo.DeliverJobDetailUpdateReqVO;
 import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO;
@@ -21,7 +20,6 @@ import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO;
-import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestMainDO;
 import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
 import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO;
 import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO;
@@ -29,11 +27,9 @@ import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO;
 import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
-import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
 import com.win.module.wms.dal.dataobject.sale.SaleDetailDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
 import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestDetailMapper;
-import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestMainMapper;
 import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordDetailMapper;
 import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordMainMapper;
 import com.win.module.wms.dal.mysql.deliverRequest.DeliverRequestMainMapper;
@@ -279,9 +275,19 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
         deliverRecordMainDO.setNumber(number);
         deliverRecordMainDO.setJobNumber(deliverJobMainDO.getNumber());
         deliverRecordMainDO.setId(null);
+        deliverRecordMainDO.setAvailable("TRUE");
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("DeliverJob");
         deliverRecordMainDO.setBusinessType(businesstypeDO.getCode());
         deliverRecordMainMapper.insert(deliverRecordMainDO);
+        //添加客户收货申请主表
+        CustomerreceiptRequestMainCreateReqVO customerreceiptRequestMainCreateReqVO = new CustomerreceiptRequestMainCreateReqVO();
+        BeanUtils.copyProperties(deliverJobMainDO, customerreceiptRequestMainCreateReqVO);
+        customerreceiptRequestMainCreateReqVO.setId(null);
+        customerreceiptRequestMainCreateReqVO.setCreator(null);
+        customerreceiptRequestMainCreateReqVO.setCreateTime(null);
+        customerreceiptRequestMainCreateReqVO.setUpdater(null);
+        customerreceiptRequestMainCreateReqVO.setUpdateTime(null);
+        customerreceiptRequestMainCreateReqVO.setDeliverRecordNumber(number);
         List<DeliverJobDetailUpdateReqVO> deliverJobDetailUpdateReqVOList = deliverJobMainUpdateReqVO.getSubList();
         List<DeliverRecordDetailDO> deliverRecordDetailDOList = new ArrayList<>();
         ArrayList<CustomerreceiptRequestDetailCreateReqVO> customerreceiptRequestDetailCreateReqVOS = new ArrayList<>();
@@ -359,15 +365,6 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService {
             });
         });
         deliverRecordDetailMapper.insertBatch(deliverRecordDetailDOList);
-        //添加客户收货申请主表
-        CustomerreceiptRequestMainCreateReqVO customerreceiptRequestMainCreateReqVO = new CustomerreceiptRequestMainCreateReqVO();
-        BeanUtils.copyProperties(deliverJobMainDO, customerreceiptRequestMainCreateReqVO);
-        customerreceiptRequestMainCreateReqVO.setId(null);
-        customerreceiptRequestMainCreateReqVO.setCreator(null);
-        customerreceiptRequestMainCreateReqVO.setCreateTime(null);
-        customerreceiptRequestMainCreateReqVO.setUpdater(null);
-        customerreceiptRequestMainCreateReqVO.setUpdateTime(null);
-        customerreceiptRequestMainCreateReqVO.setDeliverRequestNumber(deliverJobMainDO.getRequestNumber());
         customerreceiptRequestMainCreateReqVO.setSubList(customerreceiptRequestDetailCreateReqVOS);
         customerreceiptRequestMainService.createCustomerreceiptRequestMain(customerreceiptRequestMainCreateReqVO);
         List<String> typeList = new ArrayList<>();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java

@@ -433,6 +433,9 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService {
      */
     private String validateDeliverPlanDetailImport(DeliverPlanDetailDO detailDo, DeliverPlanMainDO mainDo) {
         String messageDetail = "";
+        if(detailDo.getShippedQty() == null){
+            detailDo.setShippedQty(BigDecimal.ZERO);
+        }
         // 校验物品基础信息
         try {
             ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode());
@@ -477,6 +480,9 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService {
             deliverPlanDetailDO.setMasterId(deliverPlanMainDO.getId());
             deliverPlanDetailDO.setCustomerDockCode(null);
             deliverPlanDetailDO.setAvailable("TRUE");
+            if(deliverPlanDetailDO.getShippedQty() == null){
+                deliverPlanDetailDO.setShippedQty(BigDecimal.ZERO);
+            }
         }
         deliverPlanDetailMapper.insertBatch(subDOList);
         return deliverPlanMainDO;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java

@@ -1,6 +1,5 @@
 package com.win.module.wms.service.deliverRecord;
 
-import cn.hutool.core.exceptions.UtilException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainCreateReqVO;
@@ -8,7 +7,6 @@ import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReq
 import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainPageReqVO;
 import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO;
-import com.win.module.wms.dal.dataobject.rule.RuleDO;
 import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordDetailMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java

@@ -16,7 +16,6 @@ import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.deliverRequest.vo.*;
 import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
 import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert;
-import com.win.module.wms.convert.deliverJob.DeliverJobDetailConvert;
 import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@@ -465,11 +464,14 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
             if (flag) {
                 String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode());
                 mainDo.setNumber(number);
+                String customerDeliverNumber = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_DELIVER_NUMBER.getCode());
+                mainDo.setCustomerDeliverNumber(customerDeliverNumber);
                 mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "1"));
                 deliverRequestMainMapper.insert(mainDo);
                 for (DeliverRequestDetailDO detailDO : subDOList) {
                     detailDO.setMasterId(mainDo.getId());
                     detailDO.setNumber(number);
+                    detailDO.setInventoryStatus("OK");
                 }
                 deliverRequestDetailMapper.insertBatch(subDOList);
             }
@@ -521,6 +523,8 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
         deliverRequestMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
         deliverRequestMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         deliverRequestMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
+        String customerDeliverNumber = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_DELIVER_NUMBER.getCode());
+        deliverRequestMainDO.setCustomerDeliverNumber(customerDeliverNumber);
         return deliverRequestMainDO;
     }
 
@@ -531,6 +535,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
         deliverRequestDetailDO.setItemDesc2(itembasicDO.getDesc2());
         deliverRequestDetailDO.setItemName(itembasicDO.getName());
         deliverRequestDetailDO.setProjectCode(itembasicDO.getProject());
+        deliverRequestDetailDO.setInventoryStatus("OK");
         if ("TRUE".equals(businesstypeDO.getUseOnTheWay())) {
             deliverRequestDetailDO.setToLocationCode("CUST");
         } else {