BUG修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java

@@ -70,12 +70,11 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
     private SupplieritemService supplieritemService;
     @Resource
     private SerialNumberApi serialNumberApi;
+    @Resource
     private TrendsApi trendsApi;
 
     @Override
     public Long createDemandforecastingMain(DemandforecastingMainCreateReqVO createReqVO) {
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePrediction");
-        createReqVO.setBusinessType(businesstypeDO.getCode());
         String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PREDICTION.getCode());
         createReqVO.setNumber(number);
         createReqVO.setCreateTime(LocalDateTime.now());
@@ -188,6 +187,7 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
      * @param mainDo
      * @return
      */
+
     private String validateDemandforecastingMainImport(DemandforecastingMainDO mainDo, BusinesstypeDO businesstypeDO) {
         // 校验，判断是否有不符合的原因，并加入errorList,如果主表则所有子表都加入errorList
         String messageMain = "";
@@ -249,6 +249,7 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
 
 
     //新增方法（主和子）
+    @Transactional
     private DemandforecastingMainDO validatorToCreate(DemandforecastingMainCreateReqVO createReqVO) {
         DemandforecastingMainDO demandforecastingMainDO = validateMainMethod(createReqVO);
         //子表校验
@@ -269,6 +270,7 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
     }
 
     //修改方法（主和子）
+    @Transactional
     private DemandforecastingMainDO validatorToUpdate(DemandforecastingMainUpdateReqVO updateReqVO) {
         DemandforecastingMainDO demandforecastingMainDO = validateMainMethod(updateReqVO);
         //子表校验
@@ -292,7 +294,7 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe
     //校验子表公共方法(适用于新增/修改)
     private void validateDetailMethod(DemandforecastingMainDO demandforecastingMainDO, DemandforecastingDetailDO demandforecastingDetailDO) {
         itembasicService.selectItembasic(demandforecastingDetailDO.getItemCode());
-        purchaseMainService.selectPurchaseDetailDoExist(demandforecastingDetailDO.getNumber(), demandforecastingMainDO.getSupplierCode(), demandforecastingDetailDO.getItemCode(), demandforecastingDetailDO.getPoLine());
+        purchaseMainService.selectPurchaseDetailDoExist(demandforecastingDetailDO.getPoNumber(), demandforecastingMainDO.getSupplierCode(), demandforecastingDetailDO.getItemCode(), demandforecastingDetailDO.getPoLine());
         supplieritemService.selectSupplierItemExist(demandforecastingMainDO.getSupplierCode(), demandforecastingDetailDO.getItemCode());
     }
 

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

@@ -83,9 +83,19 @@ public interface DockService {
 
     /**
      * 校验(客户地点  月台)收货口有效，状态正确
-     * @author chenfang
+     *
      * @param code 代码
      * @return 月台列表
+     * @author chenfang
      */
     DockDO DockExist(String code);
+
+    /**
+     * 查询月台
+     *
+     * @param code toWarehouseCode
+     * @return 月台列表
+     * @author yejiaxing
+     */
+    DockDO selectDockByTwoCode(String code, String toWarehouseCode);
 }

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

@@ -148,8 +148,7 @@ public class DockServiceImpl implements DockService {
                 DockDO existAccountcalendar = dockMapper.selectByItemCode(dockDO.getCode());
                 if (existAccountcalendar == null && mode != 3) {
                     dockMapper.insert(DockConvert.INSTANCE.convert(dock));
-                }
+                } else if (existAccountcalendar != null && mode != 2) {
-                else if (existAccountcalendar != null && mode != 2) {
                     // 如果存在，判断是否允许更新
                     dockDO.setId(existAccountcalendar.getId());
                     dockMapper.updateById(dockDO);
@@ -160,7 +159,6 @@ public class DockServiceImpl implements DockService {
     }
 
 
-
     private void validateDockForCreateOrUpdate(Long id, String code, String type, String warehouseCode,
                                                String defaultLocationCode, String available) {
         // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
@@ -174,6 +172,7 @@ public class DockServiceImpl implements DockService {
             validateAvailableExists(available);
         });
     }
+
     @VisibleForTesting
     private void validateDockExists(Long id) {
         if (id == null) {
@@ -184,6 +183,7 @@ public class DockServiceImpl implements DockService {
             throw exception(DOCK_NOT_EXISTS);
         }
     }
+
     @VisibleForTesting
     private void validateCodeExists(Long id, String code) {
         if (code.isEmpty()) {
@@ -204,24 +204,28 @@ public class DockServiceImpl implements DockService {
             throw exception(DOCK_CODE_EXISTS);
         }
     }
+
     @VisibleForTesting
     private void validateTypeExists(String type) {
         if (type.isEmpty()) {
             throw exception(DOCK_TYPE_NOT_EXISTS);
         }
     }
+
     @VisibleForTesting
     private void validateWareHouseCodeExists(String warehouseCode) {
         if (warehouseCode.isEmpty()) {
             throw exception(DOCK_WARE_HOUSE_CODE_NOT_EXISTS);
         }
     }
+
     @VisibleForTesting
     private void validateDefaultLocationCodeExists(String defaultLocationCode) {
         if (defaultLocationCode.isEmpty()) {
             throw exception(DOCK_DEFAULT_LOCATION_CODE_NOT_EXISTS);
         }
     }
+
     @VisibleForTesting
     private void validateAvailableExists(String available) {
         if (available.isEmpty()) {
@@ -241,4 +245,18 @@ public class DockServiceImpl implements DockService {
         }
     }
 
+    @Override
+    public DockDO selectDockByTwoCode(String code, String toWarehouseCode) {
+        QueryWrapper<DockDO> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("code", code);
+        queryWrapper.eq("warehouse_code", toWarehouseCode);
+        queryWrapper.eq("available", "TRUE");
+        DockDO dockDO = dockMapper.selectOne(queryWrapper);
+        if (dockDO != null && "TRUE".equals(dockDO.getAvailable())) {
+            return dockDO;
+        } else {
+            throw exception(DOCK_NOT_EXISTS);
+        }
+    }
+
 }

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

@@ -314,10 +314,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
         // 校验物品基础信息
         ItembasicDO itembasicDO = this.validatorItembasic(detailDo.getItemCode());
         if (itembasicDO != null) {
-            if (itembasicDO.getUom() != detailDo.getUom()) {
+            if (!itembasicDO.getUom().equals( detailDo.getUom())) {
-                throw exception(UOM_ERRORR, itembasicDO.getUom(), detailDo.getUom());
-            }
-            if (itembasicDO.getUom() != detailDo.getUom()) {
                 throw exception(UOM_ERRORR, itembasicDO.getUom(), detailDo.getUom());
             }
             if ("FALSE".equals(itembasicDO.getEnableBuy())) {
@@ -325,7 +322,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
             }
         }else {
             throw exception(SCRAP_REQUEST_ITEMCODE_INVALID);
-        }        this.validatorItemPackagingExist(detailDo.getItemCode());
+        }
+        this.validatorItemPackagingExist(detailDo.getItemCode());
         ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(detailDo.getItemCode());
         if (itempackagingDO != null) {
             detailDo.setStdPackUnit(itempackagingDO.getStdPackUnit());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java

@@ -25,6 +25,7 @@ import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMai
 import com.win.module.wms.convert.supplierdeliverRequest.SupplierdeliverRequestDetailConvert;
 import com.win.module.wms.convert.supplierdeliverRequest.SupplierdeliverRequestMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
+import com.win.module.wms.dal.dataobject.dock.DockDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
@@ -48,6 +49,7 @@ import com.win.module.wms.dal.mysql.supplierdeliverRequest.SupplierdeliverReques
 import com.win.module.wms.dal.mysql.supplierdeliverRequest.SupplierdeliverRequestMainMapper;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.enums.request.RequestStatusEnum;
+import com.win.module.wms.service.dock.DockService;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.itempackaging.ItempackagingService;
 import com.win.module.wms.service.location.LocationService;
@@ -130,7 +132,10 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
     @Resource
     private LocationService locationService;
     @Resource
-    PurchasereceiptRequestMainService  purchasereceiptRequestMainService;
+    private PurchasereceiptRequestMainService  purchasereceiptRequestMainService;
+    @Resource
+    private DockService dockService;
+
 
     @Override
     @Transactional
@@ -723,6 +728,9 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         }
         //生成采购收货申请  叶佳兴
         PurchasereceiptRequestMainCreateReqVO purchasereceiptRequestMainCreateReqVO = new PurchasereceiptRequestMainCreateReqVO();
+        //查询月台
+        DockDO dockDO = dockService.selectDockByTwoCode(mainDO.getToDockCode(),mainDO.getToWarehouseCode());
+        mainDO.setToWarehouseCode(dockDO.getWarehouseCode());
         BeanUtils.copyProperties(mainDO, purchasereceiptRequestMainCreateReqVO);
         List<PurchasereceiptRequestDetailCreateReqVO> purchasereceiptRequestDetailCreateReqVOList = new ArrayList<>();
         for (SupplierdeliverRequestDetailDO detailDO : detailDOList) {
@@ -752,8 +760,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
                 purchasereceiptRequestDetailCreateReqVO.setArriveDate(detailDO.getArriveDate());
                 purchasereceiptRequestDetailCreateReqVO.setPackingNumber(packageDO.getNumber());
                 purchasereceiptRequestDetailCreateReqVO.setInventoryStatus("INSP");
-                SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), detailDO.getItemCode());
+                //查询月台后赋值
-                purchasereceiptRequestDetailCreateReqVO.setDefaultToLocationCode(supplieritemDO.getDefaultLocationCode());
+                purchasereceiptRequestDetailCreateReqVO.setDefaultToLocationCode(dockDO.getDefaultLocationCode());
                 purchasereceiptRequestDetailCreateReqVO.setId(null);
                 purchasereceiptRequestDetailCreateReqVOList.add(purchasereceiptRequestDetailCreateReqVO);
             }