Merge remote-tracking branch 'origin/master'

zkqy-custom-business/src/main/java/com/zkqy/business/controller/MaterielController.java

@@ -141,6 +141,14 @@ public class MaterielController extends BaseController
         return AjaxResult.success(materielService.queryMaterielList());
     }
 
+    /**
+     * 领料管理、采购管理  获取所有原材料排序
+     */
+    @GetMapping("/queryMaterielAllList")
+    public AjaxResult queryMaterielAllList(){
+        return AjaxResult.success(materielService.queryMaterielAllList());
+    }
+
     /**
      * 查询母粒管理信息列表
      */

zkqy-custom-business/src/main/java/com/zkqy/business/mapper/MaterielMapper.java

@@ -74,6 +74,11 @@ public interface MaterielMapper
      */
     List<Materiel> queryMaterielList();
 
+    /**
+     * 获取全部原材料
+     */
+    List<Materiel> queryMaterielAllList();
+
     /**
      * 查询母粒管理信息列表
      */

zkqy-custom-business/src/main/java/com/zkqy/business/service/IMaterielService.java

@@ -72,6 +72,11 @@ public interface IMaterielService
      */
     List<Materiel> queryMaterielList();
 
+    /**
+     * 领料管理、采购管理  获取所有原材料
+     */
+    List<Materiel> queryMaterielAllList();
+
     /**
      * 查询母粒管理信息列表
      */

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/MaterielServiceImpl.java

@@ -115,6 +115,15 @@ public class MaterielServiceImpl implements IMaterielService
         return materielMapper.queryMaterielList();
     }
 
+    /**
+     * 获取全部原材料
+     * @return
+     */
+    @Override
+    public List<Materiel> queryMaterielAllList() {
+        return materielMapper.queryMaterielAllList();
+    }
+
     @Override
     public List<Materiel> selectMaterielManageList(Materiel materiel) {
         return materielMapper.selectMaterielManageList(materiel);

zkqy-custom-business/src/main/resources/mapper/business/MaterielMapper.xml

@@ -155,6 +155,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where del_flag = '0' and materiel_species = '1' order by materiel_name desc
     </select>
 
+    <select id="queryMaterielAllList" resultMap="MaterielResult">
+        <include refid="selectMaterielVo"/>
+        where del_flag = '0' order by materiel_name desc
+    </select>
+
     <select id="selectMaterielManageList" parameterType="com.zkqy.business.domain.Materiel" resultMap="MaterielResult">
         <include refid="selectMaterielVo"/>
         where del_flag = '0' and materiel_species = '1'

zkqy-ui/src/api/tablelist/commonTable.js

@@ -418,6 +418,15 @@ export function queryMaterielList(data) {
   })
 }
 
+// 领料管理、采购管理  获取所有原材料接口
+export function queryMaterielAllList(data) {
+  return request({
+    url: '/system/materiel/queryMaterielAllList',
+    method: 'get',
+    //baseURL: process.env.VUE_APP_BASE_API1
+  })
+}
+
 // 订单管理  新  获取色号选项数据接口
 export function productColourList(data) {
   return request({

zkqy-ui/src/views/orderMange/requisitionOrders/index.vue

@@ -271,6 +271,7 @@ import {
   updateRequisitionOrders, materialRequisitionTaskList, approvalOrders, getRequisitionOrdersByTaskCode
 } from "@/api/huaxian/requisitionOrders";
 import {queryMaterielList} from "@/api/tablelist/commonTable";
+import {queryMaterielAllList} from "@/api/tablelist/commonTable";
 
 export default {
   name: "RequisitionOrders",
@@ -360,7 +361,7 @@ export default {
     },
     /** 查询物料信息 */
     getMaterielList() {
-      queryMaterielList().then(res => {
+      queryMaterielAllList().then(res => {
         this.materielList = res.data;
       });
     },
@@ -657,7 +658,7 @@ export default {
 
         materialRequisitionTaskList().then(res => {
 
-          queryMaterielList().then(qes => {
+          queryMaterielAllList().then(qes => {
             let materielList = qes.data;
 
             let taskList = res.rows;