禅道bug 1925修改

src/api/cuttingPlan/index.js

@@ -65,7 +65,8 @@ export async function getReleaseInfoById(id) {
 
 // 获取列表
 export async function getMaterialList(data) {
-  const res = await request.get(`/wms/outin/getRealTimeInventory`, {
+  // const res = await request.get(`/wms/outin/getRealTimeInventory`, {
+  const res = await request.get(`/main/category/getList`, {
     params: data
   });
   if (res.data.code == 0) {

src/api/materialPlan/index.js

@@ -65,10 +65,10 @@ export async function getReleaseInfoById(id) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 获取列表
 export async function getMaterialList(data) {
-  const res = await request.get(`/wms/outin/getRealTimeInventory`, {
+  // const res = await request.get(`/wms/outin/getRealTimeInventory`, {
+  const res = await request.get(`/main/category/getList`, {
     params: data
   });
   if (res.data.code == 0) {
@@ -77,10 +77,6 @@ export async function getMaterialList(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
-
-
-
 // 批量根据生产计划计算bom列表信息
 // export async function listBomBySalesOrderIds(data) {
 //   const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderIds`,data);
@@ -90,10 +86,12 @@ export async function getMaterialList(data) {
 //   return Promise.reject(new Error(res.data.message));
 // }
 
-
 //根据bom 版本的id获取对应的物料
 export async function listBomByBomVersionId(data) {
-  const res = await request.post(`/aps/batchingplandetail/listBomByBomVersionId`, data);
+  const res = await request.post(
+    `/aps/batchingplandetail/listBomByBomVersionId`,
+    data
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -102,7 +100,10 @@ export async function listBomByBomVersionId(data) {
 
 // 销售订单
 export async function listBomBySalesOrderIdsOverride(data) {
-  const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderIdsOverride`, data);
+  const res = await request.post(
+    `/aps/batchingplandetail/listBomBySalesOrderIdsOverride`,
+    data
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -111,17 +112,22 @@ export async function listBomBySalesOrderIdsOverride(data) {
 
 // 生产订单
 export async function listBomByPlanIdsOverride(data) {
-  const res = await request.post(`/aps/batchingplandetail/listBomByPlanIdsOverride`, data);
+  const res = await request.post(
+    `/aps/batchingplandetail/listBomByPlanIdsOverride`,
+    data
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 根据销售订单计算bom列表信息
 export async function listBomBySalesOrderId(data) {
-  const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderId`, data);
+  const res = await request.post(
+    `/aps/batchingplandetail/listBomBySalesOrderId`,
+    data
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -139,18 +145,17 @@ export async function submit(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
-
-
 export async function listBomByWorkOrderIds(data) {
-  const res = await request.post(`/aps/batchingplandetail/listBomByMesWorkOrderIds`, data);
+  const res = await request.post(
+    `/aps/batchingplandetail/listBomByMesWorkOrderIds`,
+    data
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 根据工艺路线返回工序
 
 export async function getTaskListById(id) {
@@ -161,7 +166,6 @@ export async function getTaskListById(id) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 配料计划选择生产工单分页
 export async function dosingPage(data) {
   const res = await request.post(`/mes/workorder/dosingPage`, data);
@@ -171,7 +175,6 @@ export async function dosingPage(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
 // 领用页面提交
 export async function addUserPlan(data) {
   const res = await request.post(`/aps/batchingplan/submitOutInStock`, data);
@@ -179,4 +182,4 @@ export async function addUserPlan(data) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}

src/views/materialPlan/components/produce-edit-dialog.vue

@@ -4,7 +4,7 @@
     :closed="cancel"
     :title="`${
       type == 'add' ? '创建' : type == 'detail' ? '详情' : '编辑'
-    }生产配料计划`"
+    }领料申请单`"
     custom-class="ele-dialog-form"
     :close-on-click-modal="true"
     :close-on-press-escape="false"
@@ -20,7 +20,7 @@
     >
       <el-row :gutter="32">
         <el-col :span="12">
-          <el-form-item label="配料计划名称" prop="name">
+          <el-form-item label="领料申请单名称" prop="name">
             <el-input
               placeholder="请输入"
               v-model="formData.name"
@@ -416,7 +416,7 @@
           name: [
             {
               required: true,
-              message: '请输入配料计划名称',
+              message: '请输入领料申请单名称',
               trigger: ['blur', 'change']
             }
           ]

src/views/saleOrder/components/create-order.vue

@@ -393,6 +393,7 @@
                 <el-select
                   v-model="scope.row.factoriesId"
                   :key="scope.row.factoriesId"
+                  @change="(e)=>factorChange(e,scope.row)"
                 >
                   <el-option
                     v-for="item of factoryList"
@@ -674,6 +675,16 @@
           }
         });
       },
+
+      
+      factorChange(e,row){
+        let obj = this.factoryList.find(el=>el.id === e);
+        if(obj){
+          console.log(obj,'obj 1234')
+          row.factoriesIdName = obj.name;
+        }
+        // factoriesIdName
+      },
       // filterInput(value) {
       //   let aaa = value.replace(/[^a-zA-Z0-9]/g, '');
       //   console.log('cccaaaaaaaccc', aaa);

src/views/saleOrder/components/order-search.vue

@@ -567,9 +567,10 @@
         const produceRoutingId = this.selection[0].produceRoutingId;
         const measuringUnit = this.selection[0].measuringUnit;
         const factoriesId = this.selection[0].factoriesId;
+        const factoriesIdName = this.selection[0].factoriesIdName;
         const bomCategoryId = this.selection[0].bomCategoryId;
         const saleType = this.selection[0].saleType;
-        const produceType = this.selection[0].produceType[0];
+        let produceType = this.selection[0].produceType[0];
 
         // if(!factoriesId){
         //   this.$message.warning('工厂未选择！');
@@ -618,6 +619,9 @@
           }
           list.push(item.id);
         });
+        if(produceRoutingId && !bomCategoryId){
+          produceType = '';
+        }
         this.$router.push({
           path: '/saleOrder/salesToProduction',
           query: {
@@ -625,6 +629,7 @@
             produceRoutingId: produceRoutingId,
             produceRoutingName: this.selection[0].produceRoutingName,
             factoriesId: factoriesId,
+            factoriesIdName:factoriesIdName,
             bomCategoryId: bomCategoryId,
             produceType: produceType,
             startTime,

src/views/saleOrder/components/orderHomogeneityInspectDialog.vue

@@ -105,22 +105,22 @@
                   </el-form-item>
                 </el-form>
               </template>
-              <template v-slot:stockCount="{ row }">
+              <template v-slot:inventoryQuantity="{ row }">
                 <el-link
                   type="primary"
                   :underline="false"
                   @click="stockDetail(row)"
                 >
-                  {{ row.stockCount }}
+                  {{ row.inventoryQuantity }}
                 </el-link>
               </template>
-              <template v-slot:currentCount="{ row }">
+              <template v-slot:inTransitNum="{ row }">
                 <el-link
                   type="primary"
                   :underline="false"
                   @click="currentDetail(row)"
                 >
-                  {{ row.currentCount }}
+                  {{ row.inTransitNum }}
                 </el-link>
               </template>
               <template v-slot:stockColor="{ row }">
@@ -262,6 +262,7 @@
           },
           {
             prop: 'inventoryQuantity',
+            slot: 'inventoryQuantity',
             label: '库存数量',
             showOverflowTooltip: true,
             align: 'center'
@@ -351,9 +352,10 @@
           specification: '',
           model: ''
         },
-        salesOrderId:'',
+        salesOrderId: '',
         // 来源
-        source: 'list'
+        source: 'list',
+        bomCode: ''
       };
     },
     watch: {
@@ -381,11 +383,13 @@
           ...where
         });
       },
+      // 定额数量
       stockDetail(row) {
-        this.$refs.stockDetailDialog.open(row);
+        this.$refs.stockDetailDialog.open({ bomCode: row.code });
       },
+      // 在途
       currentDetail(row) {
-        this.$refs.currentDetailDialog.open(row);
+        this.$refs.currentDetailDialog.open({ bomCode: row.code });
       },
       open(dataList, order, source = 'list') {
         this.source = source;
@@ -446,7 +450,7 @@
       },
       // 获取bom 数据
       async getBomData(data) {
-        console.log(data,'datadatadatadata')
+        console.log(data, 'datadatadatadata');
         this.loading = true;
         try {
           this.salesOrderId = data.id;
@@ -468,7 +472,8 @@
             let OBMINFO = {
               bomId: el.bomId,
               bomType: el.type,
-              versions: `V${el.versions}.0`
+              versions: `V${el.versions}.0`,
+              code: el.code
             };
             if (obj[el.bomType]) {
               obj[el.bomType].bomList.unshift(OBMINFO);
@@ -488,6 +493,7 @@
       // 选择BOM类型
       async bomTypeChange(e) {
         this.formInline.bomType = e;
+        this.bomCode = '';
         let data = this.bomListType.find((el) => el.id === e);
         if (!data) return;
         this.bomListV = data.bomList;
@@ -498,6 +504,8 @@
         this.formInline.bomId = e;
         let data = this.bomListV.find((el) => el.bomId === e);
         if (!data) return;
+        console.log(data, 'datadatadatadata');
+        this.bomCode = data.code;
         await this.getMaterialData(data);
       },
       // 获取物料数据信息

src/views/saleOrder/index.vue

@@ -488,11 +488,13 @@
                   pre = item;
                   // JSON.parse(JSON.stringify({}))
                   data.push(item.id);
+                  item.code = ele.code;
                   data2.push(item);
                 }
               }
             }
           }
+          console.log(data2,'data2 333333')
           if (flag) {
             // 齐料
             if (type == 2) {

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -224,7 +224,7 @@
 
           <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
             <!-- prop="factoriesId" -->
-            <el-form-item label="所属工厂:">
+            <el-form-item label="所属工厂:" prop="factoriesId">
               <el-select
                 v-model="form.factoriesId"
                 style="width: 100%"
@@ -826,7 +826,8 @@
         // 表单验证规则
         rules: {
           produceRoutingId: [
-            { required: true, message: '请选择工艺路线', trigger: 'blur' }
+            { required: true, message: '请选择工艺路线', trigger: 'blur' },
+            
           ],
           // startTime: [
           //   {
@@ -1047,7 +1048,7 @@
       },
 
       bomListVersion(type) {
-        console.log(type,'type 传递的参数 33')
+        console.log(type, 'type 传递的参数 33');
         let categoryId = '';
 
         if (this.form.salesOrders.length) {
@@ -1077,6 +1078,7 @@
         });
       },
       changeProduceType(type) {
+        console.log('111111111111111111111111');
         if (this.clientEnvironmentId == 4) {
           return false;
         }
@@ -1087,10 +1089,19 @@
         this.bomVersionList = [];
 
         this.routingList = [];
+
         this.form.produceRoutingId = '';
         this.form.produceRoutingName = '';
         this.form.produceVersionName = '';
         this.selectionRowShow = false; // ****
+        if (type == 'init') {
+          let queryD = this.$route.query;
+          if (queryD.produceRoutingId && !queryD.bomCategoryId) {
+            this.form.produceRoutingName = queryD.produceRoutingName;
+            this.form.produceRoutingId = queryD.produceRoutingId;
+          }
+          this.selectionRowShow = true;
+        }
         this.bomListVersion(type);
       },
 
@@ -1132,7 +1143,6 @@
           console.log(222222222222222222222222, '===');
           this.initTime();
           // this.bomListVersion('init');
-
           this.form.produceRoutingName =
             res.produceRoutingName || this.$route.query.produceRoutingName;
           this.form.produceRoutingId =
@@ -1189,6 +1199,7 @@
           }
           this._getInventory();
         });
+
         this.$forceUpdate();
       },
 
@@ -1339,7 +1350,7 @@
             //   1000;
           } else {
             this.form.newWeightUnit = this.form.weightUnit;
-             _sumOrderWeight = this.form.newSumOrderWeight
+            _sumOrderWeight = this.form.newSumOrderWeight;
             // _sumOrderWeight =
             //   this.form.salesOrders[0].requiredFormingNum *
             //   Number(this.form.salesOrders[0].productUnitWeight || 1);