Merge branch 'dev'

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -750,4 +750,11 @@ public class RMScontroller {
         return rmsFeign.getNoticeTypeId();
     }
 
+    @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
+    @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
+
+    @PostMapping(value = "/insertWarehouse")
+    public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertWarehouse(map);
+    }
 }

src/main/resources/bootstrap.yml

@@ -55,7 +55,6 @@ feign:
         connect-timeout: 5000
         read-timeout: 10000
 
-
 openfeign:
   #正式环境
   ColumnDataFeign:

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

@@ -207,9 +207,9 @@
                                  RS.SUPPLIER_NAME    "supplierName",
                                  RS.SUPPLIER_ADDRESS "supplierAddress"
                  from DIL_BATCH DB
-                          left join AMS_PURCHASE_ORDER APO
+                          join AMS_PURCHASE_ORDER APO
                                     on apo.BATCH_ID = DB.BATCH_ID
-                          left join RMS_SUPPLIER RS
+                          join RMS_SUPPLIER RS
                                     on RS.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
                  <where>
                     <if test="materialId != null">