完成

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

@@ -228,7 +228,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
         for (Map<String,Object> map:mapList
              ) {
             WmspInboundResult wmspInboundResult = new WmspInboundResult();
-            wmspInboundResult.setId(new BigDecimal(wmsInboundResultServiceImpl.count() + 1));
+            wmspInboundResult.setInboundId(new BigDecimal(wmsInboundResultServiceImpl.count() + 1));
             /*
             设置入库类型为生产入库
              */
@@ -286,9 +286,9 @@ public class WmsInboundResultController extends BaseRESTfulController {
                 //获取物资数
                  MN=rmsStackingService.selectMaterialNumber(map1);
                 //计算层次号
-                 CC=(MN+1)/24+1;
+                 CC=(MN)/24+1;
                 //计算层序号
-                 CX=(MN+1)%24;
+                 CX=(MN)%24+1;
                 //更新垛位表
                rmsStackingService.updateStack(ST);
             }

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

@@ -114,7 +114,7 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
                 return failed(mapList);
             }
         }
-
+        wmspInboundScanResult.setResultId(new BigDecimal(String.valueOf(wmsInboundScanResultService.count())));
          //设置入库物资件数，默认一件
         wmspInboundScanResult.setInboundMaterialNumber(new BigDecimal(1));
         //设置吊钢工已扫物资件数

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

@@ -6,8 +6,11 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 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
@@ -22,8 +25,8 @@ public class WmspInboundDrivingController extends BaseRESTfulController {
     @PostMapping("/getInboundStack")
     @ApiOperation(value = "展示入库垛位")
 
-    public Integer getInboundStack(Integer DriverId){
+    public Integer getInboundStack(@RequestParam("driverId") Integer driverId){
 
-        return wmsInboundDrivingResultService.getInboundStack(DriverId);
+        return wmsInboundDrivingResultService.getInboundStack(driverId);
     }
 }

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

@@ -75,7 +75,7 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
         }
         //根据物资编码规查找唯一的物资ID
         HashMap<String, Object> mapMaterial = new HashMap<>();
-        String materialCode = MaterialCode.substring(0, MaterialCode.length() - 1);
+        String materialCode =MaterialCode.contains("\n")? MaterialCode.substring(0, MaterialCode.length() - 1):MaterialCode;
         mapMaterial.put("materialCode", materialCode);
 
         BigDecimal mi = rmsMaterialMapper.getMaterialId(mapMaterial);

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

@@ -481,7 +481,7 @@
 
 <!--根据物资唯一编码查找钢材物资id -->
   <select id="selectMaterialSteelId" resultType="java.math.BigDecimal">
-        select rms.material_steel_id  from steelIdrms_material_steel rms
+        select rms.material_steel_id  from rms_material_steel rms
         where rms.material_only_code=#{materialOnlyCode}
   </select>
   <select id="getMaterialSteel" resultType="Map">

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

@@ -941,7 +941,7 @@ where wisr.result_id = #{stackResultId}
         WHERE RP.PERSONNEL_WORKSHOPID = #{personnelWorkshopid}
         AND RP.PERSONNEL_SHIFTS = #{personnelShifts}
         AND RP.PERSONNEL_TEAM = #{personnelTeam}
-        AND WISR.RESULT_NUMBER = (SELECT WISRA.RESULT_NUMBER FROM WMSP_INBOUND_SCAN_RESULT WISRA WHERE WISRA.RESULT_ID = #{resultId})
+        AND WISR.RESULT_NUMBER != (SELECT WISRA.RESULT_NUMBER FROM WMSP_INBOUND_SCAN_RESULT WISRA WHERE WISRA.RESULT_ID = #{resultId})
     </select>
     <select id="getOtherLoadId" resultType="java.math.BigDecimal" parameterType="java.util.Map">
            select rp.personnel_id
@@ -962,7 +962,7 @@ where wisr.result_id = #{stackResultId}
    select distinct
   wisr.result_id "stackResultId",
   widr.driving_id "drivingResultId",
-  rs.stacking_no "stackNo",
+  rs.stacking_no "stackingNo",
   rpg.warehouse_id "warehouseId",
   rs.stacking_id "stackingId",
   rs.stacking_arrival "stackingArrival"