修改

src/main/java/com/steerinfo/dil/feign/IMFeign.java

@@ -13,3 +13,5 @@ public interface IMFeign {
     @ResponseBody
     String sendToUser(@RequestBody HashMap map);
 }
+
+

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -1,6 +1,9 @@
 package com.steerinfo.dil.feign;
 
+import feign.Request;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -18,5 +21,5 @@ public interface OmsFeign {
     Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId,
                                         @RequestParam("sqe") Integer sqe,
                                         @RequestParam("resultNetWeight")String resultNetWeight);
-
 }
+

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

@@ -501,6 +501,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     if(isWagon != null && (Boolean) isWagon) {
                         amsSaleOrder.setSaleType(new BigDecimal(4));
                         amsSaleOrder.setBusinessType("直发");
+
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -581,6 +582,21 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     }
                     try {
                         amsSaleMaterial.setTransferInOfWarehouse(saleRemark);
+                        if(saleRemark != null && !"".equals(saleRemark)) {
+                            if(saleRemark.contains("工程")){
+                                amsSaleMaterial.setTransferOutOfWarehouse("钢材工程组");
+                            }else if(saleRemark.contains("成都")){
+                                amsSaleMaterial.setTransferOutOfWarehouse("钢材成都组");
+                            }else if(saleRemark.contains("南充")){
+                                amsSaleMaterial.setTransferOutOfWarehouse("钢材南充组");
+                            }else if(saleRemark.contains("重庆")){
+                                amsSaleMaterial.setTransferOutOfWarehouse("钢材重庆组");
+                            }else if(saleRemark.contains("万州")){
+                                amsSaleMaterial.setTransferOutOfWarehouse("钢材万州组");
+                            }else{
+                                amsSaleMaterial.setTransferOutOfWarehouse("钢材工程组");
+                            }
+                        }
                     } catch (Exception e) {
                         e.printStackTrace();
                     }

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

@@ -670,7 +670,11 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             Integer resultId = utilsMapper.getUnloadResultByTotalId(DataChange.dataToBigDecimal(oneMap.get("totalId")));
             if(resultId != null){
                 int orderIds = DataChange.dataToBigDecimal(oneMap.get("orderIds")).intValue();
-                omsFeign.closeInwardOrder(orderIds, sqe, (String) resultNetWeight);
+                try {
+                    omsFeign.closeInwardOrder(orderIds, sqe, (String) resultNetWeight);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }else {
                 Map<String, Object> threeMap = new HashMap<>(); //用于更新路段顺序号
                 threeMap.put("orderLineSequence", sqe);