物料类型加库位行数，分配库位匹配行数

周鸿
1 parent d46b7735
Showing 6 changed files with 46 additions and 3 deletions
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
src/main/java/com/huaheng/pc/config/materialType/domain/MaterialType.java
src/main/java/com/huaheng/pc/config/materialType/service/MaterialTypeService.java
src/main/resources/templates/config/materialType/add.html
src/main/resources/templates/config/materialType/edit.html
@@ -16,6 +16,8 @@ import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.locationType.domain.LocationType;
 import com.huaheng.pc.config.locationType.service.LocationTypeService;
+import com.huaheng.pc.config.materialType.domain.MaterialType;
+import com.huaheng.pc.config.materialType.service.MaterialTypeService;
 import com.huaheng.pc.config.zone.domain.Zone;
 import com.huaheng.pc.config.zone.service.ZoneService;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
@@ -48,6 +50,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
     @Resource
     private ConfigService configService;
  
+
     @Override
     public String allocation(int locationRule, List<String> locationTypeCodeList,
              int high, String area, List<String> raodWays, String warehouseCode,
@@ -181,10 +184,17 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
 //        .in(StringUtils.isNotEmpty(roadWays), Location::getRoadway, roadWays)
         .eq(Location::getStatus, QuantityConstant.STATUS_LOCATION_EMPTY)
         .eq(high!=0,Location::getHigh,high)
-        .eq(StringUtils.isNotEmpty(materialAreaCode), Location::getMaterialAreaCode, materialAreaCode)
+
+//        .eq(StringUtils.isNotEmpty(materialAreaCode), Location::getMaterialAreaCode, materialAreaCode)
         .in(Location::getLocationType, locationTypeCodeList)
         .eq(Location::getDeleted, 0)
         .eq(Location::getContainerCode, "");
+
+        if(StringUtils.isNotEmpty(materialAreaCode)){
+            String[] split=materialAreaCode.split(",");
+            List<String> rowslist=Arrays.asList(split);
+            locationLambda.in(StringUtils.isNotEmpty(materialAreaCode), Location::getIRow, rowslist);
+        }
         //3楼agv查询库位
         if(StringUtils.isNotEmpty(weight)){
             /*locationLambda.in(Location::getIRow,12,13);
@@ -204,8 +204,10 @@ public class WarecellAllocationServiceImpl implements WarecellAllocationService 
         if(receiptContainerDetailList != null && receiptContainerDetailList.size() > 0) {
             String materialCode = receiptContainerDetailList.get(0).getMaterialCode();
             Material material = materialService.findAllByCode(materialCode, warehouseCode);
-            materialAreaCode = material.getMaterialAreaCode();
-        }
+//            materialAreaCode = material.getMaterialAreaCode();
+            String rows=materialTypeService.getMaterialTypeByCode(material.getType());
+            materialAreaCode=rows;
+;        }
         //****************************
         List<String> roadwaylist=findTaskNoComplete();
         locationCode = locationAllocationService.allocation(allocationRule,
@@ -265,5 +265,12 @@ public class MaterialType implements Serializable {
     @ApiModelProperty(value="自定义字段8")
     private String userDef8;
  
+    /**
+     * 对应库位行数，英文逗号隔开
+     */
+    @TableField(value = "rows")
+    @ApiModelProperty(value="对应库位行数")
+    private String rows;
+
     private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
@@ -27,4 +27,16 @@ public class MaterialTypeService extends ServiceImpl&lt;MaterialTypeMapper, Materia
         lambda.eq(MaterialType::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.listMaps(lambda);
     }
+
+    public String getMaterialTypeByCode(String code){
+        LambdaQueryWrapper<MaterialType> lambda = Wrappers.lambdaQuery();
+        lambda.eq(MaterialType::getCode, code);
+        lambda.last("limit 1");
+        MaterialType materialType=this.getOne(lambda);
+        if(materialType!=null){
+            return materialType.getRows();
+        }else{
+            return null;
+        }
+    }
 }
@@ -32,6 +32,12 @@
             </div>
         </div>
         <div class="form-group">
+            <label class="col-sm-3 control-label">库位行数：</label>
+            <div class="col-sm-8">
+                <input id="rows" name="rows" class="form-control" type="text" placeholder="英文逗号隔开；比如：1,2">
+            </div>
+        </div>
+        <div class="form-group">
             <label class="col-sm-3 control-label">保质期（天）：</label>
             <div class="col-sm-8">
                 <input id="daysToExpire" name="daysToExpire" class="form-control" type="number">
@@ -35,6 +35,12 @@
             </div>
         </div>
         <div class="form-group">
+            <label class="col-sm-3 control-label">库位行数：</label>
+            <div class="col-sm-8">
+                <input id="rows" name="rows" class="form-control" type="text" placeholder="英文逗号隔开；比如：1,2" th:field="*{rows}">
+            </div>
+        </div>
+        <div class="form-group">
             <label class="col-sm-3 control-label">保质期（天）：</label>
             <div class="col-sm-8">
                 <input id="daysToExpire" name="daysToExpire" class="form-control" type="number" th:field="*{daysToExpire}">