Redeem 1 год назад
Родитель
Сommit
d55c3d83a5

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

@@ -26,11 +26,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:

+ 33 - 12
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -910,12 +910,23 @@
                t.create_emp as "createEmp",
                t.create_time as "createTime",
                b.material_specification as "specName",
-               nvl(substr(b.material_specification,
-                          decode(instr(b.material_specification, '/'),
-                                 0,
-                                 100,
-                                 instr(b.material_specification, '/')) + 1),
-                   12) * b.material_theoretical_weight / 1000 as "weight"
+               CASE WHEN
+                    REGEXP_LIKE(nvl(substr(b.material_specification,
+                    decode(instr(b.material_specification, '/'),
+                    0,
+                    100,
+                    instr(b.material_specification, '/')) + 1),
+                    12),'^\d+$') THEN
+                   nvl(substr(b.material_specification,
+                   decode(instr(b.material_specification, '/'),
+                   0,
+                   100,
+                   instr(b.material_specification, '/')) + 1),
+                   12)
+                   ELSE
+                       '0'
+                   END
+                   * b.material_theoretical_weight / 1000 as "weight"
         from rms_material b
                  left join rms_material_map t
                            on t.prod_code_l = b.material_code
@@ -933,12 +944,22 @@
                '' as "createEmp",
                sysdate as "createTime",
                b.material_specification as "specName",
-               nvl(substr(b.material_specification,
-                          decode(instr(b.material_specification, '/'),
-                                 0,
-                                 100,
-                                 instr(b.material_specification, '/')) + 1),
-                   12) * b.material_theoretical_weight / 1000 as "weight"
+                CASE WHEN
+                REGEXP_LIKE(nvl(substr(b.material_specification,
+                decode(instr(b.material_specification, '/'),
+                0,
+                100,
+                instr(b.material_specification, '/')) + 1),
+                12),'^\d+$') THEN
+                nvl(substr(b.material_specification,
+                decode(instr(b.material_specification, '/'),
+                0,
+                100,
+                instr(b.material_specification, '/')) + 1),
+                12)
+                ELSE
+                '0'
+                END * b.material_theoretical_weight / 1000 as "weight"
         from rms_material b
         <where>
             <if test="prodCode != null and prodCode != ''">