Tiroble 3 years ago
parent
commit
3f25fa0fd0

+ 4 - 2
src/main/java/com/steerinfo/dil/controller/WmsInboundResultController.java

@@ -195,8 +195,10 @@ public class WmsInboundResultController extends BaseRESTfulController {
                 for (int i=0;i<mapList.size();i++) {
 
                     Map<String, Object> item = mapList.get(i);
-                    //获得一个默认的网格  解释:目前还没有设计出来网格的结构 没有做默认为 第一库、第一月台、第一垛位、第一行、第一列 \推送信息给行车工、让他们抢单代码备注了
-                    BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size() - 1, personnelWorkshopid);
+                    //获得高线库
+                    HashMap<String, Object> map3 = new HashMap<>();
+                    map3.put("warehouseId",3);
+                    BigDecimal houseGrid=rmsPwarehouseGridService.getGridId(map3);;
                     //创建一个入库作业实绩
                     WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(1, i + 1, personnelWorkshopid, new BigDecimal(0), userName, wmspInboundDistribute.getDistributeId(), houseGrid, item);
                     //改变扫码实绩里面的状态

+ 2 - 5
src/main/resources/application-dev.yml

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