修改 拣配 一个物料不能出库相同wms库位

src/i18n/lang/cn.ts

@@ -192,6 +192,7 @@ export default {
     return_Tip4: '退料数量不能大于总数',
     quantitys: '不能大于应退货数量',
     actual: '实际退货数量不等于应退货数量',
+    receiveAStation: '接收工位',
 
     //库内主菜单
     Warehouse: '成品库内',

src/i18n/lang/en.ts

@@ -194,6 +194,7 @@ export default {
     quantitys: "Cannot be greater than the quantity to be returned",
     actual:
       "The actual returned quantity is not equal to the quantity to be returned",
+    receiveAStation: 'Receiving station',
 
     //库内主菜单
     Warehouse: "FG WH",

src/pages/product/warehouse/wholeLnventory/index.vue

@@ -217,7 +217,7 @@ export default class productCheckReceipt extends BasePage {
       snFlag: this.form.originWl.snFlag,
       pdMode: this.form.originWl.pdMode,
       sn: this.form.code,
-      spQty: this.aaa,
+      spQty: this.form.spQty,
     };
     await this.model.onTakeoutConfirm(list);
   }

src/pages/raw/handover/picking/ByOrder.vue

@@ -222,7 +222,7 @@ export default class RawReceiptDetail extends BasePage {
     let isTrue: boolean = true;
     if (this.LocationList.length != 0) {
       this.LocationList.forEach((item: any) => {
-        if (this.wlCode.sendSpot != item.Code) {
+        if (this.wlCode.sendSpot != item.Code || this.wlCode.label === item.wlCode) {
           uni.showToast({
             icon: "none",
             title: this.$t("message.Commission_tips7") as any,

src/pages/raw/handover/returning/config.ts

@@ -6,15 +6,15 @@ export const headers = [
   {
     label: vm.$t('message.InventoryOrderNo'),
     key: 'label',
-    width: 216,
+    width: 330,
   },
   {
     label: vm.$t('message.InventoryMaterielNo'),
     key: 'value',
-    width: 216,
+    width: 330,
   },
   {
-    label: "接收人",
+    label: vm.$t('message.receiveAStation'),
     key: 'sendSpot',
     width: 216,
   },

src/pages/raw/handover/virtual/index.vue

@@ -9,6 +9,7 @@
     </view>
     <u-form class="form" ref="form" :model="form" label-width="120rpx">
       <u-row>
+        <!-- MRP -->
         <u-col :span="12">
           <u-form-item :required="true" label-width="120rpx" label="MRP" prop="mrpScope">
             <u-input v-model="form.mrpScope" :placeholder="this.$t('message.po_PleaseInput')" />
@@ -32,6 +33,7 @@
             />
           </u-form-item>
         </u-col> -->
+        <!-- 工厂 -->
         <u-col :span="12">
           <u-form-item
             label-width="120rpx"
@@ -45,6 +47,7 @@
             />
           </u-form-item>
         </u-col>
+        <!-- 订单号 -->
         <u-col :span="6">
           <u-form-item label-width="120rpx" :label="this.$t('message.Pi_OrderNo')">
             <u-input v-model="form.orderNoStart" :placeholder="this.$t('message.po_PleaseInput')" />
@@ -115,6 +118,7 @@
             />
           </u-form-item>
         </u-col> -->
+        <!-- 物料号 -->
         <u-col :span="12">
           <u-form-item label-width="120rpx" :label="this.$t('message.po_MaterielNo')">
             <u-input
@@ -124,6 +128,7 @@
             />
           </u-form-item>
         </u-col>
+        <!-- 表 -->
         <u-col :span="12">
           <view class="table-wrapper">
             <wyb-table

src/pages/raw/ingoods/dnReceipt/ImportDN.vue

@@ -32,11 +32,14 @@
           <view>{{ $t('message.Materiel') }}</view>
           <jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="materialChoice" showKey="value" valKey="value" :val="every.materialCode" class="search" :options="materialList" />
         </view>
-        <view class="material-right">
+      </view>
+      <view class="material"
+        ><view class="material-right">
           <view class="material-right-title">{{ $t('message.CommissionedMaterielDesc') }}</view>
           <view class="material-right-code">{{ every.materialDesc }}</view>
         </view>
       </view>
+
       <!-- 需求数量 -->
       <view class="number">
         <view class="number-left">
@@ -154,6 +157,7 @@ export default class dnReceiptDom extends BasePage {
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {
+      console.log('res is:', res);
       let pickerName: any = {};
       pickerName.label = item.locationCode;
       pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
@@ -414,7 +418,7 @@ export default class dnReceiptDom extends BasePage {
       height: 100rpx;
       display: flex;
       .material-left {
-        width: 50%;
+        width: 100%;
         height: 100%;
         display: flex;
         view {
@@ -422,8 +426,13 @@ export default class dnReceiptDom extends BasePage {
           line-height: 100rpx;
         }
       }
+    }
+    .material {
+      width: 100%;
+      height: 100rpx;
+      display: flex;
       .material-right {
-        width: 50%;
+        width: 100%;
         height: 100%;
         display: flex;
         .material-right-title {
@@ -432,7 +441,7 @@ export default class dnReceiptDom extends BasePage {
           line-height: 100rpx;
         }
         .material-right-code {
-          width: 190rpx;
+          width: 80%;
           height: 100%;
           // line-height: 100rpx;
         }

src/pages/raw/ingoods/dnReceipt/dnReceiving.vue

@@ -32,11 +32,14 @@
           <view>{{ $t('message.Materiel') }}</view>
           <jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="materialChoice" showKey="value" valKey="value" :val="every.materialCode" class="search" :options="materialList" />
         </view>
-        <view class="material-right">
+      </view>
+      <view class="material"
+        ><view class="material-right">
           <view class="material-right-title">{{ $t('message.CommissionedMaterielDesc') }}</view>
           <view class="material-right-code">{{ every.materialDesc }}</view>
         </view>
       </view>
+
       <!-- 需求数量 -->
       <view class="number">
         <view class="number-left">
@@ -136,7 +139,7 @@ export default class dnReceiptDom extends BasePage {
   requestAmount: number = null;
 
   async onReady() {
-    // this.initLocation();
+    this.initLocation();
   }
   // 页面初始化
   // 页面需要清空仓库，因此需要复用该方法
@@ -152,6 +155,7 @@ export default class dnReceiptDom extends BasePage {
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
     res.forEach((item: any) => {
+      console.log('res is:', res);
       let pickerName: any = {};
       pickerName.label = item.locationCode;
       pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
@@ -271,6 +275,11 @@ export default class dnReceiptDom extends BasePage {
   deleteItem(index: any) {
     this.LocationList.splice(index, 1);
     this.business();
+    // guoshuang 删除成功提示
+    uni.showToast({
+      icon: 'none',
+      title: this.$t('message.success') as any,
+    });
   }
   // 重置页面数据
   resetForm() {
@@ -408,7 +417,7 @@ export default class dnReceiptDom extends BasePage {
       height: 100rpx;
       display: flex;
       .material-left {
-        width: 50%;
+        width: 100%;
         height: 100%;
         display: flex;
         view {
@@ -416,8 +425,13 @@ export default class dnReceiptDom extends BasePage {
           line-height: 100rpx;
         }
       }
+    }
+    .material {
+      width: 100%;
+      height: 100rpx;
+      display: flex;
       .material-right {
-        width: 50%;
+        width: 100%;
         height: 100%;
         display: flex;
         .material-right-title {
@@ -426,7 +440,7 @@ export default class dnReceiptDom extends BasePage {
           line-height: 100rpx;
         }
         .material-right-code {
-          width: 190rpx;
+          width: 80%;
           height: 100%;
           // line-height: 100rpx;
         }