出入库类型修改成动态

李泰瑜
1 parent 299be2ed
Showing 2 changed files with 23 additions and 15 deletions
src/main/java/com/huaheng/api/general/service/ReceiptApiService.java
src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
@@ -102,13 +102,14 @@ public class ReceiptApiService {
         if(receiptDetails.isEmpty()) {
             return AjaxResult.error("入库子单为空");
         }
-        switch (receiptHeader.getReferType()){
-            case "01receipt" :
-                receiptHeader.setReceiptType("SHUZ");
-                break;
-            default:
-                return AjaxResult.error(receiptHeader.getReferType()+"：没有这入库单类型");
+        LambdaQueryWrapper<ReceiptType> receiptTypeQuery =  Wrappers.lambdaQuery();
+        receiptTypeQuery.eq(ReceiptType::getReferType,receiptHeader.getReferType());
+        ReceiptType receiptType = receiptTypeService.getOne(receiptTypeQuery);
+        if (receiptType==null)
+        {
+            return AjaxResult.error("入库单类型不存在 请检查配置");
         }
+        receiptHeader.setReceiptType(receiptType.getCode());
         checkReceiptBill(receiptHeader.getReferCode(),receiptHeader.getReceiptType());
@@ -8,12 +8,15 @@ import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.mobile.shipment.Shipment;
 import com.huaheng.pc.config.company.domain.Company;
 import com.huaheng.pc.config.company.service.CompanyService;
 import com.huaheng.pc.config.customer.domain.Customer;
 import com.huaheng.pc.config.customer.service.CustomerServiceImpl;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
+import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
 import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
 import com.huaheng.pc.config.shipmentType.service.ShipmentTypeService;
 import com.huaheng.pc.config.warehouse.domain.Warehouse;
@@ -81,6 +84,8 @@ public class ShipmentApiService {
     @Resource
     private ShipmentContainerDetailService shipmentContainerDetailService;
+
+
     /**
      *  出库单下发
      *
@@ -108,16 +113,18 @@ public class ShipmentApiService {
         if(shipmentDetails.size() < 1 || shipmentDetails == null ){
             return AjaxResult.error("出库子单为空");
         }
-        switch (shipmentHeader.getReferType()){
-            case "04release" :
-                shipmentHeader.setShipmentType("SHUZ");
-                break;
-            case "06transferOutbound" :
-                shipmentHeader.setShipmentType("QTCK");
-                break;
-            default:
-                return AjaxResult.error(shipmentHeader.getReferType()+"：没有这出库单类型");
+
+        
+        LambdaQueryWrapper<ShipmentType> shipmentTypeLambdaQueryWrapper =  Wrappers.lambdaQuery();
+        shipmentTypeLambdaQueryWrapper.eq(ShipmentType::getReferType,shipmentHeader.getReferType());
+        ShipmentType shipmentType = shipmentTypeService.getOne(shipmentTypeLambdaQueryWrapper);
+        if (shipmentType==null)
+        {
+            return AjaxResult.error("入库单类型不存在 请检查配置");
         }
+
+        shipmentHeader.setShipmentType(shipmentType.getCode());
+
         checkShipmentBill(shipmentHeader.getReferCode(),shipmentHeader.getShipmentType());
         //2、检查出库主单的合法性