修复 委外接口

src/pages/product/outbound/stoOutbound/DN-delivergoods.vue

@@ -54,7 +54,7 @@
         <u-input :disabled="true" v-model="form.productDescZh" placeholder="" />
       </u-form-item>
       <u-form-item :label="$t('message.Line')">
-        <u-input :disabled="true" v-model="form.productDescZh" placeholder="" />
+        <u-input :disabled="true" v-model="form.rowItem" placeholder="" />
       </u-form-item>
       <u-row gutter="0">
         <u-col :span="6">
@@ -169,6 +169,7 @@ export default class stoOutboundDom extends BasePage {
     productCode: "", // 物料类型name
     productDescZh: "",
     scanAmount: 0,
+    rowItem: "",
     barCode: "",
   };
   materialList: any = []; //物料列表
@@ -227,10 +228,12 @@ export default class stoOutboundDom extends BasePage {
     // });
     this.model.materielList.forEach((item: any) => {
       if (v[0].label == item.materialCode) {
+        console.log("item", item);
         this.form.productCode = item.materialCode;
         this.form.productDescZh = item.materialDesc;
+        this.form.rowItem = item.rowItem;
         this.form.orderAmount = item.orderAmount;
-        this.form.scanAmount = parseFloat(item.scanAmount);
+        this.form.scanAmount = parseFloat(item.outAmount);
         return;
       }
     });
@@ -246,7 +249,8 @@ export default class stoOutboundDom extends BasePage {
       if (this.form.productCode == item.label) {
         this.form.productDescZh = item.materialDesc;
         this.form.orderAmount = item.orderAmount;
-        this.form.scanAmount = item.scanAmount;
+        this.form.rowItem = item.rowItem;
+        this.form.scanAmount = parseFloat(item.outAmount);
       }
     });
   }
@@ -349,11 +353,11 @@ export default class stoOutboundDom extends BasePage {
           keepBy: session.loginName,
           loginName: session.loginName,
           order3: this.form.orderNo,
-          // orderType: 3,
           orderType: 4,
           type: 0,
           productCode: item.productCode,
           productDescZh: item.productDescZh,
+          orderItem: this.form.rowItem,
           originWl: item.locCode,
           dockCode: item.dockCode,
           dockName: item.dockName,
@@ -375,12 +379,13 @@ export default class stoOutboundDom extends BasePage {
     });
     this.form.barCode = "";
     this.form.productCode = "";
+    model.orderInInfo.stoAmount = 0;
     // this.form.orderNo = null;
     this.form.scanAmount = 0;
     this.form.orderAmount = "";
     this.form.productDescZh = "";
     this.selectMaterielList = [];
-    this.$table.onEmpty();
+    (this.form.rowItem = ""), this.$table.onEmpty();
   }
   // }
 }

src/pages/product/outbound/stoOutbound/config.ts

@@ -1,21 +1,21 @@
 /**
  * 看单明细表格列
  */
-import vm from '@/main';
+import vm from "@/main";
 export const headers = [
   {
-    label: vm.$t('message.product_barCode'),
-    key: 'barcode',
+    label: vm.$t("message.product_barCode"),
+    key: "barcode",
     width: 300,
   },
   {
-    label: vm.$t('message.product_FGCode'),
-    key: 'materialCode',
+    label: vm.$t("message.product_FGCode"),
+    key: "productCode",
     width: 300,
   },
   {
-    label: vm.$t('message.product_FGDes'),
-    key: 'materialDesc',
+    label: vm.$t("message.product_FGDes"),
+    key: "productDescZh",
     width: 300,
   },
 ];

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

