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

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

@@ -225,7 +225,18 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
     }
 
     @PostMapping("getUnloadOrderMaterial")
-    public RESTfulResult getUnloadOrderMaterial(@RequestBody(required = false) Map<String,Object>map){
+    public RESTfulResult getUnloadOrderMaterial(@RequestBody(required = false) Map<String,Object>map) {
         return success(omstruckOrderSeparateService.getUnloadOrderMaterial(map));
     }
+
+    /**
+     * 承运商销售分派运输订单给司机
+     * @param mapValue
+     * @return
+     */
+    @PostMapping("/addSaleTruckOrder")
+    public RESTfulResult addSaleTruckOrder(@RequestBody Map<String, Object> mapValue){
+        Integer result = omstruckOrderSeparateService.addSaleTruckOrder(mapValue);
+        return success(result);
+    }
 }

src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

@@ -17,7 +17,7 @@ public interface IOmstruckOrderSeparateService {
 
     //根据运输订单id修改运力id
     int updateOmstruckOrder(OmstruckOrder omstruckOrder);
-
-
     List<Map<String,Object>> getUnloadOrderMaterial(Map<String, Object> map);
+    // 承运商销售分派运输订单给司机
+    Integer addSaleTruckOrder(Map<String, Object> mapValue);
 }

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

@@ -313,4 +313,66 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public List<Map<String,Object>> getUnloadOrderMaterial(Map<String, Object> map) {
         return omstruckOrderMaterialMapper.getUnloadOrderMaterial(map);
     }
+
+    /**
+     * 承运商销售分派运输订单给司机
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public Integer addSaleTruckOrder(Map<String, Object> mapValue) {
+        Integer orderType = (Integer) mapValue.get("orderType");
+        Integer lineId = (Integer) mapValue.get("lineId");
+        BigDecimal dispatchId = DataChange.dataToBigDecimal(mapValue.get("dispatchId"));
+        String capacityNumber = (String) mapValue.get("capacityNumber");
+        OmstruckOrder omstruckOrder = new OmstruckOrder();
+        BigDecimal orderId = omstruckOrderMapper.selectMaxId();
+        Map<String,Object> orderIdMap = new HashMap<>();
+        orderIdMap.put("orderId",orderId);
+        tmsTruckFeign.addTotalResult(orderIdMap);
+        omstruckOrder.setOrderId(orderId);
+        BigDecimal saleOrderMaterialId = omstruckOrderMapper.getSaleMaterialId(dispatchId);
+        omstruckOrder.setOrderPlanId(saleOrderMaterialId);
+        String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
+        omstruckOrder.setOrderNumber(orderNumber);
+        omstruckOrder.setLineId(new BigDecimal(lineId));
+        omstruckOrder.setOrderIssueTime(new Date());
+        omstruckOrder.setOrderStatus(new BigDecimal(4));
+        omstruckOrder.setInsertTime(new Date());
+        omstruckOrder.setUpdateTime(new Date());
+        omstruckOrder.setInsertUsername("admin");
+        omstruckOrder.setUpdateUsername("admin");
+        omstruckOrder.setInsertUpdateRemark("无");
+        omstruckOrder.setDeleted(new BigDecimal(0));
+        omstruckOrder.setOrderType(new BigDecimal(orderType));
+        BigDecimal capacityId = omstruckOrderMapper.getCapacityId(capacityNumber);
+        omstruckOrder.setCapacityId(capacityId);
+        List<Map<String, Object>> mapList = omstruckOrderMapper.getMaterialMessages(dispatchId);
+        if (mapList != null && mapList.size() != 0) {
+            for (Map<String, Object> map : mapList) {
+                OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+                BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+                omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+                omstruckOrderMaterial.setOrderId(orderId);
+                omstruckOrderMaterial.setInsertTime(new Date());
+                omstruckOrderMaterial.setUpdateTime(new Date());
+                omstruckOrderMaterial.setInsertUsername("admin");
+                omstruckOrderMaterial.setUpdateUsername("admin");
+                omstruckOrderMaterial.setInsertUpdateRemark("无");
+                if (map != null) {
+                    BigDecimal materialTheoreticalWeight = (BigDecimal) map.get("materialTheoreticalWeight");
+                    BigDecimal saleOrderMaterialNumber = (BigDecimal) map.get("saleOrderMaterialNumber");
+                    BigDecimal materialId = (BigDecimal) map.get("materialId");
+                    omstruckOrderMaterial.setOrderMaterialWeight(materialTheoreticalWeight);
+                    omstruckOrderMaterial.setMaterialId(materialId);
+                    omstruckOrderMaterial.setOrderMaterialNumber(saleOrderMaterialNumber);
+                }
+                omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+            }
+        }
+        int result = omstruckOrderMapper.insertSelective(omstruckOrder);
+        // 调用websocket推送数据给司机
+        pushMesToWebsocket(orderIdMap);
+        return result;
+    }
 }

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

@@ -1072,7 +1072,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      * @param carrierId
      * @return
      */
