dsfds

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

@@ -1292,7 +1292,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
     public RESTfulResult canCapacityEnfactory(@RequestBody Map<String,Object> mapValue) {
         String result = omstruckOrderMapper.canCapacityEnfactory(mapValue);
         Integer orderType = (Integer) mapValue.get("orderType");
-        if (orderType != 1) {
+        if (orderType != 1 && orderType != 4) {
             return success("OK");
         }
         else {

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

@@ -40,19 +40,32 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
             trainOrderId = DataChange.dataToBigDecimal(map.get("trainOrderId"));
         }else{
             trainOrderId = omstrainOrderMapper.getTrainOrder();
-
         }
         //生成运输订单号
         String trainOrderNumber = DataChange.generateEightDigitsNumber("WHYDD",trainOrderId.intValue());
         //获取车皮号/进站时间/发出时间
-        String wagonNo = map.get("wagonNo").toString();
-        long OutStationTime = (long) map.get("OutStation");
-        long EnStationTime = (long) map.get("EnStation");
+        if (map.get("wagonNo") != null && !"null".equals(map.get("wagonNo"))){
+            String wagonNo = map.get("wagonNo").toString();
+            omstrainOrder.setOrderWagonNo(wagonNo);
+        }
+        if(map.get("OutStation") != null && !"null".equals(map.get("OutStation"))){
+            long OutStationTime = (long) map.get("OutStation");
+            omstrainOrder.setOutstationTime(new Date(OutStationTime));
+        }
+        if(map.get("EnStation") != null && !"null".equals(map.get("EnStation"))){
+            long EnStationTime = (long) map.get("EnStation");
+            omstrainOrder.setEnstationTime(new Date(EnStationTime));
+        }
+        if (map.get("wagonWeight") != null && !"null".equals(map.get("wagonWeight"))){
+            BigDecimal wagonWeight = DataChange.dataToBigDecimal(map.get("wagonWeight"));
+            omstrainOrder.setOrderWagonWeight(wagonWeight);
+        }
+        if (map.get("wagonBillWeight") != null && !"null".equals(map.get("wagonBillWeight"))){
+            BigDecimal wagonBillWeight = DataChange.dataToBigDecimal(map.get("wagonBillWeight"));
+            omstrainOrder.setBillingWeight(wagonBillWeight);
+        }
         omstrainOrder.setId(trainOrderId);
-        omstrainOrder.setEnstationTime(new Date(EnStationTime));
-        omstrainOrder.setOutstationTime(new Date(OutStationTime));
         omstrainOrder.setOrderNo(trainOrderNumber);
-        omstrainOrder.setOrderWagonNo(wagonNo);
         omstrainOrder.setInsertTime(new Date());
         omstrainOrder.setInsertUsername(map.get("personnelSsoId").toString());
         //初始化是没有验收
@@ -82,7 +95,6 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
         for(Map<String,Object>map1:mapList){
             List<Map<String,Object>> materialList = omstrainOrderMapper.getMaterialList(map1);
             for (Map<String,Object>materialMap:materialList){
-
                 BigDecimal materialId = DataChange.dataToBigDecimal(materialMap.get("materialId"));
                 //根据运输订单ID和物资ID去查询炉号
                 List<Map<String, Object>> luHaoNumberList = omstrainOrderMapper.getLuhaoNum(new BigDecimal(orderId),materialId);

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

@@ -894,10 +894,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             }else if(orderType!=21){
                 //添加各个实绩
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
-            }
-            //如果订单类型为4发送钢材空委托给计量系统
-            if (orderType==4){
-
             }
             //判断订单是否是一车多单
             if (orderType ==12 || orderType ==13 || orderType ==14 || orderType ==19) {

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8015}
   ImFeign:

src/main/resources/application-prod.yml

@@ -20,7 +20,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:

src/main/resources/bootstrap.yml

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

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

@@ -498,14 +498,16 @@
                                    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpa",
                                    OTO.ORDER_NO                                   "orderNum",
                                    TWR.RESULT_NET_WEIGHT                          "materialWeight",
-                                   OTO.OUTSTATION_TIME                            "outStationTime",
-                                   OTO.ENSTATION_TIME                             "enStationTime",
+                                   to_date(OTO.OUTSTATION_TIME,'yyyy-mm-dd')                            "OutStation",
+                                   to_date(OTO.ENSTATION_TIME,'yyyy-mm-dd')                             "EnStation",
                                    OTO.ORDER_WAGON_NO                             "wagonNo",
                                    OTO.ORDER_WAGON_WEIGHT                         "wagonWeight",
                                    OTO.BILLING_WEIGHT                             "wagonBillWeight",
                                    RAR1.ARRIVAL_NAME                              "arrivalStation",
                                    RAR.ARRIVAL_NAME                               "sendStation",
-                                   ASO.SALE_REMARK                                "orderType"
+                                   ASO.SALE_REMARK                                "orderType",
+                                   OTO.ORDER_ID                                    "trainOrderId",
+                                   RPG.GRID_ID                                      "gridId"
                    FROM AMS_SALE_ORDER ASO
                           LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
                           LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAR ON RAR.ARRIVAL_ID = TPAR.SEND_STATION_ID

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

@@ -4080,11 +4080,8 @@
         RC.CAPACITY_NUMBER "capacityNumber",
         RS.SHIPPER_NAME "shipperName",
         ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
-        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
-        CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
         TTR.RESULT_TOTAL_ID "resultTotalId",
-        OO.CAN_WORK "canWork",
         OO.ORDER_STATUS "orderStatus",
         RAS.ARRIVAL_NAME "sendStaionName"
         FROM