提交

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

@@ -282,7 +282,13 @@ public class WmsInboundResultController extends BaseRESTfulController {
 
                     //获得一个默认的网格  解释：目前还没有设计出来网格的结构 没有做默认为 第一库、第一月台、第一垛位、第一行、第一列 \推送信息给行车工、让他们抢单代码备注了
                    // BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-(i+1), personnelWorkshopid,new BigDecimal(item.get("materialId").toString()));
-                    BigDecimal houseGrid = new BigDecimal("12335");
+                    BigDecimal houseGrid = null;
+                    if (wmspInboundDistribute.getPersonnelWorkshopid().compareTo(new BigDecimal(1))==0){
+                        houseGrid = new BigDecimal("12335");
+                    }else if (wmspInboundDistribute.getPersonnelWorkshopid().compareTo(new BigDecimal(2))==0){
+                        houseGrid = new BigDecimal("24472");
+                    }
+
                             //创建一个入库作业实绩
                     WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(1,i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item);
                     //改变扫码实绩里面的状态

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