ta

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

@@ -69,21 +69,24 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
     public RESTfulResult updateMaterialMes(@RequestBody(required = false) Map<String, Object> map){
         int i = omstruckOrderMaterialService.updateMaterialMes(map);
         BigDecimal saleOrderId = DataChange.dataToBigDecimal(map.get("saleOrderId"));
-//         调用金蝶接口，将销售订单推送到金蝶系统
-        Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
-        Map<String, Object> head = (Map<String, Object>) input.get("head");
-        head.put("status", "update");
-        // 获得金蝶接口配置:正式
-        Map<String, Object> totalMap = easUtil.getTotalMap();
+        if(saleOrderId != null){
+            //         调用金蝶接口，将销售订单推送到金蝶系统
+            Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+            Map<String, Object> head = (Map<String, Object>) input.get("head");
+            head.put("status", "update");
+            // 获得金蝶接口配置:正式
+            Map<String, Object> totalMap = easUtil.getTotalMap();
 //        // 获得金蝶接口配置:测试
 //        Map<String, Object> totalMap = easDeleteTestUtil.getTotalMap();
-        // 组装报文
-        totalMap.put("input", input);
-        System.out.println(totalMap);
-        String json = JSONUtils.toJSONString(totalMap);
-        System.out.println(json);
-        Map<String,Object> resultMap = joinFeign.pushSaleOrderToEas(totalMap);
-        System.out.println(resultMap);
+            // 组装报文
+            totalMap.put("input", input);
+            System.out.println(totalMap);
+            String json = JSONUtils.toJSONString(totalMap);
+            System.out.println(json);
+            Map<String,Object> resultMap = joinFeign.pushSaleOrderToEas(totalMap);
+            System.out.println(resultMap);
+            return success(i);
+        }
         return success(i);
     }
 }

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

@@ -311,6 +311,8 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
         for (Map<String, Object>map1 : mapList) {
             if (orderIds != null) {
                 BigDecimal orderId = DataChange.dataToBigDecimal(orderIds);
+                //根据运输订单id去查询订单类型
+                Integer orderType = omstruckOrderMapper.getOrderTypeByOrderId(orderId);
                 BigDecimal materialId = DataChange.dataToBigDecimal(map1.get("materialId"));
                 BigDecimal materialNum = DataChange.dataToBigDecimal(map1.get("materialNum"));
                 map1.put("orderId",orderId);
@@ -326,7 +328,9 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
                     omstruckOrderMaterial.setOrderMaterialWeight(newWeight);
                 }
                 //修改销售订单物资子表
-                omstruckOrderMaterialMapper.updateSaleOrderMaterialMes(saleMaterialId, materialNum, newWeight);
+                if(orderType == 1){
+                    omstruckOrderMaterialMapper.updateSaleOrderMaterialMes(saleMaterialId, materialNum, newWeight);
+                }
                 //修改订单物资子表 与出库实绩
                 omstruckOrderMaterial.setOrderId(orderId);
                 omstruckOrderMaterial.setMaterialId(materialId);

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

@@ -493,7 +493,7 @@
       from OMSTRUCK_ORDER OO
       where OO.CAPACITY_ID = (select CAPACITY_ID from RMS_CAPACITY where CAPACITY_ID = #{capacityId})
         and OO.ORDER_STATUS = 5
-        and OO.ORDER_TYPE = 1
+        and OO.ORDER_TYPE in (1,25)
     </select>