Tiroble 3 jaren geleden
bovenliggende
commit
1962cad8c9

+ 2 - 2
src/main/resources/application-dev.yml

@@ -21,8 +21,8 @@ openfeign:
 piction:
  # path: /usr/share/nginx/html/image
  #  path: /test/data/nginx/html/image
-#  path: C:\Users\24390\Desktop\work\a
-  path: /shared
+  path: C:\Users\24390\Desktop\work\a
+ # path: /shared
 
 
 

+ 6 - 1
src/main/resources/application-prod.yml

@@ -15,6 +15,11 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-
+#图片上传配置
+piction:
+  # path: /usr/share/nginx/html/image
+  #  path: /test/data/nginx/html/image
+  #path: C:\Users\24390\Desktop\work\a
+   path: /shared
 server:
   port: 8093

+ 1 - 0
src/main/resources/com/steerinfo/dil/mapper/WmspOutboundScanResultMapper.xml

@@ -473,6 +473,7 @@
   
   <select id="getOutBoundMaterialDetailedInfos"  resultType="com.steerinfo.dil.vo.OutBoundMaterialDetailedInfo">
      select
+     distinct
       rms.MATERIAL_STEEL_ID "materialSteelId",
       rms.MATERIAL_ONLY_CODE "onlyCode",
       RM.material_Id "materialId",