-    @Transactional
     @Override
     public int addAppTruckOrder(Integer dispatchId, Integer orderType, String capacityNumber, Integer carrierId) {
         OmstruckOrder omstruckOrder = new OmstruckOrder();
@@ -1125,12 +1124,14 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
         }
-        RmsCapacity rmsCapacity = rmsCapacityMapper.selectByPrimaryKey(capacityId);
-        rmsCapacity.setCapacityStatus(new BigDecimal(2));
-        rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+//        RmsCapacity rmsCapacity = new RmsCapacity();
+//        rmsCapacity.setCapacityId(capacityId);
+//        rmsCapacity.setCapacityStatus(new BigDecimal(2));
+//        rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+        int result = omstruckOrderMapper.insertSelective(omstruckOrder);
         // 调用websocket推送数据给司机
         pushMesToWebsocket(orderIdMap);
-        return omstruckOrderMapper.insertSelective(omstruckOrder);
+        return result;
     }
 
     /**
@@ -1619,7 +1620,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
                 mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
-                break;
+
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
         return mesMap;

src/main/resources/bootstrap.yml

@@ -42,6 +42,7 @@ redis:
 
 #feign设置
 openfeign:
+#正式环境
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
@@ -50,6 +51,8 @@ openfeign:
     url: ${AMSFEIGN_URL:localhost:8079}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+
     #测试环境
 #  ColumnDataFeign:
 #    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
@@ -71,6 +74,6 @@ mybatis:
 
 server:
   #正式
-  port: 8095
+   port: 8095
   #测试
 #  port: 8016

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

@@ -1501,16 +1501,10 @@
     <!--通过运输订单ID查询数据 用于websocket推送数据  如果订单实绩中有卸货点  没有卸货点通过传入的卸货点进行查询-->
     <select id="pushMesToWebsocket" parameterType="java.util.Map" resultType="java.util.Map">
         select OO.ORDER_NUMBER           "orderNumber",
-               OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-               RM.MATERIAL_NAME          "materialName",
                RC.CAPACITY_NUMBER        "capacityNumber"
         from OMSTRUCK_ORDER OO
                  left join RMS_CAPACITY RC
                            on RC.CAPACITY_ID = OO.CAPACITY_ID
-                 left join OMSTRUCK_ORDER_MATERIAL OOM
-                           on OOM.ORDER_ID = OO.ORDER_ID
-                 left join RMS_MATERIAL RM
-                           on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where OO.ORDER_ID = #{orderId}
                 and rownum = 1
     </select>
@@ -2276,14 +2270,16 @@
                RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
                ASTM.MATERIAL_THEORETICAL_WEIGHT               AS "materialTheoreticalWeight",
                ASTM.SALE_ORDER_MATERIAL_NUMBER                AS "saleOrderMaterialNumber",
-               ASTM.MATERIAL_ID                               AS "materialId"
+               ASM.MATERIAL_ID                               AS "materialId"
         FROM AMS_DISPATCH_SALE_ORDER ADSO
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
                  LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
                            ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                LEFT JOIN AMS_SALE_MATERIAL ASM
+            ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
                  LEFT JOIN RMS_MATERIAL RM
-                           ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+                           ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         WHERE ADSO.DISPATCH_ID = #{dispatchId}
     </select>
 

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

@@ -384,14 +384,15 @@
     select OOM.ORDER_MATERIAL_ID from OMSTRUCK_ORDER_MATERIAL OOM where OOM.ORDER_ID = #{orderId}
   </select>
   <select id="getUnloadOrderMaterial" resultType="java.util.Map" parameterType="java.util.Map">
-    select RM.MATERIAL_NAME "materialName",
-       RM.MATERIAL_SPECIFICATION || rm.material_model "materialSpeModel"
-  from OMSTRUCK_ORDER oo
-  LEFT JOIN OMSTRUCK_ORDER_MATERIAL oom
-    on oom.ORDER_ID = oo.ORDER_ID
-  LEFT JOIN RMS_MATERIAL RM
-    on RM.MATERIAL_ID = OOM.MATERIAL_ID
-  where oo.ORDER_NUMBER = #{orderNumber}
+    select RM.MATERIAL_NAME                               "materialName",
+           RM.MATERIAL_SPECIFICATION || rm.material_model "materialSpeModel",
+           RM.MATERIAL_ID                                 "materialId"
+    from OMSTRUCK_ORDER oo
+           LEFT JOIN OMSTRUCK_ORDER_MATERIAL oom
+                     on oom.ORDER_ID = oo.ORDER_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     on RM.MATERIAL_ID = OOM.MATERIAL_ID
+    where oo.ORDER_NUMBER = #{orderNumber}
   </select>
   <!--  //通过订单号获取计量实绩主键
       BigDecimal selectWeightResultId(BigDecimal orderId);-->