dsffjd

src/main/java/com/steerinfo/dil/controller/WmsInboundResultController.java

@@ -363,7 +363,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                     }else if (wmspInboundDistribute.getPersonnelWorkshopid().compareTo(new BigDecimal(2))==0){
                         houseGrid = new BigDecimal("24472");
                     }else {
-                        return null;
+                        houseGrid = new BigDecimal("72335");
                     }
                     //创建一个入库作业实绩
                     WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(1,i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item,remark);
@@ -386,8 +386,13 @@ public class WmsInboundResultController extends BaseRESTfulController {
                     Map<String, Object> item = mapList.get(i);
                     //获得高线库
                     HashMap<String, Object> map3 = new HashMap<>();
-                    map3.put("warehouseId",3);
-                    BigDecimal houseGrid=rmsPwarehouseGridService.getGridId(map3);;
+                    BigDecimal houseGrid = null;
+                    if(wmspInboundDistribute.getPersonnelWorkshopid().compareTo(new BigDecimal(4))==0){
+                        houseGrid = new BigDecimal("72335");
+                    }else{
+                        map3.put("warehouseId",3);
+                        houseGrid=rmsPwarehouseGridService.getGridId(map3);
+                    }
                     //创建一个入库作业实绩
                     WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(1, i + 1, personnelWorkshopid, new BigDecimal(0), userName, wmspInboundDistribute.getDistributeId(), houseGrid, item,remark);
                     //改变扫码实绩里面的状态