分拣bug

src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue

@@ -508,9 +508,11 @@ export default {
         return
       }
       this.palletScanLoading = true
+      // 手工组盘/直接组盘场景 sortFlag=0：与组盘入库同一套拦截，分拣盘不能在本页操作 - rqrq
       checkPalletExists({
         site: this.site,
-        palletId: this.palletCode.trim()
+        palletId: this.palletCode.trim(),
+        sortFlag: 0
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.palletCode = data.palletId
@@ -857,7 +859,8 @@ export default {
         deletePalletDetail({
           site: this.site,
           palletId: this.palletCode,
-          serialNo: this.scanCode
+          serialNo: this.scanCode,
+          sortFlag: 0
         }).then(({ data }) => {
           if (data && data.code === 0) {
             if (scanOutItem) {

src/views/modules/haianAutoWarehouse/haianPalletPacking.vue

@@ -548,9 +548,11 @@ export default {
         return
       }
       this.palletScanLoading = true
+      // 组盘入库场景 sortFlag=0：后端拦截手工分拣区/被分拣站栈板，并按区域 pack_able 处理后续扫标签 - rqrq
       checkPalletExists({
         site: this.site,
-        palletId: this.palletCode.trim()
+        palletId: this.palletCode.trim(),
+        sortFlag: 0
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.palletCode = data.palletId
@@ -910,7 +912,8 @@ export default {
         deletePalletDetail({
           site: this.site,
           palletId: this.palletCode,
-          serialNo: this.scanCode
+          serialNo: this.scanCode,
+          sortFlag: 0
         }).then(({ data }) => {
           if (data && data.code === 0) {
             if (scanOutItem) {

src/views/modules/haianAutoWarehouse/haianPalletSorting.vue

@@ -101,7 +101,7 @@
               刷新
             </button>
           </div>
-          <!-- 被分拣源盘提示：站点命中 R1-R4 后按放回标签处理 - rqrq -->
+          <!-- 被分拣源盘提示：后端按海安新增被分拣站数组判定，R1-R4 是手工分拣区不走这里 - rqrq -->
           <div v-if="sortedSourceFlag" style="margin-top: 6px; color: #e6a23c; font-size: 12px;">
             当前为被分拣站点，扫进=放回标签，提交=通知回库
           </div>
@@ -304,7 +304,7 @@ export default {
       currentPalletType: '',
       currentAutoSort: 'N',
       currentPalletStation: '',
-      // 被分拣源盘标记：由后端按 location_code 对照 R1-R4 返回，前端不自行猜点位 - rqrq
+      // 被分拣源盘标记：由后端按海安新增被分拣站数组返回，前端不自行猜点位；R1-R4 是手工分拣区 - rqrq
       sortedSourceFlag: false,
       forceFullPalletOut: false,
       palletTypeDisabled: false,
@@ -451,9 +451,11 @@ export default {
         return
       }
       this.palletScanLoading = true
+      // 人工分拣页 sortFlag=1：才允许手工分拣区工作盘和被分拣源盘，禁止和组盘入库共用0 - rqrq
       checkPalletExists({
         site: this.site,
-        palletId: this.palletCode.trim()
+        palletId: this.palletCode.trim(),
+        sortFlag: 1
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.palletCode = data.palletId
@@ -815,7 +817,8 @@ export default {
         deletePalletDetail({
           site: this.site,
           palletId: this.palletCode,
-          serialNo: this.scanCode
+          serialNo: this.scanCode,
+          sortFlag: 1
         }).then(({ data }) => {
           if (data && data.code === 0) {
             this.$message.success('解绑标签成功')