库存数量:

src/api/saleOrder/index.js

@@ -174,3 +174,13 @@ export async function getSalesDetail(id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+// 获取库存
+export async function getInventory(materialCode, planType) {
+  const res = await request.get(
+    `/aps/productionplan/getInventory/${materialCode}/${planType}`
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/components/CreatePlan/ProductionVersion.vue

@@ -5,7 +5,13 @@
     width="75vw"
     append-to-body
   >
-    <el-table :data="tableData" border ref="tableData" @row-click="single" highlight-current-row>
+    <el-table
+      :data="tableData"
+      border
+      ref="tableData"
+      @row-click="single"
+      highlight-current-row
+    >
       <el-table-column
         label="生产版本"
         align="center"
@@ -24,12 +30,12 @@
         prop="incompleteFormingNum"
       >
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="预计完成时间"
         align="center"
         prop="planCompleteDate"
       >
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="标准产能" align="center" prop="model">
         <template slot-scope="{ row }">
           {{ row.capacityNum }}{{ row.capacityUnit }}/{{ row.capacityTime }}
@@ -60,13 +66,13 @@
 </template>
 
 <script>
-  import { getProductVersion , getPlanProductVersion } from '@/api/saleOrder';
+  import { getProductVersion, getPlanProductVersion } from '@/api/saleOrder';
   export default {
     props: {
       productCode: String,
-	  produceVersionId: String
+      produceVersionId: String
     },
-    data () {
+    data() {
       return {
         visible: false,
         tableData: [],
@@ -76,31 +82,31 @@
       };
     },
     computed: {},
-    created () {},
+    created() {},
     methods: {
-      open (from) {
+      open(from) {
         this.visible = true;
-		this.radio = this.produceVersionId
+        this.radio = this.produceVersionId;
         this.getPageList(from);
       },
-      getPageList (from) {
-		const getFn = from?getPlanProductVersion:getProductVersion
+      getPageList(from) {
+        const getFn = from ? getPlanProductVersion : getProductVersion;
         getFn(this.productCode).then((res) => {
           this.tableData = res;
         });
       },
-      cancel () {
+      cancel() {
         this.visible = false;
         this.radio = '';
         this.current = null;
       },
       // 单击获取id
-      single (row) {
+      single(row) {
         this.current = row;
         this.radio = row.produceVersionId;
       },
       /* 保存编辑 */
-      save () {
+      save() {
         this.visible = false;
         this.$emit('confirm', this.current);
       }

src/views/materialPlan/components/ProductionVersion.vue

@@ -34,7 +34,7 @@
     props: {
       productCode: String
     },
-    data () {
+    data() {
       return {
         visible: false,
         loading: false,
@@ -57,10 +57,10 @@
             label: '未完成重量',
             prop: 'produceVersionName'
           },
-          {
-            label: '预计完成时间',
-            prop: 'produceVersionName'
-          },
+          // {
+          //   label: '预计完成时间',
+          //   prop: 'produceVersionName'
+          // },
           {
             label: '标准产能',
             prop: 'produceVersionName'
@@ -86,22 +86,22 @@
       };
     },
     computed: {},
-    created () {},
+    created() {},
     methods: {
-      open () {
+      open() {
         this.visible = true;
       },
       /* 表格数据源 */
-      datasource ({ page, limit, where }) {
+      datasource({ page, limit, where }) {
         return versionPage({ pageNum: page, size: limit, ...where });
       },
-      cancel () {
+      cancel() {
         this.visible = false;
         this.radio = '';
         this.current = {};
       },
       /* 保存编辑 */
-      save () {
+      save() {
         this.visible = false;
         this.$emit('confirm', this.current);
       }

src/views/saleOrder/salesToProduction.vue

@@ -320,6 +320,7 @@
     saveSaleToPlan,
     updateSaleToPlan,
     releaseSave,
+    getInventory,
     getUpdateInfoById,
     getProductVersion
   } from '@/api/saleOrder';
@@ -327,7 +328,6 @@
   import { deepClone } from '@/utils/index';
   import { getRouteTabKey, removePageTab } from '@/utils/page-tab-util';
   import { getCode } from '@/api/codeManagement';
-  import { release } from '@/api/productionPlan/order.js';
   import dayjs from 'dayjs';
   export default {
     mixins: [dictMixins],
@@ -343,6 +343,7 @@
           planType: 1,
           produceVersionId: '',
           productLine: '',
+          stockCountBase: '',
           salesOrders: [],
           produceVersionName: ''
         },
@@ -382,6 +383,14 @@
           this.getVersionData();
         }
       },
+      async _getInventory() {
+        const res = await getInventory(
+          this.form.productCode,
+          this.form.planType
+        );
+
+        this.form.stockCountBase = res;
+      },
       getSaleInfo(params) {
         productionToPlan(params).then((res) => {
           this.form = deepClone(res);
@@ -400,6 +409,7 @@
           } else {
             this.form.planType = 3;
           }
+          this._getInventory();
         });
       },