修改完成

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

@@ -9,9 +9,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.awt.*;
-import java.util.LinkedList;
-
 /**
  * @author luobang
  * @create 2021-10-10 17:59

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

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
-import com.steerinfo.dil.service.IRmsPwarehouseGridService;
 
 import com.steerinfo.dil.service.impl.RmsPwarehouseGridServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -10,9 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.service.IRmsStackingService;
 import com.steerinfo.dil.service.impl.RmsStackingServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;

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

@@ -4,7 +4,6 @@ import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.mapper.WmspGridMaterialMapper;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.ICommonService;
-import com.steerinfo.dil.service.IWmspInboundDistributeService;
 import com.steerinfo.dil.service.impl.*;
 import com.steerinfo.dil.util.*;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -13,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -148,7 +146,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                 BigDecimal houseGrid = wmsInboundResultServiceImpl.getGrid(conditionMap.get("distributeId").toString(), i+1);
                 //如果差不多、说明上一个人少扫了一次
                 if (houseGrid==null){
-                    houseGrid = rmsPwarehouseGridService.selectGrid(i+1, personnelWorkshopid);
+                    houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-(i+1), personnelWorkshopid,new BigDecimal(item.get("materialId").toString()));
                     //创建实时库存
                     wmspGridMaterialService.initInsertWmspGridMaterial(item,houseGrid);
                 }
@@ -181,7 +179,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                     Map<String,Object> item=mapList.get(i);
 
                     //获得一个默认的网格  解释：目前还没有设计出来网格的结构 没有做默认为 第一库、第一月台、第一垛位、第一行、第一列 \推送信息给行车工、让他们抢单代码备注了
-                    BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(i+1, personnelWorkshopid);
+                    BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-(i+1), personnelWorkshopid,new BigDecimal(item.get("materialId").toString()));
                     //创建一个入库作业实绩
                     WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(0,i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item);
                     //改变扫码实绩里面的状态

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

@@ -1,7 +1,5 @@
 package com.steerinfo.dil.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.mapper.WmspInboundResultMapper;
@@ -17,14 +15,12 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.spring.web.json.Json;
 
 import java.math.BigDecimal;
 import java.text.ParseException;

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

@@ -1,9 +1,6 @@
 package com.steerinfo.dil.controller;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.WmsOffSiteLibaryOutbound;
-import com.steerinfo.dil.model.WmspGridMaterial;
-import com.steerinfo.dil.service.IWmsOffSiteLibaryOutboundService;
-import com.steerinfo.dil.service.IWmspGridMaterialService;
 import com.steerinfo.dil.service.impl.WmsOffSiteLibaryOutboundServiceImpl;
 import com.steerinfo.dil.service.impl.WmspGridMaterialServiceImpl;
 import com.steerinfo.dil.util.ColumnDataUtil;

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.WmsOffSiteLibraryInbound;
 import com.steerinfo.dil.model.WmspIntransitInventory;
-import com.steerinfo.dil.service.IWmsOffSiteLibraryInboundService;
 import com.steerinfo.dil.service.impl.WmsOffSiteLibraryInboundServiceImpl;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;

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

@@ -1,14 +1,10 @@
 package com.steerinfo.dil.controller;
 import com.steerinfo.dil.feign.ESFeign;
-import com.steerinfo.dil.service.IWmsInboundResultService;
-import com.steerinfo.dil.service.IWmsInboundScanResultService;
-import com.steerinfo.dil.service.WmsReboundResultService;
 import com.steerinfo.dil.service.impl.WmsInboundResultServiceImpl;
 import com.steerinfo.dil.service.impl.WmsInboundScanResultServiceImpl;
 import com.steerinfo.dil.service.impl.WmspReboundResultServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -21,10 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.WmspGridMaterial;
-import com.steerinfo.dil.service.IWmspGridMaterialService;
 import com.steerinfo.dil.service.impl.WmspGridMaterialServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -10,20 +9,15 @@ import com.steerinfo.dil.util.PageListAdd;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.framework.utils.collection.ListUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**

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

@@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-
 /**
  * @author luobang
  * @create 2021-10-09 14:07

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

@@ -1,12 +1,10 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.model.WmspInboundGroup;
 import com.steerinfo.dil.service.IWmspInboundGroupService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.framework.utils.collection.ListUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,24 +1,17 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.model.WmspIntransitInventory;
-import com.steerinfo.dil.service.IWmspIntransitInventoryService;
 import com.steerinfo.dil.service.impl.WmspIntransitInventoryServiceImpl;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.framework.utils.collection.ListUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.WmspInventoryCheck;
 import com.steerinfo.dil.service.impl.WmspInventoryCheckServiceImpl;

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

@@ -13,8 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

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

@@ -6,11 +6,9 @@ import com.steerinfo.dil.mapper.WmspInboundScanResultMapper;
 import com.steerinfo.dil.model.WmspOutboundResult;
 import com.steerinfo.dil.model.WmspOutboundScanResult;
 import com.steerinfo.dil.service.IWmspOutboundResultMaterialService;
-import com.steerinfo.dil.service.IWmspOutboundResultService;
 import com.steerinfo.dil.service.impl.WmspOutboundResultServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -22,7 +20,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.mapper.CommonSeq;
 import com.steerinfo.dil.model.WmspOutboundScanResult;
-import com.steerinfo.dil.service.IWmspOutboundResultService;
 import com.steerinfo.dil.service.impl.WmspOutboundResultServiceImpl;
 import com.steerinfo.dil.service.impl.WmspOutboundScanResultServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;

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

@@ -1,8 +1,6 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ESFeign;
-import com.steerinfo.dil.service.IRmsPwarehouseGridService;
-import com.steerinfo.dil.service.IWmspRestackScanResultService;
 import com.steerinfo.dil.service.impl.RmsPwarehouseGridServiceImpl;
 import com.steerinfo.dil.service.impl.WmspRestackMakeResultServiceImpl;
 import com.steerinfo.dil.service.impl.WmspRestackScanResultServiceImpl;
@@ -12,8 +10,6 @@ import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import com.steerinfo.dil.model.WmspRestackMakeResult;
-import com.steerinfo.dil.service.IWmspRestackMakeResultService;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.impl.WmspSendReceiveServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;

src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java

@@ -18,4 +18,6 @@ public interface RmsMaterialMapper extends IBaseMapper<RmsMaterial, BigDecimal>
     List<Map<String, Object>> getMaterial();
 
     Map<String, Object> getMaterialId2(HashMap<String, Object> mapMaterial);
+
+    String getMaterialCode(BigDecimal materialId);
 }

src/main/java/com/steerinfo/dil/service/IRmsMaterialService.java

@@ -1,8 +1,5 @@
 package com.steerinfo.dil.service;
 
-import com.baomidou.mybatisplus.extension.api.R;
-import com.steerinfo.dil.model.RmsMaterial;
-
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;

src/main/java/com/steerinfo/dil/service/IRmsPwarehouseGridService.java

@@ -30,5 +30,5 @@ public interface IRmsPwarehouseGridService {
     //根据优先级和启用状态以及垛位上的物资ID来确定物资即将入库哪个垛位
     Map<String, Object> getStackingId(Map<String, Object> map);
     //分配网格
-    BigDecimal selectGrid(Integer size,BigDecimal warehouseId);
+    BigDecimal selectGrid(Integer size,BigDecimal warehouseId,BigDecimal materialId);
 }

src/main/java/com/steerinfo/dil/service/IRmsStackingService.java

@@ -1,8 +1,5 @@
 package com.steerinfo.dil.service;
 
-import com.steerinfo.dil.model.RmsStacking;
-import com.steerinfo.framework.service.IBaseService;
-
 import java.math.BigDecimal;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/IWmsInboundDrivingResultService.java

@@ -1,9 +1,6 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmspInboundDrivingResult;
-import io.swagger.models.auth.In;
-
-import java.math.BigDecimal;
 
 /**
  * @author luobang

src/main/java/com/steerinfo/dil/service/IWmsInboundResultService.java

@@ -1,10 +1,8 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmspInboundResult;
-import io.swagger.models.auth.In;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/IWmsOffSiteLibaryOutboundService.java

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmsOffSiteLibaryOutbound;
-import com.steerinfo.framework.service.IBaseService;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/com/steerinfo/dil/service/IWmsOffSiteLibraryInboundService.java

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmsOffSiteLibraryInbound;
-import com.steerinfo.framework.service.IBaseService;
 import org.apache.ibatis.annotations.MapKey;
 
 import java.math.BigDecimal;

src/main/java/com/steerinfo/dil/service/IWmspGridMaterialService.java

@@ -1,10 +1,8 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmspGridMaterial;
-import com.steerinfo.framework.service.IBaseService;
 
 import java.math.BigDecimal;
-import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/IWmspIntransitInventoryService.java

@@ -1,9 +1,5 @@
 package com.steerinfo.dil.service;
 
-import com.steerinfo.dil.model.WmspIntransitInventory;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/IWmspInventoryCheckService.java

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.service;
 
-import com.steerinfo.dil.model.WmspGridMaterial;
 import com.steerinfo.dil.model.WmspInventoryCheck;
 
 import java.util.HashMap;

src/main/java/com/steerinfo/dil/service/IWmspOutboundResultService.java

@@ -2,7 +2,6 @@ package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmspOutboundResult;
 import com.steerinfo.dil.model.WmspOutboundScanResult;
-import com.steerinfo.framework.service.IBaseService;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/com/steerinfo/dil/service/IWmspOutboundScanResultService.java

@@ -1,9 +1,7 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmspOutboundScanResult;
-import com.steerinfo.framework.service.IBaseService;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/IWmspRestackDrivingResultService.java

@@ -1,9 +1,5 @@
 package com.steerinfo.dil.service;
 
-import com.steerinfo.dil.model.WmspRestackDrivingResult;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/IWmspRestackMakeMaterialService.java

@@ -1,10 +1,6 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmspRestackMakeMaterial;
-import com.steerinfo.dil.model.WmspRestackMakeResult;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.math.BigDecimal;
 
 /**
  * WmspRestackMakeMaterial服务接口：

src/main/java/com/steerinfo/dil/service/IWmspRestackMakeResultService.java

@@ -1,7 +1,6 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.WmspRestackMakeResult;
-import com.steerinfo.framework.service.IBaseService;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java

@@ -2,7 +2,6 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsMaterialMapper;
 import com.steerinfo.dil.service.IRmsMaterialService;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,4 +29,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         return rmsMaterialMapper.getMaterial();
     }
 
+    public String getMaterialCode(BigDecimal materialId) {
+        return rmsMaterialMapper.getMaterialCode(materialId);
+    }
 }

src/main/java/com/steerinfo/dil/service/impl/RmsMaterialSteelServiceImpl.java

@@ -6,7 +6,6 @@ import com.steerinfo.dil.mapper.RmsMaterialMapper;
 import com.steerinfo.dil.mapper.RmsMaterialSteelMapper;
 import com.steerinfo.dil.model.RmsMaterialSteel;
 import com.steerinfo.dil.service.IRmsMaterialSteelService;
-import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.DecompileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/steerinfo/dil/service/impl/RmsPwarehouseGridServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.RmsPwarehouseGridMapper;
+import com.steerinfo.dil.model.RmsMaterial;
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.dil.service.IRmsPwarehouseGridService;
 import com.steerinfo.dil.util.DataChange;
@@ -31,6 +32,8 @@ public class RmsPwarehouseGridServiceImpl  implements IRmsPwarehouseGridService
     private RmsPwarehouseGridServiceImpl rmsPwarehouseGridService;
     @Autowired
     private RmsStackingServiceImpl rmsStackingService;
+    @Autowired
+    private RmsMaterialServiceImpl rmsMaterialService;
     @Override
     public int insertSelective(RmsPwarehouseGrid rmsPwarehouseGrid) {
         long id;
@@ -62,7 +65,7 @@ public class RmsPwarehouseGridServiceImpl  implements IRmsPwarehouseGridService
     @Override
     public Map<String,Object> getStackingId(Map<String, Object> map){
         //获取入库的物资数量,物资编码
-        Integer materialNum = DataChange.dataToBigDecimal(map.get("materialNum")).intValue();
+        //Integer materialNum = DataChange.dataToBigDecimal(map.get("materialNum")).intValue();
         String materialCode = (String)map.get("materialCode");
         Integer inboundSize = DataChange.dataToBigDecimal(map.get("materialSize")).intValue();
         //获取入库的仓库
@@ -125,10 +128,18 @@ public class RmsPwarehouseGridServiceImpl  implements IRmsPwarehouseGridService
 
 
     @Override
-    public BigDecimal selectGrid(Integer size,BigDecimal warehouseId) {
-
+    public BigDecimal selectGrid(Integer size,BigDecimal warehouseId,BigDecimal materialId) {
         //查询入库垛位信息
         Map<String,Object> stackingMap = rmsStackingService.getStackingToUpdate(size,warehouseId,"1");
+        //创建一个查询条件
+//        Map<String ,Object> stackingResult=new HashMap<>();
+//        stackingResult.put("materialSize",size);
+//        //根据物资实绩ID查询物资编码
+//        String materialCode =rmsMaterialService.getMaterialCode(materialId);
+//        stackingResult.put("materialCode",materialCode);
+//        stackingResult.put("warehouseId",warehouseId);
+        //查询朵唯信息
+       // Map<String,Object> stackingMap=getStackingId(stackingResult);
         //获取入库垛位ID
         BigDecimal ST = (BigDecimal) stackingMap.get("stackingId");
 

src/main/java/com/steerinfo/dil/service/impl/RmsStackingServiceImpl.java

@@ -4,10 +4,7 @@ import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.mapper.RmsStackingMapper;
 import com.steerinfo.dil.model.RmsStacking;
 import com.steerinfo.dil.service.IRmsStackingService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;

src/main/java/com/steerinfo/dil/service/impl/WmsOffSiteLibaryOutboundServiceImpl.java

@@ -3,8 +3,6 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.WmsOffSiteLibaryOutboundMapper;
 import com.steerinfo.dil.model.WmsOffSiteLibaryOutbound;
 import com.steerinfo.dil.service.IWmsOffSiteLibaryOutboundService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/steerinfo/dil/service/impl/WmsOffSiteLibraryInboundServiceImpl.java

@@ -3,8 +3,6 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.WmsOffSiteLibraryInboundMapper;
 import com.steerinfo.dil.model.WmsOffSiteLibraryInbound;
 import com.steerinfo.dil.service.IWmsOffSiteLibraryInboundService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/steerinfo/dil/service/impl/WmspGridMaterialServiceImpl.java

@@ -6,8 +6,6 @@ import com.steerinfo.dil.mapper.WmspGridMaterialMapper;
 import com.steerinfo.dil.model.WmspGridMaterial;
 import com.steerinfo.dil.service.IWmspGridMaterialService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/steerinfo/dil/service/impl/WmspIntransitInventoryServiceImpl.java

@@ -1,14 +1,10 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.WmspIntransitInventoryMapper;
-import com.steerinfo.dil.model.WmspIntransitInventory;
 import com.steerinfo.dil.service.IWmspIntransitInventoryService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/impl/WmspInventoryCheckServiceImpl.java

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.service.impl;
 
-import com.netflix.discovery.converters.Auto;
 import com.steerinfo.dil.mapper.WmspInventoryCheckMapper;
 import com.steerinfo.dil.model.WmspInventoryCheck;
 import com.steerinfo.dil.service.IWmspInventoryCheckService;

src/main/java/com/steerinfo/dil/service/impl/WmspIvboundMakeMaterialServiceImpl.java

@@ -1,8 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.mapper.WmspIvboundMakeMaterialMapper;
 import com.steerinfo.dil.service.IWmspIvboundMakeMaterialService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/steerinfo/dil/service/impl/WmspOutboundResultMaterialServiceImpl.java

@@ -8,7 +8,6 @@ import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;

src/main/java/com/steerinfo/dil/service/impl/WmspOutboundResultServiceImpl.java

@@ -4,12 +4,9 @@ import com.steerinfo.dil.feign.TmstruckFeign;
 import com.steerinfo.dil.mapper.CommonSeq;
 import com.steerinfo.dil.mapper.WmspOutboundResultMapper;
 import com.steerinfo.dil.mapper.WmspOutboundScanResultMapper;
-import com.steerinfo.dil.model.WmspInboundResult;
 import com.steerinfo.dil.model.WmspOutboundResult;
 import com.steerinfo.dil.model.WmspOutboundScanResult;
 import com.steerinfo.dil.service.IWmspOutboundResultService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/steerinfo/dil/service/impl/WmspOutboundScanResultServiceImpl.java

@@ -3,12 +3,9 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.WmspOutboundScanResultMapper;
 import com.steerinfo.dil.model.WmspOutboundScanResult;
 import com.steerinfo.dil.service.IWmspOutboundScanResultService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/impl/WmspRestackDrivingResultServiceImpl.java

@@ -1,17 +1,12 @@
 package com.steerinfo.dil.service.impl;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.steerinfo.dil.mapper.RmsStackingMapper;
 import com.steerinfo.dil.mapper.WmspGridMaterialMapper;
 import com.steerinfo.dil.mapper.WmspRestackDrivingResultMapper;
 import com.steerinfo.dil.mapper.WmspRestackMakeResultMapper;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IWmspRestackDrivingResultService;
-import com.steerinfo.dil.service.IWmspRestackMakeMaterialService;
-import com.steerinfo.dil.service.IWmspRestackScanResultService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/steerinfo/dil/service/impl/WmspRestackMakeMaterialServiceImpl.java

@@ -3,13 +3,9 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.WmspRestackMakeMaterialMapper;
 import com.steerinfo.dil.model.WmspRestackMakeMaterial;
 import com.steerinfo.dil.service.IWmspRestackMakeMaterialService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-
 /**
  * WmspRestackMakeMaterial服务实现：
  * @author generator

src/main/java/com/steerinfo/dil/service/impl/WmspRestackMakeResultServiceImpl.java

@@ -3,12 +3,9 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IWmspRestackMakeResultService;
-import com.steerinfo.dil.service.IWmspRestackScanResultService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.model.WmspGridMaterial;
 import com.steerinfo.dil.util.IDUtils;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/steerinfo/dil/service/impl/WmspRestackMakeTypeResultServiceImpl.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/steerinfo/dil/service/impl/WmspRestackScanResultServiceImpl.java

@@ -5,8 +5,6 @@ import com.steerinfo.dil.mapper.WmspRestackScanResultMapper;
 import com.steerinfo.dil.model.WmspRestackScanResult;
 import com.steerinfo.dil.service.IWmspRestackScanResultService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;

src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml

@@ -447,6 +447,11 @@ select rm.material_id "id",
     from rms_material rm
     where rm.material_code = #{materialCode}
   </select>
+  <select id="getMaterialCode" resultType="java.lang.String">
+    select  rm.MATERIAL_CODE "materialCode" from RMS_MATERIAL_STEEL rms
+    left join rms_material rm on rms.material_id=rm.material_id
+    where  rms.MATERIAL_STEEL_ID =#{materialId}
+  </select>
 
 
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/RmsStackingMapper.xml

@@ -514,7 +514,7 @@
         set (rs.stacking_material_number, rs.stacking_remain_number)=
                 (select rs.stacking_material_number + 1,
                         rs.stacking_remain_number - 1
-                 from rms_stackingrs
+                 from rms_stacking rs
                  where rs.stacking_id = #{stackId})
         where rs.stacking_id = #{stackId}
     </update>

src/main/resources/com/steerinfo/dil/mapper/WmspInboundScanResultMapper.xml

@@ -1001,7 +1001,7 @@ where wisr.result_id = #{stackResultId}
         left join  WMSP_INBOUND_GROUP wig
         on wisr.inbound_Group_Id=wig.inbound_Group_Id
         where ((wig.USER_NAME_ONE ='${userName}' or wig.USER_NAME_TWO ='${userName}') and wig.state=1 and wisr.INSERT_USERNAME=#{userName}
-        and wisr.result_material=#{resultMaterial} ) wisr
+        and wisr.result_material=#{resultMaterial} )
     </select>
     <!--查询已经扫描但是没有下发的-->
     <select id="noIssueScanResult" resultMap="BaseResultMap">