修改

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

@@ -531,6 +531,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 result += amsSaleOrderMapper.insertSelective(amsSaleOrder);
             } else {
                 AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
+                //如果订单存在,下一步先判断是不是钢材的订单
                 if(amsSaleOrder != null && amsSaleOrder.getSaleType() != null && amsSaleOrder.getSaleType().intValue() == 1) {
                     try{
                         new Thread( new Runnable() {
@@ -634,6 +635,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     amsSaleMaterial.setSaleOrderId(amsSaleOrder.getSaleOrderId());
                     amsSaleMaterial.setMaterialId(materialId);
                     amsSaleMaterial.setInsertTime(new Date());
+                    try {
+                        amsSaleMaterial.setTransferInOfWarehouse(saleRemark);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                     result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
                 }
                 if(amsSaleOrder.getSaleType() != null && amsSaleOrder.getSaleType().intValue() == 1 && EasIds.size() < wuliuStIds.size()){
@@ -658,9 +664,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                         //物理删除该分录
                         result += amsSaleMaterialMapper.deleteSaleMaterialByEasId(easId);
                         result += amsSaleMaterialMapper.deleteAstmBystId(easId);
-
                     }
+                    System.out.println("---删除多余分录" + new Date());
                     System.out.println(chaEasIds);
+                    System.out.println("---删除多余分录" + new Date());
                 }
                 result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
             }

src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
 
 openfeign:
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   imFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign: