tiajip

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

@@ -653,7 +653,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }else{
             System.out.println("委托发送失败：" + jsonData);
         }
-        return 0;
+        return 1;
     }
 
 

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:
@@ -35,7 +35,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OmsFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   QmsFeign:

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

@@ -2501,9 +2501,11 @@
         ASO.SALE_NUMBER "saleOrderNo",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
         ASM.MATERIAL_NUMBER "materialNum",
+        ASM.MATERIAL_NUMBER "materialNumber",
         ASO.SALE_REMARK "saleRemark",
         ASM.EAS_PRIMARY_ID "closeEntryId",
         ASM.DELETED "deletedStatus",
+        decode(ASM.DELETED,0,'关闭','审核') "entryStatus",
         RC.CONSIGNEE_COMPANY_NAME "consigneeName",
         RC.CONSIGNEE_COMPANY_NAME "receiveName",
         ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
@@ -2608,8 +2610,7 @@
         WHERE ASO.SALE_TYPE = 1
         AND ASO.DELETED = 0
         and ASM.SALE_MATERIAL_ID IS NOT NULL
-        AND TER.RESULT_ENTRY_GATE_TIME IS NULL
-        AND TWR.RESULT_TARE_WEIGHT_TIME IS NULL
+        AND TWR.RESULT_NET_WEIGHT IS NULL
         AND ASOM.SALE_DATE_OF_RECEIPT  < sysdate
         AND ASOM.SALE_DATE_OF_RECEIPT  > sysdate -1
         <if test="remark != null" >