Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS into dev

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

@@ -319,7 +319,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return null;
     }
 
-    @ApiOperation(value = "司机接收、拒绝接单")
+    @ApiOperation(value = "司u机接收、拒绝接单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码/拒绝原因insertUpdateRemark", required = false, dataType = "Map"),
             @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码/拒绝原因insertUpdateRemark", required = false, dataType = "Map"),
@@ -628,7 +628,6 @@ public class OmstruckOrderController extends BaseRESTfulController {
 
 
     ) {
-
         int count = 0;
         //设置承运商
         if (carrierId != null) {

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

@@ -59,6 +59,7 @@ public class UtilsController extends BaseRESTfulController {
 
 
 
+
     @ApiOperation(value = "运输订单子表新增方法")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "运输订单主键id加同意/拒绝状态码", required = false, dataType = "Map"),

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

@@ -18,6 +18,6 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
 
     List<Map<String,Object>> stackingId();
 
-    @Select("select seq__RMS_PWAREHOUSE_GRID.nextval from dual")
+    @Select("select seq__RMS_PWAREHOUSE_GRIDTEST.nextval from dual")
     BigDecimal gridId();
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
 import com.steerinfo.dil.mapper.RmsPwarehouseGridMapper;
 import com.steerinfo.dil.model.OmstruckOrderMaterial;
+import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -113,7 +114,7 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
                 for (Map<String,Object> stackingIdMap : stackingIdList) {
                     BigDecimal stackingId = (BigDecimal) stackingIdMap.get("stackingId");
                     // 遍历层次
-                    for (int i = 1; i <= 8; i++) {
+                    for (int i = 1; i <= 25; i++) {
                         // 遍历层序
                         for (int j = 1; j <= 24; j++) {
                             // 一棒库时
@@ -170,7 +171,13 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
                                 }
                                 // B月台
                                 if (platformId.intValue() == 4) {
-
+                                    RmsPwarehouseGrid rmsPwarehouseGrid = new RmsPwarehouseGrid();
+                                    BigDecimal gridId = gridId();
+                                    rmsPwarehouseGrid.setGridId(gridId);
+                                    rmsPwarehouseGrid.setWarehouseId(warehouseId);
+                                    rmsPwarehouseGrid.setPlatformId(platformId);
+                                    insertSelective(rmsPwarehouseGrid);
+                                    count++;
                                 }
                                 // C月台
                                 if (platformId.intValue() == 5) {
@@ -205,13 +212,6 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
                                     }
                                 }
                             }
-                            // 高线库时
-                            if (warehouseId.intValue() == 3) {
-                                // A月台
-                                if (platformId.intValue() == 7) {
-//                                    RmsPwarehouseGrid rmsPwarehouseGrid = new RmsPwarehouseGrid();
-                                }
-                            }
                             // 配送库时：
                             if (warehouseId.intValue() == 4) {
                                 // A月台

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

@@ -531,13 +531,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         addMapSporadicOrder.put("mapList",mapList);
         switch (orderType) {
             case 13:
+            case 19:
             case 12:
-            case 20:
                 if (transStatus.intValue()==1){
                     amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
                 }
                 break;
-            //内转零星
+            //普通零星
             case  15:
             case  16:
                 if (sporadicOrderTimes.intValue() > 0) {
@@ -593,6 +593,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 //            case 13:
 //            case 20:
             case 15:
+            case 19:
             case 16:
                     Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(new BigDecimal(orderId));
                     BigDecimal orderTimes =(BigDecimal)sporadicOrderTimes.get("orderTimes");
@@ -810,7 +811,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
             }
             //判断订单是否是一车多单
-            if (orderType.intValue()==15 || orderType.intValue()==16 ) {
+            if (orderType.intValue()==15 || orderType.intValue()==16 || orderType.intValue()==19) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
                 BigDecimal orderTimes = DataChange.dataToBigDecimal(sporadicOrderTimes.get("orderTimes"));
@@ -1439,11 +1440,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public int addInwardOrder(Map<String, Object> mapValue) {
         int result = 0;
         List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
-        String planId = (String) mapValue.get("planId");
-        Integer lineId = (Integer) mapValue.get("lineId");
-        String orderType = (String) mapValue.get("orderType");
+        BigDecimal planId = DataChange.dataToBigDecimal(mapValue.get("planId")) ;
+        BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId")) ;
+        BigDecimal orderType = DataChange.dataToBigDecimal(mapValue.get("orderType")) ;
         Integer carrierId = (Integer) mapValue.get("carrierId");
-        AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(new BigDecimal(planId));
+        AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
         amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
         result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
         for (Map<String,Object> orderMap : mapList) {
@@ -1465,7 +1466,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             orderIdMap.put("orderId",orderId);
             tmsTruckFeign.addTotalResult(orderIdMap);
             omstruckOrder.setOrderId(orderId);
-            omstruckOrder.setOrderPlanId(new BigDecimal(planId));
+            omstruckOrder.setOrderPlanId(planId);
             String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
             omstruckOrder.setOrderNumber(orderNumber);
             omstruckOrder.setOrderIssueTime(new Date());
@@ -1477,13 +1478,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setUpdateUsername("admin");
             omstruckOrder.setInsertUpdateRemark("无");
             omstruckOrder.setDeleted(new BigDecimal(0));
-            omstruckOrder.setOrderType(new BigDecimal(orderType));
+            omstruckOrder.setOrderType(orderType);
             if(lineId != null){
-                omstruckOrder.setLineId(new BigDecimal(lineId));
+                omstruckOrder.setLineId(lineId);
             }
             omstruckOrder.setCarrierId(new BigDecimal(carrierId));
             result +=omstruckOrderMapper.insertSelective(omstruckOrder);
-
             for (Map<String,Object>orderMaterial:orderMaterialList
             ) {
                 OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
@@ -1899,6 +1899,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public Map<String, Object> getMessageToApp(Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         Integer orderType;
+        String type="";
         //获取订单类型
         if(map.get("orderType") == null){
             orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(orderId);
@@ -1945,6 +1946,15 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 15:
             case 16:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
+                break;
+            case 19:
+                 mesMap=omstruckOrderMapper.getSporadicOrder(map);
+                 if (orderType==19) {
+                     type += "零星退货";
+                     mesMap.put("type", type);
+                 }
+
+
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
 

src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:172.16.33.166:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}