@@ -225,7 +225,10 @@ export class ReturningModule extends VuexModule {
   //查询明细
   @Action({ commit: "updateCheckedOrderInInfoListKw" })
   async querydetaildlist(content: any) {
-    let res: any = await http.post("/material/outsourcing/into/info", content);
+    let res: any = await http.post(
+      "/wmspda/material/outsourcing/into/info",
+      content
+    );
     console.log("明细》》》》》》》》》", res.list);
     this.detailedList = res.data;
     return res;

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

@@ -181,7 +181,10 @@ export class ReturningModule extends VuexModule {
   //查询明细
   @Action({ commit: "updateCheckedOrderInInfoListKw" })
   async querydetaildlist(content: any) {
-    let res: any = await http.post("/material/outsourcing/outInfo", content);
+    let res: any = await http.post(
+      "/wmspda/material/outsourcing/outInfo",
+      content
+    );
     console.log("明细》》》》》》》》》", res.list);
     this.detailedList = res.data;
     return res;

src/pages/raw/ingoods/dnReturnGoods/Location.vue

@@ -4,7 +4,7 @@
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="index" />
       </view>
-      <view class="title">{{ $t("message.Pi_ByOrderPicking") }}</view>
+      <view class="title">{{ $t("message.rawMenu_ReturnGoods") }}</view>
       <view class="right"></view>
     </view>
     <view class="table-wrapper">
@@ -23,18 +23,22 @@
     <!-- 列表展示数据 -->
     <view class="Exhibition">
       <view class="Exhibition-left">
-        <view class="Exhibition-left-title">工位:</view>
+        <view class="Exhibition-left-title"
+          >{{ $t("message.Pi_Station") }}:</view
+        >
         <view class="Exhibition-left-data">{{ some.sendSpot }}</view>
       </view>
       <view class="Exhibition-right">
-        <view class="Exhibition-right-title">已拣数量:</view>
+        <view class="Exhibition-right-title"
+          >{{ $t("message.po_ReturnGoodsQuantity") }}:</view
+        >
         <view class="Exhibition-right-data">{{ some.totalMoAmount }}</view>
       </view>
     </view>
     <!-- 添加库位 -->
     <view class="library">
       <view class="library-left">
-        <view>库位:</view>
+        <view>{{ $t("message.CommissionedLocation") }}:</view>
         <jPicker
           sureColor="#ff0000"
           style="width: 230rpx"
@@ -47,13 +51,17 @@
         />
       </view>
       <view class="library-right">
-        <view class="library-right-title">本次数量</view>
+        <view class="library-right-title">{{
+          $t("message.CommissionedThisNumber")
+        }}</view>
         <u-input v-model="qty" :type="type" :border="border" class="input" />
       </view>
     </view>
     <!-- 添加 -->
     <view class="add">
-      <u-button type="primary" @click="Add">添加</u-button>
+      <u-button type="primary" @click="Add">{{
+        $t("message.product_add")
+      }}</u-button>
     </view>
     <!-- 表格 -->
     <u-table class="library-table">
@@ -81,15 +89,19 @@
       <div class="container">
         <u-row>
           <u-col :span="4">
-            <u-button type="primary" class="appoint" @click="appoint"
-              >拣配明细</u-button
-            >
+            <u-button type="primary" class="appoint" @click="appoint">{{
+              $t("message.detailed")
+            }}</u-button>
           </u-col>
           <u-col :span="4">
-            <u-button type="success" @click="onSubmit"> 提交 </u-button>
+            <u-button type="success" @click="onSubmit">
+              {{ $t("message.po_Submit") }}
+            </u-button>
           </u-col>
           <u-col :span="4">
-            <u-button type="error" @click="onUpload"> 返回 </u-button>
+            <u-button type="error" @click="onUpload">
+              {{ $t("message.po_Return") }}
+            </u-button>
           </u-col>
         </u-row>
       </div>
@@ -177,14 +189,14 @@ export default class RawReceiptDetail extends BasePage {
     if (this.qty == "" || this.wlCode == "") {
       uni.showToast({
         icon: "none",
-        title: "请输入正确的库位和数量" as any,
+        title: this.$t("message.Commission_tips2") as any,
       });
       return;
     }
     if (parseFloat(this.qty) <= 0) {
       uni.showToast({
         icon: "none",
-        title: "请输入大于0的数量" as any,
+        title: this.$t("message.Commission_tips3") as any,
       });
       return;
     }
@@ -215,7 +227,7 @@ export default class RawReceiptDetail extends BasePage {
         if (this.wlCode.sendSpot != item.Code) {
           uni.showToast({
             icon: "none",
-            title: "请选择正确的库位" as any,
+            title: this.$t("message.Commission_tips7") as any,
           });
           return (isTrue = false);
         }
@@ -224,7 +236,7 @@ export default class RawReceiptDetail extends BasePage {
     if (this.some == {}) {
       uni.showToast({
         icon: "none",
-        title: "请先选择一个物料" as any,
+        title: this.$t("message.Commission_tips6") as any,
       });
       return;
     }