diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index e7e86e7..55c290c 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -277,6 +277,8 @@ export default {
     Warehousing: '入库库位',
     PleaseQuantity: '请输入本次数量',
     CommissionedGoOutDetails: '出库明细',
+    CommissionedDetails: '出库明细',
+    closing:'确认关闭订单？',
     CommissionedGoOutNumber: '出库数量',
     // 委外-提示
     Commission_tips1: '请输入单号',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 80c03db..f7fd18a 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -63,6 +63,8 @@ export default {
     rawMenu_virtual_Handover: 'Virtual handover',
     rawMenu_virtual_Handover_QR: 'Confirm handover',
     LBWK: 'List is empty',
+    CommissionedDetails:'detail',
+    closing:'Confirm closing order?',
     rawMenu_InTheLibrary: 'RAW WH',
     rawMenu_ReturnGoods: 'Return',
     rawMenu_SignOut: 'Sign out',
diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue
index 10ed94e..0a3a401 100644
--- a/src/pages/raw/commission/entrant/index.vue
+++ b/src/pages/raw/commission/entrant/index.vue
@@ -78,7 +78,7 @@
     <view class="bottom-bar">
       <u-row class="button-bar">
         <u-col :span="4">
-          <u-button type="primary" @click="bill">{{ $t('message.CommissionedEntrantDetails') }}</u-button>
+          <u-button type="primary" @click="bill">{{ $t('message.CommissionedDetails') }}</u-button>
         </u-col>
         <u-col :span="4">
           <u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
@@ -122,12 +122,11 @@ export default class dnReceiptDom extends BasePage {
   //页面初始化
   async onLoad() {
     //页面初始化 获取可选库位
-    let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
     let content = {
-      loginName: means.session.user.loginName,
+      loginName: session.loginName,
       sendSpot: sendSpot,
-      factoryCode: means.session.user.factoryCode,
+      factoryCode: session.factoryCode,
       workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
@@ -287,7 +286,7 @@ export default class dnReceiptDom extends BasePage {
         height: 100%;
         display: flex;
         view {
-          width: 110rpx;
+          width: 130rpx;
           height: 100%;
           line-height: 100rpx;
         }
diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index dc0d60b..218a1f5 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -65,7 +65,7 @@
     <view class="bottom-bar">
       <u-row class="button-bar">
         <u-col :span="3">
-          <u-button type="primary" @click="bill">{{ $t('message.CommissionedGoOutDetails') }}</u-button>
+          <u-button type="primary" @click="bill">{{ $t('message.CommissionedDetails') }}</u-button>
         </u-col>
         <u-col :span="3">
           <u-button type="primary" @click="close">{{ $t('message.Closed') }}</u-button>
@@ -147,7 +147,23 @@ export default class dnReceiptDom extends BasePage {
       this.customToast(this.$t('message.Commission_tips1') as any);
       return;
     }
-    await this.model.closeCode(this.form.documentNo)
+    uni.showModal({
+      content:this.$t('message.closing') as any,
+      cancelText:this.$t('message.product_Cancel') as any,
+      confirmText:this.$t('message.workArea_Confirm') as any,
+      success:async (res) =>{
+        if(res.confirm){
+          await this.model.closeCode(this.form.documentNo)
+          if(this.model.code == '1'){
+            this.customToast(this.$t('message.Warehouse_Tip9') as any);
+            this.empty()
+            this.form.documentNo == ''
+          }
+        }else if(res.cancel){
+          return
+        }
+      }
+    })
   }
   //输入单号 查询数据
   async query() {
diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue
index 2612b67..95baaa4 100644
--- a/src/pages/raw/handover/aggregating/order.vue
+++ b/src/pages/raw/handover/aggregating/order.vue
@@ -185,7 +185,7 @@ export default class AggregatingOrder extends BasePage {
         const totalHvAmount = parseFloat(firstSelection.totalHvAmount);
         // 拣配数量
         const totalMoAmount = parseFloat(firstSelection.totalMoAmount);
-        if (currentPickNum != totalMoAmount) {
+        if (currentPickNum != totalMoAmount - totalHvAmount) {
           this.customToast(this.$t('message.Pi_tip12') as string);
           return;
         }