zx 2 년 전
부모
커밋
5c05bf5645
2개의 변경된 파일2개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 3
      src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java
  2. 1 1
      src/main/resources/application-prod.yml

+ 1 - 3
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -671,7 +671,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             //此处判断主要是针对销售订单已经存在
             AmsSaleOrder amsSaleOrder=new AmsSaleOrder();
             //此处判断订单状态为反审核
-            if (closeStatus.equals("5")) {
+            if (closeStatus.equals("0")&&orderStatus.equals("5")) {
             //amsSaleOrder.setSaleOrderId(saleOrderNumber);
             // amsSaleOrder.setDeleted(new BigDecimal(1));
                 //删除销售订单以及销售订单分录(没有下游单据的)
@@ -817,8 +817,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             StringBuilder sb = new StringBuilder();
             for (Map<String, Object> luHaoMap : materialFurnaceNumber) {
                 sb.append(luHaoMap.get("materialFurnaceNumber"));
-                sb.append("-");
-                sb.append(luHaoMap.get("materialNum"));
                 sb.append("/");
             }
             if(materialFurnaceNumber.size() > 0){

+ 1 - 1
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: