Redeem 1 year ago
parent
commit
42fdca927c

+ 7 - 0
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -447,4 +447,11 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查库存名称及信息")
+    @PostMapping("/getInventoryByLike")
+    public RESTfulResult getInventoryByLike(@RequestBody(required = false) Map<String, Object> map) {
+        List<Map<String, Object>> list = universalMapper.getInventoryByLike(map);
+        return success(list);
+    }
+
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -125,4 +125,7 @@ public interface UniversalMapper {
     List<Map<String, Object>> getTransOrderByJobNumber(Map<String, Object> map);
 
     List<Map<String, Object>> getCapacityByLikeInner(Map<String, Object> map);
+
+    List<Map<String, Object>> getInventoryByLike(Map<String, Object> map);
+
 }

+ 32 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -330,6 +330,9 @@
             <if test="operationPointType!=null and operationPointType!=''">
                 AND REGEXP_LIKE(OPERATION_POINT_TYPE, #{operationPointType})
             </if>
+            <if test="gridId!=null and gridId!=''">
+                AND OPERATION_POINT_ID = #{gridId}
+            </if>
             <if test="warehouseType !=null and warehouseType!=''">
                 AND REGEXP_LIKE(warehouse_type, #{warehouseType})
             </if>
@@ -2259,5 +2262,34 @@
         </if>
         )
     </select>
+    <select id="getInventoryByLike" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT DISTINCT
+        ROP.OPERATION_POINT_NAME ||'-'||RM.MATERIAL_NAME|| '-' || WGM.MODEL || WGM.INSERT_UPDATE_REMARK "label",
+        ROP.OPERATION_POINT_NAME                     "text",
+        WGM.GRID_MATERIAL_ID                        "id",
+        WGM.GRID_MATERIAL_ID                         "value",
+        WGM.GRID_MATERIAL_ID                        "gridMaterialId",
+        WGM.MATERIAL_ID                             "materialId",
+        WGM.MATERIAL_NUMBER                         "inventoryNumber",
+        WGM.GRID_ID                                 "gridId",
+        RM.MATERIAL_NAME                            "materialName",
+        ROP.OPERATION_POINT_NAME                    "gridName",
+        WGM.MODEL                                   "model",
+        NVL(WGM.ALTERNATE_FIELDS1,NVL(ROP .WAREHOUSE_TYPE,'其他')) "alter1"
+        FROM WMS_GRID_MATERIAL WGM
+        LEFT JOIN RMS_OPERATION_POINT ROP ON ROP.OPERATION_POINT_ID = WGM.GRID_ID
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = WGM.MATERIAL_ID
+    )
+    <where>
+        <if test="index != null and index != ''">
+            regexp_like("label",#{index})
+        </if>
+        <if test="alter1 != null and alter1 != ''">
+            regexp_like("alter1",#{alter1})
+        </if>
+    </where>
+    </select>
 
 </mapper>