Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -653,7 +653,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }else{
             System.out.println("委托发送失败：" + jsonData);
         }
-        return 0;
+        return 1;
     }
 
 

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

@@ -169,20 +169,21 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             //如果没有净重更新路段顺序号需要继续回皮 有就结束订单
             if(netWeight == 0 && orderType != 25){
                 mesMap.put("orderLineSequence",sqe);
-                utilsService.updateOrderLineSqeByOrderNumber(mesMap);
+                if(requireRemark != null && "不需要过磅".equals(requireRemark)) {
+                    omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
+                }else{
+                    utilsService.updateOrderLineSqeByOrderNumber(mesMap);
+                }
             } else {
                 omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
             }
-            if(requireRemark != null && "不需要过磅".equals(requireRemark)) {
-                omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
-            }
             //卸货成功后推送消息给websocket
             utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
             //根据运输订单查找需求备注
             BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
             String remark =(String) remarkMap.get("remark");
-            if (remark.contains("计时") && orderType != 25){
+            if (remark != null && remark.contains("计时") && orderType != 25){
                  map.put("inwardTypes",3);
                  tmstruckTimeTaskResultService.addTimeTaskResult(map);
             }

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:
@@ -35,7 +35,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OmsFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   QmsFeign:

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

@@ -2501,9 +2501,15 @@
         ASO.SALE_NUMBER "saleOrderNo",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
         ASM.MATERIAL_NUMBER "materialNum",
+        ASM.MATERIAL_NUMBER "materialNumber",
+        ASO.SALE_REMARK "saleRemark",
         ASM.EAS_PRIMARY_ID "closeEntryId",
         ASM.DELETED "deletedStatus",
+        decode(ASM.DELETED,0,'关闭','审核') "entryStatus",
         RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+        RC.CONSIGNEE_COMPANY_NAME "receiveName",
+        ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
+        ASM.IS_POUND_SALE   "isPoundSale",
         ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
         RS.SHIPPER_NAME "shipperName",
         RCA.CAPACITY_NUMBER "capacityNo",
@@ -2511,12 +2517,17 @@
         OO.CAPACITY_ID "capacityId",
         ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
         ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
         OO.ORDER_LINE_SEQUENCE "lineSequence",
         ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
         RSR.SALER_NAME "saler",
+        RSR.SALER_NAME "salerName",
         RM.MATERIAL_ID  "materialId",
         RM.MATERIAL_NAME  "materialName",
         RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+        ASM.STEEL_METER "steelMeters",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
         R_CARRIER.CARRIER_ABBREVIATION "carrierName",
         OO.ORDER_NUMBER "orderNo",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
@@ -2525,6 +2536,9 @@
         RRP.ADDRESS_DELIVERY_ADDRESS "place",
         RRA.ADDRESS_ID "shipperAddressId",
         RRA.ADDRESS_PROVINCE "addressProvince",
+        RRA.ADDRESS_PROVINCE "province",
+        RRA.ADDRESS_DISTRICT "district",
+        RRA.ADDRESS_TOWN "town",
         RRA.ADDRESS_DISTRICT "addressDistrict",
         RRA.ADDRESS_TOWN "addressTown",
         OO.ORDER_LINE_SEQUENCE "lineSqe",
@@ -2537,8 +2551,6 @@
         TLR.RESULT_LOAD_END_TIME     "loadTime",
         TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
         TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
-        TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
-        TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
         ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
         R_CARRIER.CARRIER_ID        "carrierId",
         OO.CAPACITYIDS "capacityNumbers",
@@ -2546,10 +2558,7 @@
         OO.CAN_WORK     "canwork",
         OO.ORDER_STATUS              "carStatus",
         RSA.AREA_NAME "areaName",
-        TAR.INSERT_TIME "arrivalTime",
-        TRR.INSERT_TIME "receiptTime",
-        DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
-        decode(TSR.RESULT_ID,null,'未发送','已发送')  "smsResultId",
+        RSA.AREA_NAME "saleArea",
         DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
         2,'销售已提交',
         4,'财务已审批',
@@ -2598,27 +2607,12 @@
         AND TLR.MATERIAL_ID = RM.MATERIAL_ID
         LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR
-        ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
-        ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
-        LEFT JOIN TMSTRUCK_SMS_RUSULT TSR
-        ON TSR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
         WHERE ASO.SALE_TYPE = 1
         AND ASO.DELETED = 0
         and ASM.SALE_MATERIAL_ID IS NOT NULL
-        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
-        AND TWR.RESULT_TARE_WEIGHT_TIME IS NULL
-        <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
-        </if>
-        <if test="carrierSsoId != null">
-            and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
-        </if>
-        <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
-            and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
-        </if>
+        AND TWR.RESULT_NET_WEIGHT IS NULL
+        AND ASOM.SALE_DATE_OF_RECEIPT  &lt; sysdate
+        AND ASOM.SALE_DATE_OF_RECEIPT  > sysdate -1
         <if test="remark != null" >
             and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
         </if>

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

@@ -376,7 +376,7 @@
        from RMS_WAREHOUSE rw
        where  rw.WAREHOUSE_ID=#{warehouseId}
     </select>
-    <select id="getRequireRemark" resultType="java.lang.String" parameterType="decimal">
+    <select id="getRequireRemark" resultType="java.lang.String" parameterType="java.math.BigDecimal">
         SELECT AIR.INSERT_UPDATE_REMARK FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON AIP.PLAN_ID = OO.ORDER_PLAN_ID