[feat]

仓库管理 入库单
新增按入库单号批量查询入库单记录service和mapper方法；
修改生产入库单controller，新增查询生产入库单方法，修改导出入库单列表方法，实现多选和全部导出；
修改生产入库列表页面，调整搜索栏字段，新增导出方法；
修改添加生产入库页面表格数据来源；

ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpInboundOrderController.java

@@ -9,6 +9,7 @@ import com.ruoyi.quality.service.IQualityOrderService;
 import com.ruoyi.system.domain.SysSalesOrderChild;
 import com.ruoyi.system.dto.SysEquipMaterialDto;
 import com.ruoyi.system.service.ISysSalesOrderChildService;
+import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild;
 import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
 import com.ruoyi.warehouse.service.IWarehouseStorageOrderService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,6 +17,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
@@ -63,6 +65,17 @@ public class ErpInboundOrderController extends BaseController
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(WarehouseStorageOrder storageOrder)
+    {
+        startPage();
+        List<WarehouseStorageOrder> list = storageOrderService.selectWarehouseStorageOrderList(storageOrder);
+        return getDataTable(list);
+    }
+    /**
+     * 查询生产入库单列表
+     */
+    @PostMapping("/makeStorageList")
+    @ResponseBody
+    public TableDataInfo makeStorageList(WarehouseStorageOrder storageOrder)
     {
         startPage();
         List<WarehouseStorageOrder> list = storageOrderService.selectWarehouseStorageOrderList(storageOrder);
@@ -78,11 +91,20 @@ public class ErpInboundOrderController extends BaseController
     @Log(title = "入库单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(QualityOrder qualityOrder)
+    public AjaxResult export(WarehouseStorageOrder storageOrder,String ids)
     {
-        List<QualityOrder> list = qualityOrderService.selectAllMakeQualityOrderList(qualityOrder);
-        ExcelUtil<QualityOrder> util = new ExcelUtil<QualityOrder>(QualityOrder.class);
-        return util.exportExcel(list, "入库单数据");
+        storageOrder.setWarehouseOrderType("1");
+        storageOrder.setWarehouseStorageType("5");
+        if (StringUtils.isEmpty(ids)){
+            List<WarehouseStorageOrder> list = storageOrderService.selectWarehouseStorageOrderList(storageOrder);
+            ExcelUtil<WarehouseStorageOrder> util = new ExcelUtil<WarehouseStorageOrder>(WarehouseStorageOrder.class);
+            return util.exportExcel(list, "入库单数据");
+        }else {
+            String[] storageCodes = ids.split(",");
+            List<WarehouseStorageOrder> list = storageOrderService.selectStorageOrderListByCodes(storageCodes);
+            ExcelUtil<WarehouseStorageOrder> util = new ExcelUtil<WarehouseStorageOrder>(WarehouseStorageOrder.class);
+            return util.exportExcel(list, ids);
+        }
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java

@@ -144,4 +144,7 @@ public interface WarehouseStorageOrderMapper
     *  查询委外入库通知单列表数据
     * */
     List<WarehouseStorageOrder> selectOutsourceStorageOrderList(WarehouseStorageOrder warehouseStorageOrder);
+
+    //根据入库单号批量查询
+    List<WarehouseStorageOrder> selectStorageOrderListByCodes(String[] ids);
 }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java

@@ -150,4 +150,7 @@ public interface IWarehouseStorageOrderService
      * 修改保存入库-采购单(仓库入库)
      */
     int updateStoragePurchaseWarehouseSave(WarehouseStorageOrder warehouseStorageOrder);
+
+    //根据入库单号批量查询
+    List<WarehouseStorageOrder> selectStorageOrderListByCodes(String[] ids);
 }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java

@@ -1462,5 +1462,10 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
         return warehouseStorageOrderMapper.restoreWarehouseStorageOrderById(warehouseStorageId);
     }
 
+    //根据入库单号批量查询
+    @Override
+    public List<WarehouseStorageOrder> selectStorageOrderListByCodes(String[] ids){
+        return warehouseStorageOrderMapper.selectStorageOrderListByCodes(ids);
+    }
 
 }

ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml

@@ -53,7 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="warehouseStorageCode != null  and warehouseStorageCode != ''"> and warehouse_storage_code like concat('%', #{warehouseStorageCode}, '%')</if>
             <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code like concat('%', #{relatedOrderCode}, '%')</if>
+            <if test="qualityOrderCode != null  and qualityOrderCode != ''"> and quality_order_code like concat('%', #{qualityOrderCode}, '%')</if>
             <if test="warehouseStorageStatus != null  and warehouseStorageStatus != ''"> and warehouse_storage_status = #{warehouseStorageStatus}</if>
+            <if test="warehouseOrderType != null  and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if>
             <if test="warehouseQualityStatus != null  and warehouseQualityStatus != ''"> and warehouse_quality_status = #{warehouseQualityStatus}</if>
             <if test="warehouseDeptType != null  and warehouseDeptType != ''"> and warehouse_dept_type = #{warehouseDeptType}</if>
             <if test="warehouseEmployee != null  and warehouseEmployee != ''"> and warehouse_employee = #{warehouseEmployee}</if>
@@ -289,4 +291,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
+
+    <select id="selectStorageOrderListByCodes" parameterType="String" resultMap="WarehouseStorageOrderResult">
+        <include refid="selectWarehouseStorageOrderVo"/>
+        where warehouse_storage_code in
+        <foreach item="warehouseStorageCode" collection="array" open="(" separator="," close=")">
+            #{warehouseStorageCode}
+        </foreach>
+    </select>
+
 </mapper>

ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html

@@ -16,11 +16,11 @@
                             </li>
                             <li>
                                 <label>入库单号：</label>
-                                <input type="text" name="inStorageCode"/>
+                                <input type="text" name="warehouseStorageCode"/>
                             </li>
                             <li>
                                 <label>品质状态：</label>
-                                <select name="qualityStatus" th:with="type=${@dict.getType('qualityStatus')}">
+                                <select name="warehouseQualityStatus" th:with="type=${@dict.getType('qualityStatus')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -29,10 +29,6 @@
                                 <label>关联订单号：</label>
                                 <input type="text" name="relatedOrderCode"/>
                             </li>
-                            <li>
-                                <label>品质员：</label>
-                                <input type="text" name="qualityEmployee"/>
-                            </li>
                             <li class="select-time">
                                 <label>录入时间：</label>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
@@ -49,7 +45,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:inboundOrder:export">
+                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="erp:inboundOrder:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -74,7 +70,7 @@
 
         $(function() {
             var options = {
-                url: prefix + "/list",
+                url: prefix + "/makeStorageList",
                 createUrl: prefix + "/add",
                 updateUrl: prefix + "/edit/{id}",
                 detailUrl: prefix + "/detail/{id}",
@@ -185,6 +181,29 @@
             var url = ctx + 'warehouse/storageOrder/storageMakeDetail/' + warehouseStorageId;
             $.modal.open("详情",url);
         };
+
+        // 导出
+        function exportExcel() {
+            var ids = $.table.selectColumns("warehouseStorageCode");
+            var dataParam = $("#formId").serializeArray();
+
+            let tipMsg = "确定导出当前所有数据吗?";
+            if ($.common.isNotEmpty(ids)) {
+                tipMsg = `确定导出 ${ids} 数据吗?`;
+                dataParam.push({ "name": "ids", "value": ids });
+            }
+            $.modal.confirm(tipMsg, function () {
+                $.modal.loading("正在导出数据，请稍后...");
+                $.post( prefix + "/export", dataParam, function (result) {
+                    if (result.code === web_status.SUCCESS) {
+                        window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                });
+            });
+        }
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html

@@ -65,7 +65,7 @@
 
         $(function(){
             var options = {
-                url: ctx + "system/makeorderbom/list",
+                url: ctx + "system/makeorderbom/storageList",
                 id: 'bootstrap-sub-table-1',
                 showSearch: false,
                 showRefresh: false,