委外出库查询及库位

src/pages/raw/commission/goOut/index.vue

@@ -8,16 +8,18 @@
       <view class="right"></view>
     </view>
     <u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
-      <u-form-item :required="true" :label="$t('message.CommissionedSingleNumber')" prop="orderNo">
+      <u-form-item :required="true" :label="$t('message.CommissionedSingleNumber')" prop="poNo">
+      <!-- 单号 -->
         <u-search
           :placeholder="$t('message.po_PleaseInput')"
-          v-model="form.orderNo"
+          v-model="form.poNo"
-          @search="model.queryOrderInInfo"
+          @search="model.queryOrder"
           :show-action="false"
         ></u-search>
       </u-form-item>
       <u-row gutter="0">
-        <u-col :span="6">
+        <!-- 物料号 -->
+        <!-- <u-col :span="6">
           <u-form-item :required="true" :label="$t('message.CommissionedMaterielNo')">
             <u-input
               v-model="form.productCode"
@@ -33,43 +35,53 @@
               @confirm="materialConfirm"
             ></u-select>
           </u-form-item>
+        </u-col> -->
+        <u-col :span="6">
+          <u-form-item :label="$t('message.CommissionedMaterielNo')">
+            <u-input v-model="form.materialCode" :placeholder="$t('message.po_PleaseInput')" />
+          </u-form-item>
         </u-col>
+        <!-- 物料描述 -->
         <u-col :span="6">
           <u-form-item :label="$t('message.CommissionedMaterielDesc')">
-            <u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.materialDesc" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
       </u-row>
       <u-row gutter="0">
+         <!-- 需求数量 -->
         <u-col :span="6">
           <u-form-item :label="$t('message.CommissionedDemandData')">
             <u-input v-model="form.orderAmount" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
+        <!-- 累计出库数量 -->
         <u-col :span="6">
           <u-form-item :label="$t('message.CommissionedCumulativeData')">
-            <u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.outAmount" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
       </u-row>
       <u-row gutter="0">
+        <!-- 库位 -->
         <u-col :span="6">
           <u-form-item :required="true" :label="$t('message.CommissionedLocation')">
             <u-input
-              v-model="form.productCode"
+              v-model="form.locationCode"
               type="select"
-              @click="materialCodeSelect = true"
+              @click="locationCodeSelect = true"
               :placeholder="$t('message.po_PleaseInput')"
             />
             <u-select
               :confirm-text="$t('message.product_Confirm')"
               :cancel-text="$t('message.product_Cancel')"
-              v-model="materialCodeSelect"
+              v-model="locationCodeSelect"
-              :list="model.materielList"
+              :list="model.locationCodeList"
-              @confirm="materialConfirm"
+              @confirm="locationCodeConfirm"
             ></u-select>
           </u-form-item>
         </u-col>
+        <!-- 本次数量 -->
         <u-col :span="6">
           <u-form-item :label="$t('message.CommissionedThisNumber')">
             <u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" />
