采购收货任务执行库存事务调试

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java

@@ -115,6 +115,7 @@ public class PackageController {
         PageResult<PackageDO> pageResult = packageService.getPackagePage(pageVO);
         return success(PackageConvert.INSTANCE.convertPage(pageResult));
     }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出包装 Excel")
     @PreAuthorize("@ss.hasPermission('wms:package:export')")
@@ -348,4 +349,13 @@ public class PackageController {
         return jsonObject;
     }
 
+    @GetMapping("/queryPackageTree")
+    @Operation(summary = "查询包装父子关系")
+    @PreAuthorize("@ss.hasPermission('wms:package:query')")
+    public CommonResult<PackageRespScanVO> queryPackageTree(@Valid PackagePageReqVO pageVO) {
+        PackageRespScanVO result = packageService.queryPackageTree(pageVO);
+        return success(result);
+    }
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageRespScanVO.java

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.packageMassage.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PackageRespScanVO {
+
+    private PackageRespVO reqPackage;
+
+    private List<PackageRespVO> subList;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailBaseVO.java

@@ -97,4 +97,7 @@ public class PutawayRequestDetailBaseVO {
     @Schema(description = "乐观锁")
     private Integer concurrencyStamp;
 
+    @Schema(description = "父级包装号")
+    private String parentPackingNumber;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestDetailDO.java

@@ -117,5 +117,8 @@ public class PutawayRequestDetailDO extends BaseDO {
      * 到货主代码
      */
     private String toOwnerCode;
-
+    /**
+     * 父级包装号
+     */
+    private String parentPackingNumber;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java

@@ -2,10 +2,7 @@ package com.win.module.wms.service.packageMassage;
 
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO;
+import com.win.module.wms.controller.packageMassage.vo.*;
-import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO;
-import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO;
-import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO;
 import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
@@ -134,4 +131,11 @@ public interface PackageService {
     List<PackageDO> getPackageList(CustomConditions conditions);
 
     List<PackageDO> getPackageListByRequestNumber(String requestNumber);
+
+    /**
+     * 查询父子包装树
+     * @param pageVO
+     * @return
+     */
+    PackageRespScanVO queryPackageTree(PackagePageReqVO pageVO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java

@@ -2,14 +2,15 @@ package com.win.module.wms.service.packageMassage;
 
 import cn.hutool.core.util.ReflectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
+import com.win.framework.mybatis.core.util.MyBatisUtils;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
-import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO;
+import com.win.module.wms.controller.packageMassage.vo.*;
-import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestBomRespVO;
-import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO;
-import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO;
 import com.win.module.wms.convert.packageMassage.PackageConvert;
 import com.win.module.wms.dal.dataobject.barcode.BarcodeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
@@ -596,4 +597,26 @@ public class PackageServiceImpl implements PackageService {
         queryWrapper.eq("request_number", requestNumber);
         return packageMapper.selectList(queryWrapper);
     }
+
+    @Override
+    public PackageRespScanVO queryPackageTree(PackagePageReqVO pageVO) {
+        PackageRespScanVO packageRespScanVO = new PackageRespScanVO();
+        //说明是箱数据
+        QueryWrapper queryWrapperNumber = new QueryWrapper<>();
+        queryWrapperNumber.eq("number", pageVO.getNumber());
+        PackageDO packageDONumber = packageMapper.selectOne(queryWrapperNumber);
+        packageRespScanVO.setReqPackage(PackageConvert.INSTANCE.convert(packageDONumber));
+        List<PackageRespVO> subList = new ArrayList<>();
+        if(StringUtils.isEmpty(packageDONumber.getParentNumber())){
+            packageRespScanVO.setSubList(subList);
+        }else {
+            //说明是箱数据
+            QueryWrapper queryWrapperParentNumber = new QueryWrapper<>();
+            queryWrapperParentNumber.eq("parent_number", packageDONumber.getParentNumber());
+            List<PackageDO> listResult = packageMapper.selectList(queryWrapperParentNumber);
+            List<PackageRespVO> subListTemp = PackageConvert.INSTANCE.convertList(listResult);
+            packageRespScanVO.setSubList(subListTemp);
+        }
+        return packageRespScanVO;
+    }
 }

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

@@ -873,7 +873,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 BeanUtils.copyProperties(purchasereceiptRecordDetailDO, putawayRequestDetailCreateReqVO);
                 putawayRequestDetailCreateReqVO.setFromOwnerCode(purchasereceiptRecordDetailDO.getToOwnerCode());
                 putawayRequestDetailCreateReqVO.setFromLocationCode(purchasereceiptRecordDetailDO.getToLocationCode());
-                putawayRequestDetailCreateReqVO.setPackingNumber(purchasereceiptRecordDetailDO.getToPackingNumber());
+                putawayRequestDetailCreateReqVO.setPackingNumber(purchasereceiptRecordDetailDO.getPackingNumber());
+                putawayRequestDetailCreateReqVO.setParentPackingNumber(purchasereceiptRecordDetailDO.getParentPackingNumber());
                 putawayRequestDetailCreateReqVO.setContainerNumber(purchasereceiptRecordDetailDO.getToContainerNumber());
                 putawayRequestDetailCreateReqVO.setBatch(purchasereceiptRecordDetailDO.getToBatch());
                 putawayRequestDetailCreateReqVO.setFromLocationCode(purchasereceiptRecordDetailDO.getToLocationCode());

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

@@ -51,6 +51,7 @@ import com.win.module.wms.service.putawayRecord.PutawayRecordMainService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.service.rule.RuleService;
 import com.win.module.wms.util.JobUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -464,15 +465,17 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         detailDo.setItemDesc2(itembasicDO.getDesc2());
         detailDo.setItemName(itembasicDO.getName());
         detailDo.setProjectCode(itembasicDO.getProject());
-        this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom());
+        if(StringUtils.isEmpty(detailDo.getParentPackingNumber())){
-        validatorIfInType(itembasicDO.getType(), businesstypeDO);
+            this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom());
-        this.validatorPurchaseDetailDo(detailDo.getPoNumber(), mainDo.getSupplierCode(), detailDo.getItemCode(), detailDo.getPoLine());
+            validatorIfInType(itembasicDO.getType(), businesstypeDO);
-        validatorLocation(detailDo.getFromLocationCode());
+            this.validatorPurchaseDetailDo(detailDo.getPoNumber(), mainDo.getSupplierCode(), detailDo.getItemCode(), detailDo.getPoLine());
-        validatorIfOutInventoryStatuses(detailDo.getInventoryStatus(), businesstypeDO);
+            validatorLocation(detailDo.getFromLocationCode());
-        validatorIfInToLocationType(detailDo.getFromLocationCode(), businesstypeDO);
+            validatorIfOutInventoryStatuses(detailDo.getInventoryStatus(), businesstypeDO);
-        ArrayList<String> inventoryStatus = new ArrayList<>();
+            validatorIfInToLocationType(detailDo.getFromLocationCode(), businesstypeDO);
-        inventoryStatus.add(detailDo.getInventoryStatus());
+            ArrayList<String> inventoryStatus = new ArrayList<>();
-        validatorManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFromLocationCode(), inventoryStatus);
+            inventoryStatus.add(detailDo.getInventoryStatus());
+            validatorManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFromLocationCode(), inventoryStatus);
+        }
     }
 
     /**