修改

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

@@ -148,7 +148,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                 BigDecimal houseGrid = wmsInboundResultServiceImpl.getGrid(conditionMap.get("distributeId").toString(), i+1);
                 //如果差不多、说明上一个人少扫了一次
                 if (houseGrid==null){
-                    houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-1, personnelWorkshopid);
+                    houseGrid = rmsPwarehouseGridService.selectGrid(i+1, personnelWorkshopid);
                     //创建实时库存
                     wmspGridMaterialService.initInsertWmspGridMaterial(item,houseGrid);
                 }
@@ -180,7 +180,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
 
                     Map<String,Object> item=mapList.get(i);
                     //获得一个默认的网格  解释：目前还没有设计出来网格的结构 没有做默认为 第一库、第一月台、第一垛位、第一行、第一列 \推送信息给行车工、让他们抢单代码备注了
-                    BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-1, personnelWorkshopid);
+                    BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(i+1, personnelWorkshopid);
                     //创建一个入库作业实绩
                     WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(0,i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item);
                     //改变扫码实绩里面的状态

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

@@ -309,8 +309,12 @@ public class WmspOutboundResultController extends BaseRESTfulController {
                 wmspOutboundScanResult.setResultId(new BigDecimal(seq_wmspOutboundScanResult));
                 //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表
                 List<Map<String, Object>> list= wmspInboundScanResultMapper.getInboundResultIdByMaterial(subResultMaterial);
-//                默认以获取到的第一个值作为入库实绩Id
+                //默认以获取到的第一个值作为入库实绩Id
                 Map<String ,Object> map1 = list.get(0);
+                //如果等于0说明该物资没有录入系统
+                if (list.size()==0){
+
+                }
                 wmspOutboundScanResult.setInboundResultId((BigDecimal) map1.get("inboundResultId"));
                 //插入出库实绩ID
                 wmspOutboundScanResult.setOutboundResultId(resultId);

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-wms-api

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8