diff --git a/src/manifest.json b/src/manifest.json
index 1cac0c3..7e28642 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "HaierGWMS",
-    "appid" : "__UNI__96A47CA",
+    "appid" : "__UNI__306D001",
     "description" : "",
     "versionName" : "0.0.1",
     "versionCode" : 1,
diff --git a/src/pages/product/warehouse/LocationInventory/index.vue b/src/pages/product/warehouse/LocationInventory/index.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/product/warehouse/LocationInventory/model.ts b/src/pages/product/warehouse/LocationInventory/model.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/product/warehouse/MaterialInventory/index.vue b/src/pages/product/warehouse/MaterialInventory/index.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/product/warehouse/MaterialInventory/model.ts b/src/pages/product/warehouse/MaterialInventory/model.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue
index e886bb8..f762e8a 100644
--- a/src/pages/product/warehouse/wholeLnventory/index.vue
+++ b/src/pages/product/warehouse/wholeLnventory/index.vue
@@ -10,7 +10,7 @@
     <u-form class="form" ref="form" :model="form" label-width="180rpx">
       <!-- 单号 -->
       <u-form-item :required="true" :label="$t('message.Warehouse_OrderNo')" prop="pddNo">
-        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.pddNo" @search="model.getProductCode" :show-action="false"></u-search>
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.pddNo" @search="query" :show-action="false"></u-search>
       </u-form-item>
       <!-- 库位 -->
       <u-form-item :required="true" :label="$t('message.product_Location')">
