报错修改，以及库存分配规则加入物料种类

pengcheng
1 parent f53fb3ad
Showing 4 changed files with 27 additions and 4 deletions
src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
src/main/resources/mybatis/task/TaskHeaderMapper.xml
@@ -97,14 +97,16 @@ public class ReceivingService {
             if (StringUtils.isEmpty(locatingRule)){
                 //入库单明细为空时，查询物料表中是否含有定位规则
                 LambdaQueryWrapper<Material> materialLambda = Wrappers.lambdaQuery();
-                materialLambda.eq(Material::getCode, receiptContainerDetail.getMaterialCode());
+                materialLambda.eq(Material::getCode, receiptContainerDetail.getMaterialCode())
+                    .eq(Material::getWarehouseCode,ShiroUtils.getWarehouseCode());
                 Material material = materialService.getOne(materialLambda);
                 locatingRule = material.getLocatingRule();
  
                 if (StringUtils.isEmpty(locatingRule)){
                     //物料表中定位规则为空时，查询物料类别
                     LambdaQueryWrapper<MaterialType> materialTypeLambda = Wrappers.lambdaQuery();
-                    materialTypeLambda.eq(MaterialType::getCode, material.getType());
+                    materialTypeLambda.eq(MaterialType::getCode, material.getType())
+                    .eq(MaterialType::getWarehouseCode,ShiroUtils.getWarehouseCode());
                     MaterialType materialType = materialTypeService.getOne(materialTypeLambda);
                     locatingRule = materialType.getLocatingRule();
                     if (StringUtils.isEmpty(locatingRule)){
@@ -535,7 +535,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
             }
         }
         if(num==shipmentDetailList.size()){
-            throw new ServiceException("单据物料在此库区没有库存,无法出库");
+            throw new ServiceException("单据物料的库存分配规则在此库区没有库存,无法出库");
         }
         return AjaxResult.success("成功",list);
     }
@@ -11,6 +11,8 @@ import com.huaheng.pc.config.configValue.domain.ConfigValue;
 import com.huaheng.pc.config.configValue.service.ConfigValueService;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialServiceImpl;
+import com.huaheng.pc.config.materialType.domain.MaterialType;
+import com.huaheng.pc.config.materialType.service.MaterialTypeService;
 import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
 import com.huaheng.pc.config.shipmentPreference.service.ShipmentPreferenceService;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
@@ -41,6 +43,8 @@ public class ShippingCombinationService {
     ShipmentPreferenceService shipmentPreferenceService;
     @Autowired
     MaterialServiceImpl materialService;
+    @Autowired
+    MaterialTypeService materialTypeService;
  
  
  
@@ -102,6 +106,23 @@ public class ShippingCombinationService {
             return list;
         }
  
+        //物料的分配规则没有时，优先物料种类的分配规则
+        LambdaQueryWrapper<MaterialType> materialTypelam=Wrappers.lambdaQuery();
+        materialTypelam.eq(MaterialType::getCode,material.getType())
+                .eq(MaterialType::getWarehouseCode,shipmentDetail.getWarehouseCode());
+        MaterialType materialType=materialTypeService.getOne(materialTypelam);
+        if(StringUtils.isNotEmpty(materialType.getAllocationRule())){
+            filterConfigDetailLambdaQueryWrapper.eq(FilterConfigDetail::getCode,materialType.getAllocationRule());
+            filterConfigDetail=filterConfigDetailService.getOne(filterConfigDetailLambdaQueryWrapper);
+            if(filterConfigDetail==null){
+                throw new ServiceException("物料种类出库规则配置不存在");
+            }
+
+            //根据sql查库存
+            list=inventoryDetailService.selectBysql(filterConfigDetail.getStatement(),shipmentDetail,filterConfigDetail.getStatements(),shipmentPreference);
+            return list;
+        }
+
         //都没有时，默认仓库的分配规则
  
         //查找分配规则
@@ -47,7 +47,7 @@
     <select id="getReceiptTask" resultType="java.util.Map">
    SELECT rd.id receiptDetailId,rd.receiptId,td.taskId, td.warehouseCode, td.id taskDetailId, td.status,
                  td.containerCode, td.qty, td.materialCode,rd.totalQty,td.materialSpec,
-					rd.receiptCode,td.inventorySts,
+					rd.receiptCode,rd.inventorySts,
                  td.materialName, rd.batch, rd.lot,
                  rd.manufactureDate, rd.expirationDate
         FROM task_detail td