修改计量接口

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

@@ -42,4 +42,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     //查询采购订单信息
     Map<String, Object> getPurOrderMesToKD(String orderNumber);
+
+    //查询采购内转总厂到老区的订单信息
+    Map<String, Object> get20PurOrderMesToKD(String orderNumber);
 }

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

@@ -35,7 +35,7 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
     @Autowired
     TmstruckWeightResultMapper tmstruckWeightResultMapper;
     //定时访问质检系统，获取质检实绩
-    @Scheduled(cron = "* * 1 * * ?")
+//    @Scheduled(cron = "* * 1 * * ?")
 //    @Override
     public int insertQualityResult() throws IOException, DocumentException {
         //先查出所有需要质检的但是没有质检的磅单号

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

@@ -55,7 +55,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     final private List<Integer> judgeOrderTypeList = Arrays.asList(5, 6, 7, 8, 9, 12, 14,15, 17, 18);
 
     //老厂区需要给金蝶回传的数据订单类型
-    final private List<Integer> judgeToKDTypeList = Arrays.asList(6, 17);
+//    final private List<Integer> judgeToKDTypeList = Arrays.asList(6, 17);
 
     /**
      * 接收达钢计量实绩信息
@@ -136,7 +136,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         if(map.get("needCheckToKD") != null){
             if(map.get("resultNetWeight") != null){
                 Integer orderType = DataChange.dataToBigDecimal(stringObjectMap.get("orderTypee")).intValue();
-                if (judgeToKDTypeList.contains(orderType)) {
+                if ( orderType == 6) {
                     String resultNetWeight = String.valueOf(map.get("resultNetWeight")); //如果净重不为空  或者净重不为0
                     if (!"null".equals(resultNetWeight) && !"".equals(resultNetWeight) && !"0".equals(resultNetWeight)) {
                         //回传数据给金蝶方法 返回1即为回传成功
@@ -222,6 +222,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                     if(check == null){
                         autoReceipt(orderNumber, map.get("resultTareWeightTime"));
                     }
+                    if(orderType == 20){
+                        //此订单类型比较特殊  如果订单类型为20则需要回传金蝶
+                        sendMesToKD(map, orderType);
+                    }
                 }
             }
         }
@@ -460,27 +464,12 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         String orderNumber = (String) map.get("orderNumber");
         Map<String, Object> mesMap = new HashMap<>();
         switch (orderType){
-            case 1:
-            case 2:
-            case 3:
-            case 4:
-            case 5:
             case 6:
                 //查询订单信息
                 mesMap = tmstruckWeightResultMapper.getPurOrderMesToKD(orderNumber);
                 break;
-            case 7:
-            case 8:
-            case 9:
-            case 10:
-            case 11:
-            case 12:
-            case 13:
-            case 14:
-            case 15:
-            case 16:
-            case 17:
-            case 18:
+            case 20:
+                mesMap = tmstruckWeightResultMapper.get20PurOrderMesToKD(orderNumber);
         }
         //将map数据全放进mesMap中
         map.putAll(mesMap);

src/main/java/com/steerinfo/dil/util/KDWebserviceUtil.java

@@ -1,6 +1,9 @@
 package com.steerinfo.dil.util;
 
 import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.wsdl.LoginUtil;
+import com.steerinfo.dil.wsdl.ServiceInfo;
+import com.steerinfo.dil.wsdl.WSContext;
 import com.steerinfo.dil.wsdl.WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
@@ -25,18 +28,26 @@ public class KDWebserviceUtil {
     public static int sendMesToKD(Map<String, Object> map){
         try {
             String xml = asXmlData(map);
-            Log4jUtils.toLoggerInfo(xml);
+            System.out.println(xml);
+            ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 1);
+            service.setServername("172.16.62.243" , "8888");
+            WSContext wsContext = LoginUtil.doEASLogin(service);
+            String sessionId = wsContext.getSessionId();
+            if(null == sessionId) {
+                System.out.println("[error]: 登陆有问题");
+                return 0;
+            }
             WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator locator = new WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator();
             String res = locator.getWSUpDaxingMeteringSystemFacade().saveWeighBill(xml);
             Map returnMap = JSON.parseObject(res, Map.class);
             if("S02".equals(String.valueOf(returnMap.get("Status")))){
                 return 1;
             }else {
-                Log4jUtils.toLoggerWarning(map.get("orderNumber")+ "数据推送金蝶失败："+ returnMap.get("MessageText"));
+                System.out.println((map.get("orderNumber")+ "数据推送金蝶失败："+ returnMap.get("MessageText")));
                 return 0;
             }
         } catch (Exception e) {
-            Log4jUtils.toLoggerWarning(map.get("orderNumber") + "数据推送金蝶失败：" + e.getMessage());
+            System.out.println(map.get("orderNumber") + "数据推送金蝶失败：" + e.getMessage());
             return 0;
         }
     }

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

@@ -766,4 +766,21 @@
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
+
+<!--  查询采购内转总厂到老区的订单信息  -->
+    <select id="get20PurOrderMesToKD" parameterType="string" resultType="java.util.Map">
+        SELECT
+            APO.PURCHASE_ORDER_NO "No",
+            APO.EAS_ENTRY_ID "easEntryId",
+            RC.CAPACITY_NUMBER "capacityNumber"
+        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
+                LEFT JOIN AMS_PURCHASE_ORDER APO ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+                LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE
+            OO.ORDER_NUMBER = #{orderNumber}
+    </select>
 </mapper>

src/main/test/test23.java

@@ -64,4 +64,10 @@ public class test23 {
         return responseXML;
     }
 
+
+    @Test
+    public void test2(){
+        String str = "我是建国1";
+        System.out.println(str.substring(str.length() - 2));
+    }
 }