整理公共方法代码摆放位置

win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java

@@ -47,5 +47,13 @@ public interface DictDataApi {
      */
     String[] getDictDataByType(String type);
 
+    /**
+     * BQ---QD
+     * 查询字典项
+     * @author chenfang
+     * @param ptype 字典类型
+     * @param plabel 字典标签
+     * @return
+     */
     DictDataRespDTO selectDictTypeAndLabel(String ptype, String plabel);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainBaseVO.java

@@ -58,7 +58,7 @@ public class ProductionreceiptJobMainBaseVO {
     private LocalDateTime updateTime;
 
     @Schema(description = "最后更新者Id")
-    private String update;
+    private String updater;
 
     @Schema(description = "状态")
     private String jobStageStatus;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainExcelVO.java

@@ -53,7 +53,7 @@ public class ProductionreceiptJobMainExcelVO {
     private LocalDateTime updateTime;
 
     @ExcelProperty("最后更新者Id")
-    private String update;
+    private String updater;
 
     @ExcelProperty(value = "状态", converter = DictConvert.class)
     @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainExportReqVO.java

@@ -46,7 +46,7 @@ public class ProductionreceiptJobMainExportReqVO {
 
     @Schema(description = "最后更新者Id")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] update;
+    private String[] updater;
 
     @Schema(description = "状态")
     private String jobStageStatus;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainPageReqVO.java

@@ -48,7 +48,7 @@ public class ProductionreceiptJobMainPageReqVO extends PageParam {
 
     @Schema(description = "最后更新者Id")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] update;
+    private String[] updater;
 
     @Schema(description = "状态")
     private String jobStageStatus;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobMainDO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.productionreceiptJob;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -64,15 +65,12 @@ public class ProductionreceiptJobMainDO extends BaseDO {
      *
      * 枚举 {@link TODO job_status 对应的类}
      */
+    @TableField(value = "`status`")
     private String status;
     /**
      * 过期时间
      */
     private LocalDateTime expiredTime;
-    /**
-     * 最后更新者Id
-     */
-    private String update;
     /**
      * 并发乐观锁
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java

@@ -29,7 +29,7 @@ public interface ProductionreceiptJobMainMapper extends BaseMapperX<Productionre
                 .eqIfPresent(ProductionreceiptJobMainDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(ProductionreceiptJobMainDO::getExpiredTime, reqVO.getExpiredTime())
                 .betweenIfPresent(ProductionreceiptJobMainDO::getUpdateTime, reqVO.getUpdateTime())
-                .betweenIfPresent(ProductionreceiptJobMainDO::getUpdate, reqVO.getUpdate())
+                .betweenIfPresent(ProductionreceiptJobMainDO::getUpdater, reqVO.getUpdater())
                 .eqIfPresent(ProductionreceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
                 .eqIfPresent(ProductionreceiptJobMainDO::getPriority, reqVO.getPriority())
                 .eqIfPresent(ProductionreceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
@@ -72,7 +72,7 @@ public interface ProductionreceiptJobMainMapper extends BaseMapperX<Productionre
                 .eqIfPresent(ProductionreceiptJobMainDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(ProductionreceiptJobMainDO::getExpiredTime, reqVO.getExpiredTime())
                 .betweenIfPresent(ProductionreceiptJobMainDO::getUpdateTime, reqVO.getUpdateTime())
-                .betweenIfPresent(ProductionreceiptJobMainDO::getUpdate, reqVO.getUpdate())
+                .betweenIfPresent(ProductionreceiptJobMainDO::getUpdater, reqVO.getUpdater())
                 .eqIfPresent(ProductionreceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
                 .eqIfPresent(ProductionreceiptJobMainDO::getPriority, reqVO.getPriority())
                 .eqIfPresent(ProductionreceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java

@@ -71,4 +71,48 @@ public interface BalanceService {
      */
     List<BalanceDO> getBalanceList(BalanceExportReqVO exportReqVO);
 
+    /**
+     * TB2----BY_QUANTITY
+     * 跟据管理模式查询数量
+     * @author lianhongxi
+     * @param itemcode 物品code
+     * @param inventorystatus 库存状态
+     * @param locationcode 库位code
+     * @return
+     */
+    public List<BalanceDO> selectNumber(String itemcode, String inventorystatus, String locationcode);
+    /**
+     * TB2----BY_BATCH
+     * 跟据管理模式查询批次
+     * @author lianhongxi
+     * @param itemcode 物品code
+     * @param batch 批次
+     * @param inventorystatus 库存状态
+     * @param locationcode 库位code
+     * @return
+     */
+    public List<BalanceDO> selectBatch(String itemcode, String batch, String inventorystatus, String locationcode);
+    /**
+     * TB2----BY_PACKAGING
+     * 跟据管理模式查询包装号
+     * @author lianhongxi
+     * @param itemcode 物品code
+     * @param batch 批次
+     * @param packingnumber 包装号
+     * @param inventorystatus 库存状态
+     * @param locationcode 库位code
+     * @return
+     */
+    public List<BalanceDO> selectPackaging(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode);
+    /**
+     * TB2----BY_UNIQUE_ID
+     * 跟据管理模式查询唯一码
+     * @author lianhongxi
+     * @param packingnumber 包装号
+     * @param inventorystatus 库存状态
+     * @param locationcode 库位code
+     * @return
+     */
+    public List<BalanceDO> selectUniqueId(String packingnumber, String locationcode, String inventorystatus);
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java

@@ -1,11 +1,15 @@
 package com.win.module.wms.service.balance;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.win.framework.common.exception.ErrorCode;
 import com.win.module.wms.controller.balance.vo.BalanceCreateReqVO;
 import com.win.module.wms.controller.balance.vo.BalanceExportReqVO;
 import com.win.module.wms.controller.balance.vo.BalancePageReqVO;
 import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
@@ -86,4 +90,67 @@ public class BalanceServiceImpl implements BalanceService {
         return balanceMapper.selectList(exportReqVO);
     }
 
+    //跟据管理模式查询数量
+    //按数量查找  TB2-BY_QUANTITY
+    @Override
+    public List<BalanceDO> selectNumber(String itemcode, String inventorystatus, String locationcode) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("item_code", itemcode);
+        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("location_code", locationcode);
+        List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper);
+        if (!balanceDO.isEmpty()) {
+            return balanceDO;
+        } else {
+            throw exception(new ErrorCode(123, "物料号" + itemcode + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"));
+        }
+    }
+
+    //按批次查找  TB2-BY_BATCH
+    @Override
+    public List<BalanceDO> selectBatch(String itemcode, String batch, String inventorystatus, String locationcode) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("item_code", itemcode);
+        queryWrapper.eq("batch", batch);
+        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("location_code", locationcode);
+        List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper);
+        if (!balanceDO.isEmpty()) {
+            return balanceDO;
+        } else {
+            throw exception(new ErrorCode(124, "物料号" + itemcode + "批次" + batch + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"));
+        }
+    }
+
+    //按包裝查找  TB2-BY_PACKGING
+    @Override
+    public List<BalanceDO> selectPackaging(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("item_code", itemcode);
+        queryWrapper.eq("packing_number", packingnumber);
+        queryWrapper.eq("batch", batch);
+        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("location_code", locationcode);
+        List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper);
+        if (!balanceDO.isEmpty()) {
+            return balanceDO;
+        } else {
+            throw exception(new ErrorCode(128, "物料号" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"));
+        }
+    }
+
+    //按唯一码查找  TB2-BY_UNIQUE_ID
+    @Override
+    public List<BalanceDO> selectUniqueId(String packingnumber, String locationcode, String inventorystatus) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("packing_number", packingnumber);
+        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("location_code", locationcode);
+        List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper);
+        if (!balanceDO.isEmpty()) {
+            return balanceDO;
+        } else {
+            throw exception(new ErrorCode(129, "唯一码" + packingnumber + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"));
+        }
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java

@@ -72,7 +72,7 @@ public interface CountJobMainService {
     List<CountJobMainDO> getCountJobMainList(CountJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 盘点任务主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java

@@ -72,7 +72,7 @@ public interface CustomerService {
     List<CustomerImportExcelVo> importCustomerList(List<CustomerImportExcelVo> customers, Integer mode, Boolean updatePart);
     /**
      * 校验客户信息有效
-     *
+     * @author chenfang
      * @param pcustomerCode 客户代码
      * @return 客户列表
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java

@@ -93,7 +93,7 @@ public interface CustomerreturnJobMainService {
     public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

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

@@ -83,8 +83,9 @@ public interface DeliverJobMainService {
      */
     public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber);
     /**
+     * Order----VS
      * 校验采销售订单明细
-     *
+     * @author chenfang
      * @param psoNumber 单据号
      * @param pitemCode 物品代码
      * @param psoLine 行号
@@ -93,7 +94,7 @@ public interface DeliverJobMainService {
     public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 发货任务主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java

@@ -72,8 +72,8 @@ public interface DockService {
     List<DockImportExcelVO> dockimportDockList(List<DockImportExcelVO> docks, Integer mode, Boolean updatePart);
 
     /**
-     * 校验收货口有效，状态正确
+     * 校验(客户地点  月台)收货口有效，状态正确
-     *
+     * @author chenfang
      * @param code 代码
      * @return 月台列表
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java

@@ -70,5 +70,48 @@ public interface ExpectoutService {
      * @return 预计出库存列表
      */
     List<ExpectoutDO> getExpectoutList(ExpectoutExportReqVO exportReqVO);
+    /**
+     * TB2----BY_QUANTITY
+     * 跟据管理模式查询数量
+     * @author lianhongxi
+     * @param itemcode 物品code
+     * @param inventorystatus 库存状态
+     * @param locationcode 库位code
+     * @return
+     */
+    public List<ExpectoutDO> selectNumberNew(String itemcode, String inventorystatus, String locationcode);
+    /**
+     * TB2----BY_BATCH
+     * 跟据管理模式查询批次
+     * @author lianhongxi
+     * @param itemcode 物品code
+     * @param batch 批次
+     * @param inventorystatus 库存状态
+     * @param locationcode 库位code
+     * @return
+     */
+    public List<ExpectoutDO> selectBatchNew(String itemcode, String batch, String inventorystatus, String locationcode);
+    /**
+     * TB2----BY_PACKAGING
+     * 跟据管理模式查询包装号
+     * @author lianhongxi
+     * @param itemcode 物品code
+     * @param batch 批次
+     * @param packingnumber 包装号
+     * @param inventorystatus 库存状态
+     * @param locationcode 库位code
+     * @return
+     */
+    public List<ExpectoutDO> selectPackingNew(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode);
+    /**
+     * TB2----BY_UNIQUE_ID
+     * 跟据管理模式查询唯一码
+     * @author lianhongxi
+     * @param packingnumber 包装号
+     * @param inventorystatus 库存状态
+     * @param locationcode 库位code
+     * @return
+     */
+    public List<ExpectoutDO> selectUniqeIdNew(String packingnumber, String locationcode, String inventorystatus);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.service.expectout;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO;
 import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO;
 import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO;
@@ -83,4 +84,66 @@ public class ExpectoutServiceImpl implements ExpectoutService {
         return expectoutMapper.selectList(exportReqVO);
     }
 
+    //按数量查找 BY_BATCH
+    @Override
+    public List<ExpectoutDO> selectNumberNew(String itemcode, String inventorystatus, String locationcode) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("item_code", itemcode);
+        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("location_code", locationcode);
+        List<ExpectoutDO> expectoutDO = expectoutMapper.selectList(queryWrapper);
+        if (!expectoutDO.isEmpty()) {
+            return expectoutDO;
+        } else {
+            return null;
+        }
+    }
+
+    //按批次查询  BY_BATCH
+    @Override
+    public List<ExpectoutDO> selectBatchNew(String itemcode, String batch, String inventorystatus, String locationcode) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("item_code", itemcode);
+        queryWrapper.eq("batch", batch);
+        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("location_code", locationcode);
+        List<ExpectoutDO> expectoutDO = expectoutMapper.selectList(queryWrapper);
+        if (!expectoutDO.isEmpty()) {
+            return expectoutDO;
+        } else {
+            return null;
+        }
+    }
+
+    //按包裝  BY_PACKAGING
+    @Override
+    public List<ExpectoutDO> selectPackingNew(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("item_code", itemcode);
+        queryWrapper.eq("batch", batch);
+        queryWrapper.eq("packing_number", packingnumber);
+        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("location_code", locationcode);
+        List<ExpectoutDO> expectoutDO = expectoutMapper.selectList(queryWrapper);
+        if (!expectoutDO.isEmpty()) {
+            return expectoutDO;
+        } else {
+            return null;
+        }
+    }
+
+    //按唯一码查询   BY_UNIQUE_ID
+    @Override
+    public List<ExpectoutDO> selectUniqeIdNew(String packingnumber, String locationcode, String inventorystatus) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("packing_number", packingnumber);
+        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("location_code", locationcode);
+        List<ExpectoutDO> expectoutDO = expectoutMapper.selectList(queryWrapper);
+        if (!expectoutDO.isEmpty()) {
+            return expectoutDO;
+        } else {
+            return null;
+        }
+    }
 }

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

@@ -72,7 +72,7 @@ public interface InspectJobMainService {
     List<InspectJobMainDO> getInspectJobMainList(InspectJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java

@@ -72,7 +72,7 @@ public interface InventorymoveJobMainService {
     List<InventorymoveJobMainDO> getInventorymoveJobMainList(InventorymoveJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java

@@ -72,7 +72,7 @@ public interface IssueJobMainService {
     List<IssueJobMainDO> getIssueJobMainList(IssueJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java

@@ -100,11 +100,4 @@ public interface ItembasicService {
      * @return 物品基本信息
      */
     public ItembasicDO selectItembasic(String code);
-    /**
-     * 校验物料有效，状态正确
-     *
-     * @param itemCode 物品代码
-     * @return 物品基本信息列表
-     */
-    public ItembasicDO itemCodeExist(String itemCode);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java

@@ -284,15 +284,6 @@ public class ItembasicServiceImpl implements ItembasicService {
             throw exception(ITEMBASIC_NOT_EXISTS);
         }
     }
-    //物料有效，状态正确
-    public ItembasicDO itemCodeExist(String itemCode) {
-        ItembasicDO itembasicDO = selectItembasic(itemCode);
-        if(itembasicDO != null){
-            return itembasicDO;
-        }else {
-            throw exception(ITEMBASIC_CODE_NOT_EXISTS);
-        }
-    }
 
     /**
      * 构建操作流水对象

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java

@@ -73,34 +73,13 @@ public interface LocationService {
     List<LocationDO> getLocationList(LocationExportReqVO exportReqVO);
 
     List<LocationImportExcelVO> importLocationList(List<LocationImportExcelVO> locations, Integer mode, Boolean updatePart);
-    /**
-     * 库位验证
-     * 从库位号有效，状态正确，开关正确
-     * 到库位号有效，状态正确，开关正确
-     * 共用同一个方法
-     * @param locationCode 库位
-     * @return 库位信息
-     */
-    public LocationDO selectLocationExist(String locationCode);
-    /**
-     * 获取当前库位采用的获取库位存储策略信息
-     *
-     * @param warehouseCode 仓库代码
-     * @param areaCode 区域代码
-     * @param locationGroupCode 库位组code
-     * @param plocationCode 库位
-     * @return 库位存储策略信息
-     */
-    //TODO    后期具体业务时需判断策略相关标签状态(还没写)
-    public RuleRespVO selectLocationStrategyRule(String warehouseCode, String areaCode, String locationGroupCode, String plocationCode);
-    /**
-     * 零件库位关系有效
-     *
-     * @param pitemCode 物品代码
-     * @return 上架策略信息
-     */
-
-    public RuleRespVO selectLocationAndModRelation(String pitemCode);
-
 
+    /***
+     * BQ-----QL
+     * 查询库位
+     * @author chenfang
+     * @param pcode
+     * @return
+     */
+    public LocationDO selectLocation(String pcode);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java

@@ -235,6 +235,7 @@ public class LocationServiceImpl implements LocationService {
         }
     }
     //调用公共方法查询库位信息
+    @Override
     public LocationDO selectLocation(String pcode) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("code",pcode);
@@ -245,22 +246,4 @@ public class LocationServiceImpl implements LocationService {
             throw exception(LOCATION_NOT_EXISTS);
         }
     }
-    public LocationDO selectLocationExist(String locationCode) {
-        LocationDO locationDO = selectLocation(locationCode);
-        return locationDO;
-    }
-    public RuleRespVO selectLocationStrategyRule(String warehouseCode, String areaCode, String locationGroupCode, String plocationCode) {
-        RuleRespVO ruleRespVO = ruleService.warehouseStorage(warehouseCode,areaCode,locationGroupCode,plocationCode);
-        return ruleRespVO;
-    }
-    public RuleRespVO selectLocationAndModRelation(String pitemCode) {
-        RuleRespVO grounding = ruleService.grounding(null, null, null, null, null, null, pitemCode, null, null, null, null, null, null);
-        if(grounding != null){
-            return grounding;
-        }else {
-            throw exception(LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS);
-        }
-    }
-
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java

@@ -72,7 +72,7 @@ public interface PickJobMainService {
     List<PickJobMainDO> getPickJobMainList(PickJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java

@@ -72,7 +72,7 @@ public interface ProductdismantleJobMainService {
     List<ProductdismantleJobMainDO> getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java

@@ -73,7 +73,7 @@ public interface ProductionMainService {
     List<ProductionMainDO> getProductionMainList(ProductionMainExportReqVO exportReqVO);
     /**
      * 校验生产计划
-     *
+     * @author chenfang
      * @param pnumber 单据号
      * @param pitemCode 物品代码
      * @return 生产计划子列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java

@@ -70,5 +70,12 @@ public interface ProductionlineService {
     List<ProductionlineDO> getProductionlineList(ProductionlineExportReqVO exportReqVO);
 
     List<ProductionlineImportExcelVO> importProductionlineList(List<ProductionlineImportExcelVO> productionlines, Integer mode, Boolean updatePart);
+
+    /**
+     *生产线有效状态正确
+     * @author lianhongxi
+     * @param code
+     * @return
+     */
     public ProductionlineDO ProductionlineExist(String code);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java

@@ -171,24 +171,10 @@ public class ProductionlineServiceImpl implements ProductionlineService {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("code",code);
         ProductionlineDO productionlineDO =productionlineMapper.selectOne(queryWrapper);
-        if(productionlineDO != null&& productionlineDO.getAvailable().equals("TRUE")){
+        if(productionlineDO != null&& "TRUE".equals(productionlineDO.getAvailable())){
             return productionlineDO;
         }else {
             throw exception(PRODUCTIONLINEITEM_PITEM_NOT_EXISTS);
         }
     }
-
-
-
-    //生产线有效，状态正确
-    public ProductionlineDO pcodeExist(String pcode) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("code",pcode);
-        ProductionlineDO productionlineDO = productionlineMapper.selectOne(queryWrapper);
-        if(productionlineDO != null && productionlineDO.getAvailable().equals("TRUE")){
-            return productionlineDO;
-        }else {
-            throw exception(PRODUCTIONLINE_CODE_NOT_EXISTS);
-        }
-    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java

@@ -72,7 +72,7 @@ public interface ProductionlineitemService {
     List<ProductionlineItemImportExcelVO> importProductionlineItemList(List<ProductionlineItemImportExcelVO> productionlineItems, Integer mode, Boolean updatePart);
     /**
      * 零件生产线关系有效
-     *
+     * @author chenfang
      * @param pproductionLineCode 产线代码
      * @param pitemCode 物品代码
      * @return 生产线物料关系

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java

@@ -72,7 +72,7 @@ public interface ProductionreceiptJobMainService {
     List<ProductionreceiptJobMainDO> getProductionreceiptJobMainList(ProductionreceiptJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java

@@ -72,7 +72,7 @@ public interface ProductionreturnJobMainService {
     List<ProductionreturnJobMainDO> getProductionreturnJobMainList(ProductionreturnJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java

@@ -72,7 +72,7 @@ public interface ProductputawayJobMainService {
     List<ProductputawayJobMainDO> getProductputawayJobMainList(ProductputawayJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java

@@ -81,7 +81,7 @@ public interface ProductreceiptJobMainService {
     public ProductionDetailDO planProductionDetailExist(String pnumber, String pitemCode);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java

@@ -72,7 +72,7 @@ public interface ProductscrapJobMainService {
     List<ProductscrapJobMainDO> getProductscrapJobMainList(ProductscrapJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

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

@@ -69,7 +69,7 @@ public interface PurchasereceiptJobMainService {
     List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainList(PurchasereceiptJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

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

@@ -72,7 +72,7 @@ public interface PurchasereturnJobMainService {
     List<PurchasereturnJobMainDO> getPurchasereturnJobMainList(PurchasereturnJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java

@@ -72,7 +72,7 @@ public interface PutawayJobMainService {
     List<PutawayJobMainDO> getPutawayJobMainList(PutawayJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java

@@ -72,7 +72,7 @@ public interface RepleinshJobMainService {
     List<RepleinshJobMainDO> getRepleinshJobMainList(RepleinshJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java

@@ -208,6 +208,7 @@ public interface RuleService {
     RuleRespVO batch(String supplierCode, String customerCode, String abcClass, String itemType, String itemGroup, String project, String itemCode);
 
     /**
+     *  SQ----WS
      * 获取库位存储策略
      *
      * @param warehouseCode     仓库代码

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java

@@ -72,7 +72,7 @@ public interface ScrapJobMainService {
     List<ScrapJobMainDO> getScrapJobMainList(ScrapJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java

@@ -71,17 +71,11 @@ public interface SupplierService {
 
     List<SupplierImportExcelVo>  importSupplierList(List<SupplierImportExcelVo> importTeam, Integer mode, boolean updatePart);
     /**
+     * BQ-----QS
      * 查询供应商信息
-     *
+     * @author chenfang
      * @param code 代码
      * @return 供应商列表
      */
     public SupplierDO selectSupplier(String code);
-    /**
-     * 校验供应商有效，状态正确
-     *
-     * @param supplierCode 代码
-     * @return 供应商列表
-     */
-    public SupplierDO supplierExist(String supplierCode);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java

@@ -182,13 +182,4 @@ public class SupplierServiceImpl implements SupplierService {
             throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
         }
     }
-    @Override
-    public SupplierDO supplierExist(String supplierCode) {
-        SupplierDO supplierDO = selectSupplier(supplierCode);
-        if(supplierDO != null){
-            return supplierDO;
-        }else {
-            throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
-        }
-    }
 }

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

@@ -74,7 +74,7 @@ public interface SupplierdeliverRecordMainService {
 
     /**
      * 校验供应商发货记录
-     *
+     * @author chenfang
      * @param pasnNumber 发货单号
      * @param pitemCode 物品代码
      * @param ppoNumber 订单号

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java

@@ -72,7 +72,7 @@ public interface TransferissueJobMainService {
     List<TransferissueJobMainDO> getTransferissueJobMainList(TransferissueJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java

@@ -72,7 +72,7 @@ public interface TransferreceiptJobMainService {
     List<TransferreceiptJobMainDO> getTransferreceiptJobMainList(TransferreceiptJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java

@@ -72,7 +72,7 @@ public interface UnplannedissueJobMainService {
     List<UnplannedissueJobMainDO> getUnplannedissueJobMainList(UnplannedissueJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java

@@ -73,7 +73,7 @@ public interface UnplannedissueRequestMainService {
     List<UnplannedissueRequestMainDO> getUnplannedissueRequestMainList(UnplannedissueRequestMainExportReqVO exportReqVO);
     /**
      * 获取字典数据(原因是否有效)
-     *
+     *当前该方法只用于  计划外出库   如需使用方法另新建即可
      * @param ptype 字典类型
      * @param plabel 字典标签
      * @return 字典数据信息

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java

@@ -72,7 +72,7 @@ public interface UnplannedreceiptJobMainService {
     List<UnplannedreceiptJobMainDO> getUnplannedreceiptJobMainList(UnplannedreceiptJobMainExportReqVO exportReqVO);
     /**
      * 校验任务状态正确
-     *
+     *@author chenfang
      * @param pnumber 单据号
      * @param pstatus 状态
      * @return 采购订单主列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java

@@ -11,12 +11,17 @@ import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
+import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper;
 import com.win.module.wms.dal.mysql.location.LocationMapper;
+import com.win.module.wms.service.balance.BalanceService;
+import com.win.module.wms.service.expectout.ExpectoutService;
+import com.win.module.wms.service.expectout.ExpectoutServiceImpl;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.rule.RuleService;
+import com.win.module.wms.service.supplier.SupplierService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
@@ -29,6 +34,7 @@ import java.util.Map;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;
+
 @Slf4j
 @Component
 public class JobUtils {
@@ -39,6 +45,9 @@ public class JobUtils {
     @Resource
     private LocationService locationService;
 
+    @Resource
+    private BalanceService balanceService;
+
     @Resource
     private LocationMapper locationMapper;
 
@@ -46,9 +55,17 @@ public class JobUtils {
     private BalanceMapper balanceMapper;
 
     @Resource
-    private ExpectoutMapper expectoutMapper  ;
+    private ExpectoutMapper expectoutMapper;
     @Resource
     private RuleService ruleService;
+
+    @Resource
+    private SupplierService supplierService;
+
+    @Resource
+    private ExpectoutService expectoutService;
+
+
     /**
      * 解析JSON串,返回两个对象的集合
      *
@@ -121,468 +138,320 @@ public class JobUtils {
         }
         return result;
     }
+
+    /**
+     * 校验物料有效，状态正确
+     *
+     * @param itemCode 物品代码
+     * @return 物品基本信息列表
+     * @author chenfang
+     */
+    public ItembasicDO itemCodeExist(String itemCode) {
+        ItembasicDO itembasicDO = itembasicService.selectItembasic(itemCode);
+        if (itembasicDO != null) {
+            return itembasicDO;
+        } else {
+            throw exception(ITEMBASIC_CODE_NOT_EXISTS);
+        }
+    }
+
+    /**
+     * 校验供应商有效，状态正确
+     *
+     * @param supplierCode 代码
+     * @return 供应商列表
+     * @author chenfang
+     */
+    public SupplierDO supplierExist(String supplierCode) {
+        SupplierDO supplierDO = supplierService.selectSupplier(supplierCode);
+        if (supplierDO != null) {
+            return supplierDO;
+        } else {
+            throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
+        }
+    }
+
     //到库位与任务库位是否一致（可配置）
-    public boolean jobToLocationCodeAndRecordToLocationCodeAccord(String jobToLocationCode, String recordToLocationCode, String allowModifyLocation){
+    public boolean jobToLocationCodeAndRecordToLocationCodeAccord(String jobToLocationCode, String recordToLocationCode, String allowModifyLocation) {
-        if(jobToLocationCode != null || !"".equals(jobToLocationCode)){
+        if (jobToLocationCode != null || !"".equals(jobToLocationCode)) {
-            if(!jobToLocationCode.equals(recordToLocationCode)){
+            if (!jobToLocationCode.equals(recordToLocationCode)) {
-                if("TRUE".equals(allowModifyLocation)){
+                if ("TRUE".equals(allowModifyLocation)) {
                     return true;
-                }else {
+                } else {
                     throw exception(LOCATION_HANDLE_TOLOCATIONCODE_AND_RECOMMEND_TOLOCATIONCODECODE_INCONFORMITY);
                 }
-            }else {
+            } else {
                 return true;
             }
-        }else {
+        } else {
             return true;
         }
     }
+
+    /**
+     * 库位验证
+     * 从库位号有效，状态正确，开关正确
+     * 到库位号有效，状态正确，开关正确
+     * 共用同一个方法
+     *
+     * @param locationCode 库位
+     * @return 库位信息
+     * @author chenfang
+     */
+    public LocationDO selectLocationExist(String locationCode) {
+        LocationDO locationDO = locationService.selectLocation(locationCode);
+        return locationDO;
+    }
+
+    /**
+     * 获取当前库位采用的获取库位存储策略信息
+     *
+     * @param warehouseCode     仓库代码
+     * @param areaCode          区域代码
+     * @param locationGroupCode 库位组code
+     * @param plocationCode     库位
+     * @return 库位存储策略信息
+     * @author chenfang
+     */
+    //TODO    后期具体业务时需判断策略相关标签状态(还没写)
+    public RuleRespVO selectLocationStrategyRule(String warehouseCode, String areaCode, String locationGroupCode, String plocationCode) {
+        RuleRespVO ruleRespVO = ruleService.warehouseStorage(warehouseCode, areaCode, locationGroupCode, plocationCode);
+        return ruleRespVO;
+    }
+
+    /**
+     * 零件库位关系有效
+     *
+     * @param pitemCode 物品代码
+     * @return 上架策略信息
+     * @author chenfang
+     */
+    public RuleRespVO selectLocationAndModRelation(String pitemCode) {
+        RuleRespVO grounding = ruleService.grounding(null, null, null, null, null, null, pitemCode, null, null, null, null, null, null);
+        if (grounding != null) {
+            return grounding;
+        } else {
+            throw exception(LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS);
+        }
+    }
+
     //DBT---DBT2---IT   物料类型检验是否一致
-    public boolean ifInType(String pitemCode, BusinesstypeDO businesstypeDO){
+    public boolean ifInType(String pitemCode, BusinesstypeDO businesstypeDO) {
         ItembasicDO itembasicDO = itembasicService.selectItembasic(pitemCode);
         boolean ifInType = false;
-        if(itembasicDO != null){
+        if (itembasicDO != null) {
             String[] itemType = businesstypeDO.getItemTypes().split(",");
             for (int i = 0; i < itemType.length; i++) {
-                if(itembasicDO.getType().equals(itemType[i])){
+                if (itembasicDO.getType().equals(itemType[i])) {
                     ifInType = true;
                 }
             }
         }
-        if(ifInType == true){
+        if (ifInType == true) {
             return true;
-        }else{
+        } else {
             throw exception(ITEMBASIC_TYPE_AND_BUSINESSTYPE_NOT_EQUALS);
         }
     }
+
     //DBT---DBT2---IS   物料状态检验是否一致
-    public boolean ifInStatus(String pitemCode, BusinesstypeDO businesstypeDO){
+    public boolean ifInStatus(String pitemCode, BusinesstypeDO businesstypeDO) {
         ItembasicDO itembasicDO = itembasicService.selectItembasic(pitemCode);
         boolean ifInStatus = false;
-        if(itembasicDO != null){
+        if (itembasicDO != null) {
             String[] itemStatus = businesstypeDO.getItemStatuses().split(",");
             for (int i = 0; i < itemStatus.length; i++) {
-                if(itembasicDO.getStatus().equals(itemStatus[i])){
+                if (itembasicDO.getStatus().equals(itemStatus[i])) {
                     ifInStatus = true;
                 }
             }
         }
-        if(ifInStatus == true){
+        if (ifInStatus == true) {
             return true;
-        }else {
+        } else {
             throw exception(ITEMBASIC_STATUS_AND_BUSINESSSTATUS_NOT_EQUALS);
         }
     }
+
     //DBT---DBT2---LI   校验入库库位类型是否一致
-    public boolean ifInFromLocationType(String plocationCode, BusinesstypeDO businesstypeDO){
+    public boolean ifInFromLocationType(String plocationCode, BusinesstypeDO businesstypeDO) {
-        LocationDO locationDO = locationService.selectLocationExist(plocationCode);
+        LocationDO locationDO = selectLocationExist(plocationCode);
         boolean ifInLocationType = false;
-        if(locationDO != null){
+        if (locationDO != null) {
             String[] itemInLocationTypes = businesstypeDO.getInLocationTypes().split(",");
             for (int i = 0; i < itemInLocationTypes.length; i++) {
-                if(locationDO.getType().equals(itemInLocationTypes[i])){
+                if (locationDO.getType().equals(itemInLocationTypes[i])) {
                     ifInLocationType = true;
                 }
             }
         }
-        if(ifInLocationType == true){
+        if (ifInLocationType == true) {
             return true;
-        }else {
+        } else {
             throw exception(FROM_LOCATION_TYPE_AND_BUSINESSTYPE_INLOCATION_TYPE_NOT_EQUALS);
         }
     }
+
     //DBT---DBT2---LO   校验出库库位类型是否一致
-    public boolean ifInToLocationType(String plocationCode, BusinesstypeDO businesstypeDO){
+    public boolean ifInToLocationType(String plocationCode, BusinesstypeDO businesstypeDO) {
-        LocationDO locationDO = locationService.selectLocationExist(plocationCode);
+        LocationDO locationDO = selectLocationExist(plocationCode);
         boolean ifOutLocationType = false;
-        if(locationDO != null){
+        if (locationDO != null) {
             String[] itemOutLocationTypes = businesstypeDO.getOutLocationTypes().split(",");
             for (int i = 0; i < itemOutLocationTypes.length; i++) {
-                if(locationDO.getType().equals(itemOutLocationTypes[i])){
+                if (locationDO.getType().equals(itemOutLocationTypes[i])) {
                     ifOutLocationType = true;
                 }
             }
         }
-        if(ifOutLocationType ==true){
+        if (ifOutLocationType == true) {
             return true;
-        }else {
+        } else {
             throw exception(TO_LOCATION_TYPE_AND_BUSINESSTYPE_OUTLOCATION_TYPE_NOT_EQUALS);
         }
     }
 
     //DBT---DBT2---ISI  校验入库状态是否一致
-    public boolean ifInInventoryStatuses(String pinventoryStatus, BusinesstypeDO businesstypeDO){
+    public boolean ifInInventoryStatuses(String pinventoryStatus, BusinesstypeDO businesstypeDO) {
         boolean ifInInventoryStatuses = false;
-        if(pinventoryStatus != null){
+        if (pinventoryStatus != null) {
             String[] inventoryStatuses = businesstypeDO.getInInventoryStatuses().split(",");
             for (int i = 0; i < inventoryStatuses.length; i++) {
-                if(pinventoryStatus.equals(inventoryStatuses[i])){
+                if (pinventoryStatus.equals(inventoryStatuses[i])) {
                     ifInInventoryStatuses = true;
                 }
             }
-        }if(ifInInventoryStatuses == true){
+        }
+        if (ifInInventoryStatuses == true) {
             return true;
-        }else {
+        } else {
             throw exception(INVENTORY_STATUS_AND_BUSINESS_IN_INVENTORY_STATUS_NOT_EQUALS_OR_NULL);
         }
     }
+
     //DBT---DBT2---ISO  校验出库状态是否一致
-    public boolean ifOutInventoryStatuses(String pinventoryStatus, BusinesstypeDO businesstypeDO){
+    public boolean ifOutInventoryStatuses(String pinventoryStatus, BusinesstypeDO businesstypeDO) {
         boolean ifOutInventoryStatuses = false;
-        if(pinventoryStatus != null){
+        if (pinventoryStatus != null) {
             String[] inventoryStatuses = businesstypeDO.getOutInventoryStatuses().split(",");
             for (int i = 0; i < inventoryStatuses.length; i++) {
-                if(pinventoryStatus.equals(inventoryStatuses[i])){
+                if (pinventoryStatus.equals(inventoryStatuses[i])) {
                     ifOutInventoryStatuses = true;
                 }
             }
-        }if(ifOutInventoryStatuses == true){
+        }
+        if (ifOutInventoryStatuses == true) {
             return true;
-        }else {
+        } else {
             throw exception(INVENTORY_STATUS_AND_BUSINESS_OUT_INVENTORY_STATUS_NOT_EQUALS_OR_NULL);
         }
     }
-    //调用公共方法查询库位信息
-    public LocationDO selectLocation(String pcode) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("code",pcode);
-        LocationDO locationDO = locationMapper.selectOne(queryWrapper);
-        if(locationDO != null && "TRUE".equals(locationDO.getAvailable())){
-            return locationDO;
-        }else {
-            throw exception(LOCATION_NOT_EXISTS);
-        }
-    }
-    public LocationDO selectLocationExist(String locationCode) {
-        LocationDO locationDO = selectLocation(locationCode);
-        return locationDO;
-    }
-    public RuleRespVO selectLocationStrategyRule(String warehouseCode, String areaCode, String locationGroupCode, String plocationCode) {
-        RuleRespVO ruleRespVO = ruleService.warehouseStorage(warehouseCode,areaCode,locationGroupCode,plocationCode);
-        return ruleRespVO;
-    }
-    public RuleRespVO selectLocationAndModRelation(String pitemCode) {
-        RuleRespVO grounding = ruleService.grounding(null, null, null, null, null, null, pitemCode, null, null, null, null, null, null);
-        if(grounding != null){
-            return grounding;
-        }else {
-            throw exception(LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS);
-        }
-    }
-
-
-
-    //跟据管理模式查詢數量
-//按數量查找  TB2-BY_QUANTITY
-    public List<BalanceDO> selectnumber(String itemcode, String inventorystatus, String locationcode){
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("item_code",itemcode);
-        queryWrapper.eq("inventory_status",inventorystatus);
-        queryWrapper.eq("location_code",locationcode);
-        List<BalanceDO>  balanceDO = balanceMapper.selectList(queryWrapper);
-        if(!balanceDO.isEmpty()){
-
-            return balanceDO;
-        }
-        else{
-            throw exception(new ErrorCode(123,"物料号" +  itemcode   +  "庫存狀態"  + inventorystatus + "在"+ locationcode +"庫位中未查找到库存记录"  ));
-        }
-
-    }
-//按批次查找  TB2-BY_BATCH
-
-    public  List<BalanceDO> selectbatch(String itemcode, String  batch   ,String inventorystatus,String locationcode) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("item_code",itemcode);
-        queryWrapper.eq("batch",batch);
-        queryWrapper.eq("inventory_status",inventorystatus);
-        queryWrapper.eq("location_code",locationcode);
-
-        List<BalanceDO>  balanceDO = balanceMapper.selectList(queryWrapper);
-        if(!balanceDO.isEmpty()){
-
-            return balanceDO;
-        }
-        else{
-            throw exception(new ErrorCode(124,"物料号" +  itemcode +"批次"+  batch   +  "庫存狀態"  + inventorystatus + "在"+ locationcode +"庫位中未查找到库存记录"  ));
-        }
-
-
-    }
-
-    //按包裝查找  TB2-BY_PACKGING
-    public  List<BalanceDO> selectpackaging(String itemcode, String  packingnumber,  String  batch   ,String inventorystatus,String locationcode) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("item_code",itemcode);
-        queryWrapper.eq("packing_number",packingnumber);
-        queryWrapper.eq("batch",batch);
-        queryWrapper.eq("inventory_status",inventorystatus);
-        queryWrapper.eq("location_code",locationcode);
-
-        List<BalanceDO>  balanceDO = balanceMapper.selectList(queryWrapper);
-        if(!balanceDO.isEmpty()){
-
-            return balanceDO;
-        }
-        else{
-            throw exception(new ErrorCode(128,"物料号" +  itemcode + "箱码" +packingnumber + "批次"+  batch   +  "庫存狀態"  + inventorystatus + "在"+ locationcode +"庫位中未查找到库存记录"  ));
-        }
-
-
-    }
-    //按唯一码查找  TB2-BY_UNIQUE_ID
-    public List<BalanceDO> selectuniqueid(String packingnumber,String locationcode , String inventorystatus){
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("packing_number",packingnumber);
-        queryWrapper.eq("inventory_status",inventorystatus);
-        queryWrapper.eq("location_code",locationcode);
-        List<BalanceDO>  balanceDO = balanceMapper.selectList(queryWrapper);
-        if(!balanceDO.isEmpty()){
-
-            return balanceDO;
-        }
-        else{
-            throw exception(new ErrorCode(129,"唯一码" +  packingnumber   +  "庫存狀態"  + inventorystatus + "在"+ locationcode +"庫位中未查找到库存记录"  ));
-        }
-
-    }
-
-
-
-
-
-
 
     // TB1  查询库存
-    public  List<BalanceDO>  selectlocation (String  itemcode, String packingnumber, String  batch, String locationcode, String status ){
+    public List<BalanceDO> selectlocation(String itemcode, String packingnumber, String batch, String locationcode, String status) {
-        RuleRespVO    managementtRule     =      ruleService.management( null, null,null,null,null, null,itemcode,null,null,
+        RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null,
-                null, locationcode,null,null);
+                null, locationcode, null, null);
-        List<BalanceDO>   balanceDO = null;
+        List<BalanceDO> balanceDO = null;
-        if( "{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals( managementtRule.getConfiguration())){
+        if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) {
-            balanceDO   =    selectnumber(itemcode, status, locationcode  );
+            balanceDO = balanceService.selectNumber(itemcode, status, locationcode);
-
+        } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) {
+            balanceDO = balanceService.selectBatch(itemcode, batch, status, locationcode);
+        } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) {
+            balanceDO = balanceService.selectPackaging(itemcode, packingnumber, batch, status, locationcode);
+        } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
+            balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, status);
         }
-        else if("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())){
-            balanceDO   =  selectbatch(itemcode,batch,status,locationcode);
-
-        }
-
-        else if("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) {
-            balanceDO   =  selectpackaging(itemcode,packingnumber,  batch, status, locationcode);
-        }
-
-        else if("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
-            balanceDO   =  selectuniqueid(packingnumber,  locationcode,status);
-        }
-
         return balanceDO;
-
-    }
-
-    //按數量查找 BY_BATCH
-    public  List<ExpectoutDO> selectnumbernew(String itemcode, String inventorystatus, String locationcode  ){
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("item_code",itemcode);
-        queryWrapper.eq("inventory_status",inventorystatus);
-        queryWrapper.eq("location_code",locationcode);
-        List<ExpectoutDO>  expectoutDO = expectoutMapper.selectList(queryWrapper);
-
-
-        if(!expectoutDO.isEmpty()){
-
-            return expectoutDO;
-        }
-        else{
-            return null;
-        }
-
-
     }
-    //按批次查詢  BY_BATCH
-    public  List<ExpectoutDO> selectbatchnew(String itemcode,String  batch  ,String inventorystatus,String locationcode  ){
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("item_code",itemcode);
-        queryWrapper.eq("batch",batch);
-        queryWrapper.eq("inventory_status",inventorystatus);
-        queryWrapper.eq("location_code",locationcode);
-        List<ExpectoutDO>  expectoutDO = expectoutMapper.selectList(queryWrapper);
-
-
-        if(!expectoutDO.isEmpty()){
-
-            return expectoutDO;
-        }
-        else{
-            return null;
-        }
-
-    }
-    //按包裝  BY_PACKAGING
-    public  List<ExpectoutDO> selectpackingnew(String itemcode, String   packingnumber       ,String  batch  ,String inventorystatus,String locationcode  ){
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("item_code",itemcode);
-        queryWrapper.eq("batch",batch);
-        queryWrapper.eq("packing_number",packingnumber);
-        queryWrapper.eq("inventory_status",inventorystatus);
-        queryWrapper.eq("location_code",locationcode);
-        List<ExpectoutDO>  expectoutDO = expectoutMapper.selectList(queryWrapper);
-
-
-        if(!expectoutDO.isEmpty()){
-
-            return expectoutDO;
-        }
-        else{
-            return null;
-        }
-
-    }
-    //按唯一码查詢   BY_UNIQUE_ID
-    public  List<ExpectoutDO> selectuniqeidnew( String   packingnumber ,String locationcode ,String inventorystatus ){
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("packing_number",packingnumber);
-        queryWrapper.eq("inventory_status",inventorystatus);
-        queryWrapper.eq("location_code",locationcode);
-        List<ExpectoutDO>  expectoutDO = expectoutMapper.selectList(queryWrapper);
-
-
-        if(!expectoutDO.isEmpty()){
 
-            return expectoutDO;
-        }
-        else{
-            return null;
-        }
 
-    }
     //跟据管理模式查询预计库存  TEO1
-    public  List<ExpectoutDO>  selectlocationnew (String  itemcode, String packingnumber, String  batch, String locationcode, String status ){
+    public List<ExpectoutDO> selectLocatioNew(String itemcode, String packingnumber, String batch, String locationcode, String status) {
-        RuleRespVO    managementtRule     =      ruleService.management( null, null,null,null,null, null,itemcode,null,null,
+        RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null,
-                null, locationcode,null,null);
+                null, locationcode, null, null);
-        List<ExpectoutDO>   expectoutDO = null;
+        List<ExpectoutDO> expectoutDO = null;
-        if( "{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals( managementtRule.getConfiguration())){
+        if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) {
-            expectoutDO   =    selectnumbernew(itemcode, status, locationcode  );
+            expectoutDO = expectoutService.selectNumberNew(itemcode, status, locationcode);
-
+        } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) {
+            expectoutDO = expectoutService.selectBatchNew(itemcode, batch, status, locationcode);
+
+        } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) {
+            expectoutDO = expectoutService.selectPackingNew(itemcode, packingnumber, batch, status, locationcode);
+        } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
+            expectoutDO = expectoutService.selectUniqeIdNew(packingnumber, locationcode, status);
         }
-        else if("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())){
-            expectoutDO   =  selectbatchnew(itemcode,batch,status,locationcode);
-
-        }
-
-        else if("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) {
-            expectoutDO   =  selectpackingnew(itemcode,packingnumber,  batch, status, locationcode);
-        }
-
-        else if("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
-            expectoutDO   =  selectuniqeidnew(packingnumber,  locationcode,status);
-        }
-
         return expectoutDO;
-
     }
 
-
     //查询可用库存 TB3
-
+    public BigDecimal CountLocaltion(String itemcode, String packingnumber, String batch, String locationcode, String status) {
-    public BigDecimal  CountLocaltion(String  itemcode,String packingnumber,String batch,String locationcode,String status ){
+        List<ExpectoutDO> expectoutDO = selectLocatioNew(itemcode, packingnumber, batch, locationcode, status);
-        List<ExpectoutDO>   expectoutDO =  selectlocationnew(itemcode,packingnumber,batch,locationcode,status);
+        List<BalanceDO> balanceDO = selectlocation(itemcode, packingnumber, batch, locationcode, status);
-        List<BalanceDO>      balanceDO     =   selectlocation(itemcode,packingnumber,batch,locationcode,status);
-
-        //double sum = expectoutDO.stream().mapToDouble(ExpectoutDO::getQty).sum();
         BigDecimal esum = BigDecimal.valueOf(expectoutDO.stream().mapToDouble(expectoutDO1 -> expectoutDO1.getQty().doubleValue()).sum());
-        BigDecimal bsum =BigDecimal.valueOf(balanceDO.stream().mapToDouble(balanceDO1 -> balanceDO1.getQty().doubleValue()).sum());
+        BigDecimal bsum = BigDecimal.valueOf(balanceDO.stream().mapToDouble(balanceDO1 -> balanceDO1.getQty().doubleValue()).sum());
         BigDecimal sum = bsum.subtract(esum);
         return sum;
     }
-    //有无库存效验
 
-    public  String  LocaltionExist(String itemcode, String packingnumber,String batch,String locationcode,String status,BigDecimal  requstqty){
+    //有无库存效验
-        BigDecimal  enableqty = CountLocaltion(itemcode,packingnumber,batch,locationcode,status);
+    public String LocaltionExist(String itemcode, String packingnumber, String batch, String locationcode, String status, BigDecimal requstqty) {
-        if(requstqty.compareTo(enableqty) > 0){
+        BigDecimal enableqty = CountLocaltion(itemcode, packingnumber, batch, locationcode, status);
-            throw exception(new ErrorCode(1256,"请求数量" +  requstqty   +  "大于库存数量"  + enableqty));
+        if (requstqty.compareTo(enableqty) > 0) {
-        }
+            throw exception(new ErrorCode(1256, "请求数量" + requstqty + "大于库存数量" + enableqty));
-        else{
+        } else {
             return "成功";
         }
-
     }
 
-
-
-
-
     //查询储存容量
-
+    public String selectlocationstrategy(String itemcode, String locationcode) {
-    public  String  selectlocationstrategy(String  itemcode, String locationcode){
+        RuleRespVO storagecapacityrule = ruleService.storageCapacity(null, null, itemcode, null, null, null, locationcode);
-        RuleRespVO    storagecapacityrule     =  ruleService.storageCapacity(null,null,itemcode,null,null,null,locationcode);
         String[] StorageQty = storagecapacityrule.getConfiguration().split(",");
         String[] StorageQty1 = StorageQty[1].split(":");
         String StorageQty2 = StorageQty1[1];
-        if("-1".equals(StorageQty2)){
+        if ("-1".equals(StorageQty2)) {
             return "不可以存放";
         }
         return "可以存放";
-
     }
 
-
     //库存不应该存在
-    public List<BalanceDO>   locationNoExist(String itemcode,String packingnumber,String locationcode,String inventorystatus){
+    public List<BalanceDO> locationNoExist(String itemcode, String packingnumber, String locationcode, String inventorystatus) {
-        RuleRespVO    managementtRule     =      ruleService.management( null, null,null,null,null, null,itemcode,null,null,
+        RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null,
-                null, locationcode,null,null);
+                null, locationcode, null, null);
-        List<BalanceDO>   balanceDO = null;
+        List<BalanceDO> balanceDO = null;
-        if("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())){
+        if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
-            balanceDO   =  selectuniqueid(packingnumber,  locationcode,inventorystatus);
+            balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventorystatus);
-            return  balanceDO;
+            return balanceDO;
-
+        } else {
-        }
+            throw exception(new ErrorCode(1256, "校验通过"));
-        else{
-            throw exception(new ErrorCode(1256,"校验通过"  ));
         }
-
-
     }
+
     //查询库位BQ-QL
-    public  String  selectlocation(String code){
+    public String selectlocation(String code) {
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("code",code);
+        queryWrapper.eq("code", code);
-        LocationDO  locationDO = locationMapper.selectOne(queryWrapper);
+        LocationDO locationDO = locationMapper.selectOne(queryWrapper);
-        if(locationDO==null&&"TRUE".equals(locationDO.getAvailable())){
+        if (locationDO == null && "TRUE".equals(locationDO.getAvailable())) {
-            return  "TURE";
+            return "TURE";
-        }
+        } else {
-        else{
+            return "FALSE";
-            return  "FALSE";
         }
     }
 
-
-
-
-
-
-
-
-
-
     //从库位未被其他任务占用，有可用库存
-    public String locationExistnew(String itemcode, String packingnumber,String batch,String fromlocationcode,String status,BigDecimal  requstqty ){
+    public String locationExistnew(String itemcode, String packingnumber, String batch, String fromlocationcode, String status, BigDecimal requstqty) {
-        if(fromlocationcode.isEmpty()){
+        if (fromlocationcode.isEmpty()) {
             return "不需要其他校验";
         }
-        String  Yesorno = selectlocation(fromlocationcode);
+        String Yesorno = selectlocation(fromlocationcode);
-        if("TURE".equals(Yesorno)){
+        if ("TURE".equals(Yesorno)) {
 
-            String  END =  LocaltionExist(itemcode,packingnumber,batch,fromlocationcode,status,requstqty);
+            String END = LocaltionExist(itemcode, packingnumber, batch, fromlocationcode, status, requstqty);
             return END;
-        }
+        } else {
-        else{
             return "效验通过";
         }
-
     }
-
-
-
-
-
 }