提交

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

@@ -356,7 +356,7 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
     }
 
     @Override
-    public int insertReserved(String warehouseId, String materialCode, String materialSpecification, String materialModel, Integer quantity) {
+    public int  insertReserved(String warehouseId, String materialCode, String materialSpecification, String materialModel, Integer quantity) {
 //        设置状态为入库转预留
         Integer status = 1;
 //        根据前端传过来的物资型号，物资规格查询当前实时库存中的物资id

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

@@ -423,6 +423,9 @@
       SELECT DISTINCT
         RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
           RM.MATERIAL_MODEL || ')' "materialName",
+      RM.MATERIAL_SPECIFICATION "materialSpecification",
+      RM.MATERIAL_MODEL "materialModel",
+      RM.MATERIAL_CODE "materialCode",
         table1.count "max"
       FROM RMS_MATERIAL_STEEL RMS
 --                 关联物资表

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

@@ -1608,38 +1608,38 @@
             AND to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WIR.INBOUND_TIME
         </if>
         AND WIR.RESULT_DELETED = 0
-        <where>
-            <if test="count != null">
-                and "count" in
-                <foreach collection="count" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="weight != null">
-                and "weight" in
-                <foreach collection="weight" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="onetime != null">
-                and "onetime" in
-                <foreach collection="onetime" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="materialName != null">
-                and "materialName" in
-                <foreach collection="materialName" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="furnaceNumber1 != null">
-                and "furnaceNumber1" in
-                <foreach collection="furnaceNumber1" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
+<!--        <where>-->
+<!--            <if test="count != null">-->
+<!--                and "count" in-->
+<!--                <foreach collection="count" item="item" open="(" separator="," close=")">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="weight != null">-->
+<!--                and "weight" in-->
+<!--                <foreach collection="weight" item="item" open="(" separator="," close=")">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="onetime != null">-->
+<!--                and "onetime" in-->
+<!--                <foreach collection="onetime" item="item" open="(" separator="," close=")">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="materialName != null">-->
+<!--                and "materialName" in-->
+<!--                <foreach collection="materialName" item="item" open="(" separator="," close=")">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--            <if test="furnaceNumber1 != null">-->
+<!--                and "furnaceNumber1" in-->
+<!--                <foreach collection="furnaceNumber1" item="item" open="(" separator="," close=")">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--        </where>-->
         <include refid="orderBy"></include>
     </select>