@@ -156,11 +168,24 @@ export default class stoOutboundDom extends BasePage {
    * 表单数据
    */
   form = {
+    // poNo
+    poNo:null,
+    // 物料号
+    materialCode:null,
+    // 物料描述
+    materialDesc:null,
+    poLine:null,
+    unit:null,
+    // 累计出库数量
+    outAmount:null,
+    // 需求数量
+    orderAmount: '',
+    locationCode:null,//库位    
     dockCode: null, // 月台类型code
     dockName: null, // 月台类型name
     orderNo: null,
     qty: 0,
-    orderAmount: '',
+    
     productCode: '', // 物料类型name
     productDescZh: '',
     scanAmount: '',
@@ -179,6 +204,7 @@ export default class stoOutboundDom extends BasePage {
   returningTypeSelect = false;
   // 物料类型选择
   materialCodeSelect = false;
+  locationCodeSelect = false;
   /**
    * 表单验证规则
    */
@@ -189,7 +215,7 @@ export default class stoOutboundDom extends BasePage {
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
   async onReady() {
     this.$form.setRules(this.rules);
-    model.queryReturningTypeList();
+    model.queryByFactoryCodeAndWorkAreaCode();
   }
   onCheck(e: any) {
     console.log('e.data', e.data);
@@ -219,6 +245,18 @@ export default class stoOutboundDom extends BasePage {
     });
     console.log('this.form', this.form);
   }
+  locationCodeConfirm(v: any) {
+    console.log('v[0].value', v[0]);
+    // this.form.productCode = v[0].value;
+    this.model.locationCodeList.forEach((item: any) => {
+      console.log('item',item)
+      if (v[0].value == item.value) {
+        this.form.locationCode = item.value;
+      }
+    });
+    console.log('this.form', this.form);
+  }
+
   /**
    * 清空
    */

src/pages/raw/commission/goOut/model.ts

@@ -28,7 +28,7 @@ export class ReturningModule extends VuexModule {
    * 物料列表
    */
   materielList: any[] = [];
-
+  locationCodeList: any[] =[];
   //条码扫描的返回的结果
   oneMaterielDetail: any = {};
   /**
@@ -37,51 +37,38 @@ export class ReturningModule extends VuexModule {
   orderInInfo: OrderInInfo = new OrderInInfo();
   //记账按钮的code码
   code = '';
-  /**
+
-   * 查询月台列表
-   */
-  @MutationAction
-  async queryReturningTypeList() {
-    const list: [] = await http.post(url.outbound.stoOutbound.yuetaiType, {
-      factoryCode: session.factoryCode,
-      whCode: session.warehouseCode,
-      loginName: session.loginName,
-    });
-    const returningTypeList = list.map((item: any) => ({
-      label: item.dockName,
-      value: item.dockCode,
-    }));
-    return { returningTypeList };
-  }
 
   /**
-   * 查询订单号
+   * 委外出库单号查询
    * @param orderNo
    */
-  @MutationAction
+  @Action
-  async queryOrderInInfo(stoNo: string) {
+  async queryOrder(form:any) {
-    const result = await http.post(url.outbound.stoOutbound.info, {
+    const result = await http.post(url.material.commission.goOut.queryOrder, {
-      stoNo,
+      ...form,
-      deleteFlag: 2,
-      finalState: 3,
       loginName: session.loginName,
+      factoryCode:session.factoryCode
     });
-    let stoAmount = 0;
-    result.data.records.forEach((item: any) => {
-      stoAmount += item.orderAmount;
-    });
-    const materielList = result.data.records.map((item: any) => ({
-      label: item.materialCode,
-      value: item.stoItem,
-      ...item,
-    }));
-    console.log('materielList', materielList);
-    if (result.data.records[0]) {
-      result.data.records[0].stoAmount = stoAmount;
-    }
     const orderInInfo = result.data.records[0] || {};
-    return { orderInInfo, materielList };
+    return { orderInInfo };
   }
+  /**
+   * 库位
+   */
+   @MutationAction
+   async queryByFactoryCodeAndWorkAreaCode() {
+     const list: [] = await http.post(url.material.commission.goOut.queryByFactoryCodeAndWorkAreaCode, {
+       factoryCode: session.factoryCode,
+       whCode: session.warehouseCode,
+       loginName: session.loginName,
+     });
+     const locationCodeList = list.map((item: any) => ({
+       label: item.locationCode,
+       value: item.locationCode,
+     }));
+     return { locationCodeList };
+   }
 
   /**
    * 扫条码

src/utils/url.ts

@@ -84,6 +84,20 @@ export const url = {
       // 5.盘点完成
       orderComplete: "/product/finished/checkRaw/orderComplete",
     },
+    // 委外 commission 
+    commission: {
+      // 出库 goOut
+      goOut:{
+        // 出库单号查询
+        queryOrder: "/material/outsourcing/queryOrder",
+        // 库位下拉列表
+        queryByFactoryCodeAndWorkAreaCode: "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
+        // 出库提交
+        materialComplete: "/material/outsourcing/materialComplete",
+        // 出库明细查询
+        outInfo: "/material/outsourcing/outInfo",
+      },
+    },
   },
   SFG: {
     DumpListFH: {