Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API

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

@@ -74,10 +74,13 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
      * @param mapList
      * @return
      */
-    @PostMapping("/receiveTmsTruckWeightResult")
+        @PostMapping("/receiveTmsTruckWeightResult")
     public RESTfulResult receiveTmsTruckWeightResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
-        String s = tmstruckWeightResultServiceImpl.receiveTmsTruckWeightResultByDaXing(mapList);
-        return success(s);
+        String mesStr = tmstruckWeightResultServiceImpl.receiveTmsTruckWeightResultByDaXing(mapList);
+        if(!"成功".equals(mesStr.substring(mesStr.length() - 2))){
+            return failed(mesStr);
+        }
+        return success(mesStr);
     }
 
 

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

@@ -74,6 +74,13 @@ public class WSFaceController extends BaseRESTfulController {
         return output;
     }
 
+    /**
+     * 生成报文传输数据接口 请勿乱调用测试
+     * @Author TXF
+     * @Date 2022/2/22 9:46
+     * @param
+     * @return
+     **/
     @PostMapping("asd")
     public void asd(){
         amsNotUploadedEasService.makeXmlFile();

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

@@ -44,12 +44,14 @@ public class AmsNotUploadedEasServiceImpl {
             if(map.get("resultCrossWeightTime") != null)
                 map.put("resultCrossWeightTime",sdf.format(map.get("resultCrossWeightTime")));
 //            map.put("No", "PO2021013615");
-//            map.put("easEntryId", "YANhW8BARA+c4oqKXy0/YiYEHMU=");
+//            map.put("easEntryId", "YANhW8BARA+c4oqKXy0/YiYEHMU="); //罗棒
+//            map.put("No", "PO2021016134");
+//            map.put("easEntryId", "ZnJqdcRqRLuGffHNRTuI9SYEHMU=");  //小峰
             String xml = asXmlData(map);
-            sendMesToKD(xml);
+//            sendMesToKD(xml);
             System.out.println(i++);
             try {
-                Thread.sleep(1000);
+                Thread.sleep(100);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
@@ -103,8 +105,8 @@ public class AmsNotUploadedEasServiceImpl {
     public int sendMesToKD(String xml){
         try {
             System.out.println(xml);
-            ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 1);
-            service.setServername("172.16.62.243" , "8888");
+            ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 1);
+            service.setServername("172.16.33.111" , "8888");//正式服务器
             WSContext wsContext = LoginUtil.doEASLogin(service);
             String sessionId = wsContext.getSessionId();
             if(null == sessionId) {

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

@@ -545,26 +545,4 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         KDWebServiceServiceImpl.sendMesToKD(map);
     }
 
-    /**
-     * 上面方法的儿子方法
-     * @Author TXF
-     * @Date 2022/2/10 15:46
-     * @param map
-     * @param mesMap
-     * @return
-     **/
-    public List<String> getMesList(Map<String, Object> map, Map<String, Object> mesMap){
-        List<String> list = new ArrayList<>();
-        //按照顺序添加
-        list.add((String) map.get("resultPoundNo"));//磅单号
-        list.add((String) mesMap.get("capacityNumber")); //车牌号
-        list.add((String) map.get("resultCrossWeight")); //毛重
-        list.add((String) map.get("resultCrossWeightTime")); //毛重时间
-        list.add((String) map.get("resultTareWeight")); //皮重
-        list.add((String) map.get("resultTareWeightTime")); //皮重时间
-        list.add((String) map.get("resultNetWeight")); //净重
-        list.add((String) mesMap.get("No")); //采购、销售订单号
-        list.add((String) mesMap.get("easEntryId")); //采购、销售订单分录Id
-        return list;
-    }
 }

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

@@ -551,76 +551,61 @@
 
   <!--   模拟采购报文 -->
   <select id="asd" resultType="java.util.LinkedHashMap">
-    select
-      OO.ORDER_NUMBER            "orderNumber",
-      RC.CAPACITY_NUMBER         "capacityNumber",
-      TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
-      TWR.RESULT_NET_WEIGHT      "resultNetWeight",
-      TWR.RESULT_GROSS_WEIGHT    "resultCrossWeight",
-      TWR.RESULT_TARE_WEIGHT     "resultTareWeight",
-      TWR.RESULT_POUND_NO      "resultPoundNo",
-      TQR.RESULT_DEDUCTION       "resultDeduction",
-      TUR.RESULT_END_TIME        "resultEndTime",
-      RW.WAREHOUSE_NAME          "warehouseName",
-      TRR.INSERT_TIME            "insertTime",
-      TLFR.RESULT_OUT_GATE_TIME  "resultOutGateTime",
-      OO.INSERT_TIME             "insertTimee",
-      RGEN.GATEPOST_NAME         "enGatepostName",
-      RGOUT.GATEPOST_NAME        "outGatepostName",
-      RTCMAO.TRUCK_CALCULATE_NUMBER  "resultCrossCalculateNumber",
-      RTCPI.TRUCK_CALCULATE_NUMBER   "resultTareCalculateNumber",
-      TWR.RESULT_GROSS_WEIGHT_TIME   "resultCrossWeightTime",
-      RM.MATERIAL_NAME                     "materialName",
-      CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode",
-      APO.PURCHASE_ORDER_NO      "No",
-      APO.EAS_ENTRY_ID         "easEntryId",
-      RS.SUPPLIER_NAME           "supplierName",
-      RCON.CONSIGNEE_COMPANY_NAME "receiveName",
-      TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime"
-    from OMSTRUCK_ORDER OO
-           left join TMSTRUCK_TOTAL_RESULT TTR
-                     on TTR.ORDER_ID = OO.ORDER_ID
-           left join RMS_CAPACITY RC
-                     on RC.CAPACITY_ID = OO.CAPACITY_ID
-           left join TMSTRUCK_ENFACTORY_RESULT TER
-                     on TTR.RESULT_TOTAL_ID = TER.RESULT_TOTAL_ID
-           left join RMS_GATEPOST RGEN      --进厂门岗
-                     on RGEN.GATEPOST_ID = TER.GATEPOST_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
-           left join TMSTRUCK_WEIGHT_RESULT TWR
-                     on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-           left join RMS_TRUCK_CALCULATE RTCMAO --毛重汽车衡
-                     on RTCMAO.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
-           left join RMS_TRUCK_CALCULATE RTCPI  --皮重汽车衡
-                     on RTCPI.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
-           left join TMSTRUCK_UNLOAD_RESULT TUR
-                     on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-           left join RMS_WAREHOUSE RW
-                     on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-           left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-                     on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-           left join RMS_GATEPOST RGOUT  --出厂门岗
-                     on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
-           left join TMSTRUCK_RECEIPT_RESULT TRR
-                     on TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-           left join TMSTRUCK_QUALITY_RESULT TQR
-                     on TQR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
-           left join AMS_PURCHASE_ORDER APO
-                     on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-           left join RMS_SUPPLIER RS
-                     on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-           left join RMS_CONSIGNEE RCON
-                     on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+    select *
+    from (select
+            RC.CAPACITY_NUMBER         "capacityNumber",
+            TWR.RESULT_POUND_NO         "resultPoundNo",
+            TWR.RESULT_NET_WEIGHT      "resultNetWeight",
+            TWR.RESULT_GROSS_WEIGHT    "resultCrossWeight",
+            TWR.RESULT_TARE_WEIGHT     "resultTareWeight",
+            RTCMAO.TRUCK_CALCULATE_NUMBER  "resultCrossCalculateNumber",
+            RTCPI.TRUCK_CALCULATE_NUMBER   "resultTareCalculateNumber",
+            TWR.RESULT_GROSS_WEIGHT_TIME   "resultCrossWeightTime",
+            TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime",
+            APO.PURCHASE_ORDER_NO           "No",
+            APO.EAS_ENTRY_ID                "easEntryId"
+          from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           on TTR.ORDER_ID = OO.ORDER_ID
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join TMSTRUCK_ENFACTORY_RESULT TER
+                           on TTR.RESULT_TOTAL_ID = TER.RESULT_TOTAL_ID
+                 left join RMS_GATEPOST RGEN      --进厂门岗
+                           on RGEN.GATEPOST_ID = TER.GATEPOST_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
+                 left join TMSTRUCK_WEIGHT_RESULT TWR
+                           on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 left join RMS_TRUCK_CALCULATE RTCMAO --毛重汽车衡
+                           on RTCMAO.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+                 left join RMS_TRUCK_CALCULATE RTCPI  --皮重汽车衡
+                           on RTCPI.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                 left join TMSTRUCK_UNLOAD_RESULT TUR
+                           on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 left join RMS_WAREHOUSE RW
+                           on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+                 left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 left join RMS_GATEPOST RGOUT  --出厂门岗
+                           on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
+                 left join TMSTRUCK_RECEIPT_RESULT TRR
+                           on TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 left join TMSTRUCK_QUALITY_RESULT TQR
+                           on TQR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
+                 left join AMS_PURCHASE_ORDER APO
+                           on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join RMS_SUPPLIER RS
+                           on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 left join RMS_CONSIGNEE RCON
+                           on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
 
-    where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
-      and OO.ORDER_TYPE = 6
-      and TWR.RESULT_TARE_WEIGHT_TIME is not null
-      and TWR.RESULT_POUND_NO > 'DX220216090605'
-      and TWR.RESULT_POUND_NO &lt; 'DX220216155301'
-    order by TWR.RESULT_POUND_NO
+          where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
+            and OO.ORDER_TYPE = 18
+            and TTR.RESULT_TOTAL_ID = 7100)
   </select>
 
+
 </mapper>

src/main/test/test23.java

@@ -67,7 +67,11 @@ public class test23 {
 
     @Test
     public void test2(){
-        String str = "我是建国1";
-        System.out.println(str.substring(str.length() - 2));
+        String str = "123123我要成功";
+        if("成功".equals(str.substring(str.length() - 2))){
+            System.out.println("success");
+        }else {
+            System.out.println("failed");
+        }
     }
 }