修改

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

@@ -130,16 +130,16 @@ public class WSFaceController extends BaseRESTfulController {
     @ApiModelProperty(value = "关闭/反关闭销售订单同步金蝶接口")
     public Map<String, Object> deleteSaleOrderToEas(@RequestBody Map<String,Object> map) {
         // 正式服务器
-        com.steerinfo.dil.wsdl.ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 0);
-        WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
-        service.setServername("172.16.33.111" , "8888");
-        WSContext wsContext = LoginUtil.doEASLogin(service);
+        //com.steerinfo.dil.wsdl.ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 0);
+        //WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
+        //service.setServername("172.16.33.111" , "8888");
+        //WSContext wsContext = LoginUtil.doEASLogin(service);
         // 测试服务器
-//        DeleteServiceInfo service = new DeleteServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 0);
-//        DeleteWSFaceFacadeSrvProxyServiceLocator locator = new DeleteWSFaceFacadeSrvProxyServiceLocator();
-//        service.setServername("172.16.62.243" , "8888");
-//
-//        WSContext wsContext = LoginTestUtil.doEASLogin(service);
+        DeleteServiceInfo service = new DeleteServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 0);
+        DeleteWSFaceFacadeSrvProxyServiceLocator locator = new DeleteWSFaceFacadeSrvProxyServiceLocator();
+        service.setServername("172.16.62.243" , "8888");
+
+        WSContext wsContext = LoginTestUtil.doEASLogin(service);
         String sessionId = wsContext.getSessionId();
         Map<String , Object> resultMap = new HashMap<>();
         String output = null;

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

@@ -34,4 +34,6 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
 
     int deleteAstmBystId(String stId);
 
+    List<String> getMaterialEasIdList(String saleNumber);
+
 }

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

@@ -378,7 +378,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 }
                 amsSaleOrder.setSaleOrderStatus(new BigDecimal(orderStatus));
                 //获取销售订单下的分录id--获取物流分录id
-                List<String> wuliuStIds = amsSaleMaterialMapper.getMaterialEasList(saleNumber);
+                //判断单据来源是金蝶还是物流
+                List<String> wuliuStIds  = amsSaleMaterialMapper.getMaterialEasList(saleNumber);
                 //查询该销售订单下的所有物资分录
                 List<String> EasIds = new ArrayList<>();
                 for (Map<String, Object> materialMap : mapList) {

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

@@ -123,6 +123,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * @return
      */
     public String addTruckWeightResult(Map<String, Object> map) {
+        System.out.println(map);
         //首先通过运输订单号查询订单类型
         Map<String, Object> oneMap = utilsMapper.getOrderTypeByOrderNumber((String) map.get("orderNumber")); //用于判断订单类型
         if(oneMap == null){
@@ -609,11 +610,12 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     public String linkUpdateAPO(Map<String, Object> map, Integer orderType){
             //如果等于1 则代表是需要变更采购订单号的订单
             Map<String, Object> mesMap = tmstruckWeightResultMapper.getAPOMes(String.valueOf(map.get("ArrivalBillNo")));
+
             if (mesMap == null){
                 return map.get("ArrivalBillNo") + "系统没有此订单号！失败";
             }
             mesMap.put("orderNumber", map.get("orderNumber"));
-            if(orderType == 20 || orderType == 23){
+            if(orderType == 20 || orderType == 23 || orderType == 15 || orderType == 16 || orderType == 24){
                 //20订单修改的表不一样呀
                 tmstruckWeightResultMapper.updatePurchaseInwordAPOId(mesMap);
                 tmstruckWeightResultMapper.updateOmsTruckMaterialId(mesMap);

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

@@ -702,6 +702,12 @@
         WHERE ASM.EAS_PRIMARY_ID = #{easId}
     </select>
 
+    <select id="getMaterialEasIdList" resultType="java.lang.String" parameterType="string">
+        SELECT ASM.EAS_PRIMARY_ID FROM AMS_SALE_MATERIAL ASM
+        LEFT JOIN AMS_SALE_ORDER ASO
+        on aso.SALE_ORDER_ID = asm.SALE_ORDER_ID
+        WHERE aso.SALE_NUMBER = #{saleNumber}
+    </select>
 
     <update id="openAllSaleMaterial" parameterType="DECIMAL" >
         UPDATE AMS_SALE_MATERIAL ASM