@@ -119,6 +119,21 @@ export default class productCheckReceipt extends BasePage {
   async onReady() {
     this.$form.setRules(this.rules);
   }
+  async query() {
+    if (this.form.pddNo == '') {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.Commission_tips1') as string,
+      });
+    }
+    await this.model.getProductCode(this.form.pddNo);
+    if (model.code == '1') {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.product_Tip8') as string,
+      });
+    }
+  }
   onchange(e: any) {
     // 获取选择库位的集合
     const storeList = this.model.WlListaa.filter((item) => item.locCode === e[0].value);
diff --git a/src/pages/product/warehouse/wholeLnventory/model.ts b/src/pages/product/warehouse/wholeLnventory/model.ts
index 5e60d13..9fc893f 100644
--- a/src/pages/product/warehouse/wholeLnventory/model.ts
+++ b/src/pages/product/warehouse/wholeLnventory/model.ts
@@ -27,6 +27,7 @@ export class wholeLnventory extends VuexModule {
   WlListaa = [];
   productCode: any = '';
   productDescZh: any = '';
+  code: any = '';
   /**
    * 物料型号类型
    */
@@ -63,6 +64,7 @@ export class wholeLnventory extends VuexModule {
     });
     const WlListaa = res.data;
     let arr: any = [];
+    const code = res.code;
     // 去重
     arr = removeDuplicates([...res.data], 'locCode');
     const WlList = arr.map((item: any) => ({
@@ -71,7 +73,7 @@ export class wholeLnventory extends VuexModule {
     }));
     // WlList select结构，只有lbael,value
     // WlListaa 原始结构
-    return { WlList, WlListaa };
+    return { WlList, WlListaa, code };
   }
 
   @MutationAction
diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue
index 217e212..be20c34 100644
--- a/src/pages/product/warehouse/wholeScrap/index.vue
+++ b/src/pages/product/warehouse/wholeScrap/index.vue
@@ -8,76 +8,26 @@
       <view class="right"></view>
     </view>
     <u-form class="form" ref="form" :model="form" label-width="180rpx">
-      <u-form-item :required="true" :label="this.$t('message.product_barCode')" prop="productCode">
-        <u-search
-          :placeholder="this.$t('message.po_PleaseInput')"
-          v-model="form.productCode"
-          @search="model.getProductCode"
-          :show-action="false"
-        ></u-search>
+      <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="model.getProductCode" :show-action="false"></u-search>
       </u-form-item>
-      <u-form-item :label="this.$t('message.product_FGCode')">
+      <u-form-item :label="$t('message.product_FGCode')">
         <u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" />
       </u-form-item>
-      <u-form-item :label="this.$t('message.product_FGDes')">
+      <u-form-item :label="$t('message.product_FGDes')">
         <u-input :disabled="true" v-model="model.orderInInfo.productDescZh" placeholder="" />
       </u-form-item>
-      <u-form-item :label="this.$t('message.product_Number')">
+      <u-form-item :label="$t('message.product_Number')">
         <u-input :disabled="true" v-model="model.orderInInfo.qty" placeholder="" />
       </u-form-item>
-      <!-- <u-form-item label="类型:" prop="cboPlace">
-        <u-input
-          v-model="model.orderInInfo.custCode"
-          type="select"
-          @click="cboPlaceSelect = true"
-        />
-        <u-select
-          v-model="cboPlaceSelect"
-          :list="model.modelType"
-          @confirm="(v) => (form.cboPlace = v[0])"
-        ></u-select>
-      </u-form-item> -->
-      <u-form-item :label="this.$t('message.product_Location')">
+      <u-form-item :label="$t('message.product_Location')">
         <u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
       </u-form-item>
-      <!-- <u-form-item label="类型">
-        <u-input v-model="model.orderInInfo.custCodeName" />
+      <u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
+        <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
       </u-form-item>
-      <u-form-item label="库位:" prop="originWl">
-        <u-input v-model="form.originWl.label" type="select" @click="originWlSelect = true" />
-        <u-select
-          v-model="originWlSelect"
-          :list="model.WlList"
-          @confirm="(v) => (form.originWl = v[0])"
-        ></u-select>
-      </u-form-item> -->
-      <!-- <u-form-item label="目标库位:" prop="aimWl">
-        <u-input v-model="form.aimWl.label" type="select" @click="aimWlSelect = true" />
-        <u-select
-          v-model="aimWlSelect"
-          :list="model.WlList"
-          @confirm="(v) => (form.aimWl = v[0])"
-        ></u-select>
-      </u-form-item> -->
-      <u-form-item
-        :required="true"
-        :label="this.$t('message.Warehouse_TargetLocation')"
-        prop="aimWl"
-      >
-        <jPicker
-          sureColor="#ff0000"
-          @bindpicker="bookTypeChange"
-          showKey="value"
-          valKey="value"
-          :val="form.aimWl.value"
-          :options="model.WlList"
-        />
-      </u-form-item>
-      <u-form-item :required="true" :label="this.$t('message.product_costCenter')">
-        <u-input
-          v-model="model.orderInInfo.costCenter"
-          :placeholder="this.$t('message.po_PleaseInput')"
-        />
+      <u-form-item :required="true" :label="$t('message.product_costCenter')">
+        <u-input v-model="model.orderInInfo.costCenter" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
@@ -86,9 +36,7 @@
           <u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
         </u-col>
         <u-col :span="6">
-          <u-button type="error" @click="uni.navigateBack()">{{
-            $t('message.po_Return')
-          }}</u-button>
+          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
diff --git a/src/pages/raw/handover/aggregating/model.ts b/src/pages/raw/handover/aggregating/model.ts
index 4539b2d..6e6148a 100644
--- a/src/pages/raw/handover/aggregating/model.ts
+++ b/src/pages/raw/handover/aggregating/model.ts
@@ -22,7 +22,7 @@ export class AggregatingModule extends VuexModule {
    * 查询结果列表
    */
   proOrderResultList = [];
-  isFormChange: any = '';
+  isFormChange: any;
 
   /**
    * 查询结果汇总列表
@@ -157,7 +157,7 @@ export class AggregatingModule extends VuexModule {
   get isOrderCheckedAll() {
     return !this.orderList.filter((_: any) => !_.checked).length;
   }
-   /**
+  /**
    * 全选/取消全选查询列表
    * @param checked
    */
@@ -220,6 +220,7 @@ export class AggregatingModule extends VuexModule {
         icon: 'none',
         title: 'No Data Found！',
       });
+      return { aggregateList };
     }
     return { aggregateList };
   }
diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue
index 06be575..405b2f5 100644
--- a/src/pages/raw/handover/aggregating/order.vue
+++ b/src/pages/raw/handover/aggregating/order.vue
@@ -295,6 +295,8 @@ export default class AggregatingOrder extends BasePage {
       queryParams: this.model.orderOutIdListParams,
       proOrderResultList: this.model.proOrderResultList,
     });
+    this.$amountForm.setRules(this.amountFormRules);
+    this.$submitForm.setRules(this.submitFormRules);
   }
   /**
    * 解锁
diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue
index f1e198d..8ae4c5d 100644
--- a/src/pages/raw/handover/aggregating/summary.vue
+++ b/src/pages/raw/handover/aggregating/summary.vue
@@ -300,6 +300,8 @@ export default class AggregatingSummary extends BasePage {
     await this.model.queryProOrder(this.model.isFormChange);
     await this.model.queryProOrderResult(this.model.param);
     await this.model.queryAggregateList(this.model.orderOutIdListParams);
+    this.$amountForm.setRules(this.amountFormRules);
+    this.$submitForm.setRules(this.submitFormRules);
   }
   /**
    * 解锁
diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index 48c4d13..6eaccf3 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -25,7 +25,7 @@
     <view class="library">
       <view class="library-left">
         <view>{{ $t('message.CommissionedLocation') }}:</view>
-        <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode" class="search" :options="Location" />
+        <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
       </view>
       <view class="library-right">
         <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
@@ -251,7 +251,8 @@ export default class RawReceiptDetail extends BasePage {
     this.model.proOrderResultList[this.someIndex].currentAmount = num;
   }
   async onReady() {
-    this.GetLocation();
+    await this.onAggregate();
+    await this.GetLocation();
   }
   async bill() {
     if (this.some == {} || this.some.prdOrder == null) {
@@ -302,6 +303,9 @@ export default class RawReceiptDetail extends BasePage {
     await this.model.queryProOrder(this.model.formParams);
     await this.model.queryProOrderResult(this.model.NEWparams);
     await this.model.lockProOrderResult(this.model.proOrderResultList);
+    this.some = {};
+    this.LocationList = [];
+    this.wlCode = '';
   }
   async GetLocation() {
     this.Location = [];
diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue
index 6cd404a..3ae69e6 100644
--- a/src/pages/raw/handover/picking/BySummary.vue
+++ b/src/pages/raw/handover/picking/BySummary.vue
@@ -243,6 +243,7 @@ export default class RawReceiptDetail extends BasePage {
     this.model.aggregateList[this.someIndex].currentAmount = num;
   }
   async onReady() {
+    await this.onAggregate();
     await this.GetLocation();
   }
   async bill() {
@@ -292,6 +293,9 @@ export default class RawReceiptDetail extends BasePage {
       orderOutIdList,
     };
     await this.model.queryAggregateList(params);
+    this.some = {};
+    this.LocationList = [];
+    this.wlCode = '';
   }
   async GetLocation() {
     this.Location = [];
diff --git a/src/pages/raw/handover/picking/result.vue b/src/pages/raw/handover/picking/result.vue
index bb28b15..2d6011d 100644
--- a/src/pages/raw/handover/picking/result.vue
+++ b/src/pages/raw/handover/picking/result.vue
@@ -51,8 +51,8 @@ export default class RawReceiptDetail extends BasePage {
   }
   //按单
   async onOrder() {
-    const list = this.model.proOrderResultList;
-    await this.model.lockProOrderResult(list);
+    // const list = this.model.proOrderResultList;
+    // await this.model.lockProOrderResult(list);
     this.toPage(this.page.raw.handover.picking.byorder);
   }
   //汇总