修改

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

@@ -136,4 +136,6 @@ public interface UtilsMapper {
     //通过仓库id
     String queryWarehouseName(BigDecimal warehouseId);
 
+    String getRequireRemark(BigDecimal orderId);
+
 }

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

@@ -250,16 +250,16 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }
                 try {
                     //发送短信
-                    /*Map<String,Object> messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
+                    Map<String,Object> messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);
                     if(messageMap.get("saleOrderConsigneeTEL") != null){
                             String capacityNum = (String) messageMap.get("capacityNumber");
                             String mobile = (String)messageMap.get("saleOrderConsigneeTEL");
                             tmstruckSmsRusultService.generaSendMessage(mobile,capacityNum,orderId);
-                    }*/
+                    }
                     //销售厂外监控
-                    /*Map<String, Object> parem = getTruckFactoryResult(orderNumber);
+                    Map<String, Object> parem = getTruckFactoryResult(orderNumber);
                     parem.put("turnOf","0");
-                    otmsFeign.createTotalResult(parem);*/
+                    otmsFeign.createTotalResult(parem);
                     // 调用结算
                     try {
                         bmsTruckFeign.addDetailsOrder(orderId);

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

@@ -699,25 +699,24 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @return
      */
     public int sendMesToDXMeasure(Map<String, Object> map){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.putAll(map);
+        String jsonData = null;
+        try {
+            jsonData = HTTPRequestUtils.send(daXingUrl, jsonObject, "utf-8");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code = (String) hashMap.get("code");
+            System.out.println(hashMap.get("msg"));
+            if("0".equals(code)){
+                return 1;
+            }
+        }
         return 0;
-        //JSONObject jsonObject = new JSONObject();
-        //jsonObject.putAll(map);
-        //String jsonData = null;
-        //try {
-        //    jsonData = HTTPRequestUtils.send(daXingUrl, jsonObject, "utf-8");
-        //} catch (IOException e) {
-        //    e.printStackTrace();
-        //}
-        //if(!"null".equals(jsonData)){
-        //    System.out.println(jsonData);
-        //    HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
-        //    String code = (String) hashMap.get("code");
-        //    System.out.println(hashMap.get("msg"));
-        //    if("0".equals(code)){
-        //        return 1;
-        //    }
-        //}
-        //return 0;
     }
 
     //发送计量委托

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

@@ -154,6 +154,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         //判断是不是内转
         if(orderType == 11 || orderType == 15 || orderType == 16 || orderType == 25){
+            //根据运输订单id查询需求里面的备注
+            String requireRemark = utilsMapper.getRequireRemark(DataChange.dataToBigDecimal(mesMap.get("orderId")));
             //如果是内转新增卸货实绩
             Integer sqe = utilsMapper.getLineSequenceByOrderNumber((String) map.get("orderNumber"));
             sqe = sqe == null ? 1 : sqe +1;
@@ -168,7 +170,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             if(netWeight == 0 && orderType != 25){
                 mesMap.put("orderLineSequence",sqe);
                 utilsService.updateOrderLineSqeByOrderNumber(mesMap);
-            }else {
+            } else if(requireRemark != null && "不需要过磅".equals(requireRemark)) {
+                omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
+            }
+            else {
                 omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
             }
             //卸货成功后推送消息给websocket

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

@@ -376,4 +376,14 @@
        from RMS_WAREHOUSE rw
        where  rw.WAREHOUSE_ID=#{warehouseId}
     </select>
+    <select id="getRequireRemark" resultType="java.lang.String" parameterType="decimal">
+        SELECT AIR.INSERT_UPDATE_REMARK FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>