退货任务执行报错问题修复

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

@@ -191,6 +191,7 @@ public interface ErrorCodeConstants {
     ErrorCode LOCATION_DISABLE_NEGATIVE = new ErrorCode(1_000_037_014, "库位不允许负库存");
     ErrorCode LOCATION_DISABLE_NEGATIVE_BALANCE = new ErrorCode(1_000_037_014, "库位不允许负库存,库存查询条件,包装号:{},物料代码:{},批次:{},状态:{},库位:{}");
     ErrorCode LOCATION_EXCEPTION = new ErrorCode(1_000_037_015, "库位问题：【{}】");
+    ErrorCode LOCATION_QAD_EXCEPTION = new ErrorCode(1_000_037_015, "QAD库位不存在库位问题：【{}】");
     ErrorCode LOCATION_INVENTORY_EXCEPTION = new ErrorCode(1_000_037_016, "库存问题：【{}】");
     ErrorCode LOCATION_NOT_CUST = new ErrorCode(1_000_037_017, "【{}】不是客户寄售库");
     //车间ErrorCode

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java

@@ -93,7 +93,7 @@ public class PurchaseDetailExportReqVO {
     private String concurrencyStamp;
 
     @Schema(description = "明细状态")
-    private String status;
+    private String detailStatus;
 
     @Schema(description = "是否可用")
     private String available;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java

@@ -97,7 +97,7 @@ public class PurchaseDetailPageReqVO extends PageParam {
     private String concurrencyStamp;
 
     @Schema(description = "明细状态")
-    private String status;
+    private String detailStatus;
 
     @Schema(description = "是否可用")
     private String available;
@@ -120,4 +120,8 @@ public class PurchaseDetailPageReqVO extends PageParam {
     @Schema(description = "可访问的供应商代码")
     private List<String> supplierCodeList;
 
+
+    @Schema(description = "主表状态")
+    private String status;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java

@@ -136,7 +136,7 @@ public class PurchaseDetailDO extends BaseDO {
      *
      * 枚举 {@link TODO purchase_order_detail_status 对应的类}
      */
-    private String status;
+    private String detailStatus;
     /**
      * 是否可用
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java

@@ -54,7 +54,7 @@ public interface PurchaseDetailMapper extends BaseMapperX<PurchaseDetailDO> {
                 .betweenIfPresent(PurchaseDetailDO::getUpdateTime, reqVO.getUpdateTime())
                 .likeIfPresent(PurchaseDetailDO::getUpdater, reqVO.getUpdater())
                 .likeIfPresent(PurchaseDetailDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
-                .likeIfPresent(PurchaseDetailDO::getStatus, reqVO.getStatus())
+                .likeIfPresent(PurchaseDetailDO::getDetailStatus, reqVO.getDetailStatus())
                 .likeIfPresent(PurchaseDetailDO::getPoLineType, reqVO.getPoLineType())
                 .likeIfPresent(PurchaseDetailDO::getAvailable, reqVO.getAvailable());
         boolean queryMainFlag = false;
@@ -182,7 +182,7 @@ public interface PurchaseDetailMapper extends BaseMapperX<PurchaseDetailDO> {
                 .betweenIfPresent(PurchaseDetailDO::getUpdateTime, reqVO.getUpdateTime())
                 .eqIfPresent(PurchaseDetailDO::getUpdater, reqVO.getUpdater())
                 .eqIfPresent(PurchaseDetailDO::getConcurrencyStamp, reqVO.getConcurrencyStamp())
-                .eqIfPresent(PurchaseDetailDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(PurchaseDetailDO::getDetailStatus, reqVO.getDetailStatus())
                 .likeIfPresent(PurchaseDetailDO::getPoLineType, reqVO.getPoLineType())
                 .eqIfPresent(PurchaseDetailDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(PurchaseDetailDO::getId));

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

@@ -93,7 +93,7 @@ public class PurchaseDetailServiceImpl implements PurchaseDetailService {
         purchaseDetailDO.setPutawayQty(BigDecimal.ZERO);
         purchaseDetailDO.setErpLocationCode(null);
         purchaseDetailDO.setAvailable("TRUE");
-        purchaseDetailDO.setStatus(OrderStatusEnum.READY.getCode());
+        purchaseDetailDO.setDetailStatus(OrderStatusEnum.READY.getCode());
         purchaseDetailDO.setId(null);
         List<PurchaseDetailDO> checkList = purchaseDetailMapper.checkDataExist(purchaseDetailDO);
         if(checkList != null && checkList.size() > 0){

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

@@ -261,7 +261,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
                     detailDO.setConvertRate(BigDecimal.ONE);
                     detailDO.setErpLocationCode(null);
                     detailDO.setAvailable("TRUE");
-                    detailDO.setStatus(OrderStatusEnum.READY.getCode());
+                    detailDO.setDetailStatus(OrderStatusEnum.READY.getCode());
                 }
                 purchaseDetailMapper.insertBatch(subDOList);
             }
@@ -393,7 +393,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
             purchaseDetailDO.setReturnedQty(BigDecimal.ZERO);
             purchaseDetailDO.setPutawayQty(BigDecimal.ZERO);
             purchaseDetailDO.setErpLocationCode(null);
-            purchaseDetailDO.setStatus(OrderStatusEnum.READY.getCode());
+            purchaseDetailDO.setDetailStatus(OrderStatusEnum.READY.getCode());
             purchaseDetailDO.setId(null);
             purchaseDetailDO.setCreator(null);
             purchaseDetailDO.setCreateTime(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java

@@ -23,6 +23,7 @@ import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.interfaceinfo.InterfaceInfoDO;
+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.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO;
@@ -54,6 +55,7 @@ import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMai
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
 import com.win.module.wms.util.LocalDateTimeAdapter;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -486,7 +488,11 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
             PurchasereturnDTO purchasereturnDTO = new PurchasereturnDTO();
             BeanUtils.copyProperties(purchasereturnRecordMainDO,purchasereturnDTO);
             BeanUtils.copyProperties(purchasereturnRecordDetailDO,purchasereturnDTO);
-            purchasereturnDTO.setQadLocationCode(locationService.selectLocation(purchasereturnRecordDetailDO.getToLocationCode()).getQadLocationCode());
+            LocationDO locationDO = locationService.selectLocation(purchasereturnRecordDetailDO.getFromLocationCode());
+            if(StringUtils.isEmpty(locationDO.getQadLocationCode())){
+                throw exception(LOCATION_QAD_EXCEPTION, locationDO.getCode() + "该库位QAD不存在");
+            }
+            purchasereturnDTO.setQadLocationCode(locationDO.getQadLocationCode());
             purchasereturnDTOList.add(purchasereturnDTO);
         }
         if(!purchasereturnDTOList.isEmpty()){