@logwire/logwire-wms-pda-ui 3.1.1 → 3.1.2

package/src/components/page/outbound/{pickContainer → pickContainerSearch}/index/index.vue

@@ -30,7 +30,7 @@
 <script>
 
 export default {
-  name: "lwOutboundPickContainerIndexPage",
+  name: "lwOutboundPickContainerSearchIndexPage",
   data() {
     return {
       value:'',
@@ -48,7 +48,7 @@ export default {
       }
 
       this.$router.replace({
-        path: '/outbound/pickContainer/lwAction',
+        path: '/outbound/pickContainerSearch/lwAction',
         query:{
           lwContainer: this.value
         }

package/src/components/page/outbound/pickMerge/action/index.vue

@@ -15,10 +15,7 @@
         :back-step="2"
       />
 
-      <div
-        style="margin-top: 10px"
-        class="lw-global-tab-box"
-      >
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs
           type="card"
           animated
@@ -90,7 +87,7 @@
             />
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 
@@ -441,6 +438,7 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.pickMerge.action.xjbyanpx','异常上报成功')
         )
+        this.$refs.abnormal.printLabel()
 
         this.mergeOver(res)
 

package/src/components/page/outbound/sow/action/index.vue

@@ -1428,6 +1428,7 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.uleyatow','异常上报成功')
         )
+        this.$refs.abnormal.printLabel()
         this.abnPopup.show = false
 
         if (this.checkSowOver(res)) return

package/src/components/page/outbound/sow/components/sowLotItem/index.vue

@@ -105,13 +105,24 @@
 
         <div
           style="width: calc(15 - 10px);margin: 0 5px"
-          class="lw-global-value-bold-red lw-global-text-overflow"
-        >{{ item.pickQty }}</div>
+          class="lw-global-text-overflow"
+        >
+          {{ item.pickQty }}
+
+        </div>
 
         <div
           style="width: 40%"
-          class="lw-global-title lw-global-text-overflow"
-        >{{ item.sowCollectLocation || '-' }}</div>
+          class="lw-global-text-overflow"
+        >
+          <span class="lw-global-title lw-global-show-colon" style="font-weight: normal">
+            {{ $lwLanguage.get('','通道') }}
+          </span>
+
+          <span class="lw-global-value-bold">
+            {{ item.sowCollectLocation || '-' }}
+          </span>
+        </div>
 
       </div>
 

package/src/components/page/outbound/sow/index/index.vue

@@ -119,9 +119,7 @@
 
               <div style="flex: 1">{{ i.pickContainer }}</div>
               <div style="flex-shrink: 0">
-                <span class="lw-global-value-bold-red">{{ i.sowQty }}</span>
-                /
-                {{ i.pickQty }}
+                <span class="lw-global-value-bold-red">{{ i.sowQty }}</span> / {{ i.pickQty }}
               </div>
 
             </div>

package/src/components/page/process/prepare/index.vue

@@ -39,7 +39,7 @@
       </template>
 
       <!-- tab -->
-      <div style="margin-top: 10px" class="lw-global-tab-box">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs
           type="card"
           animated
@@ -204,7 +204,7 @@
 
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/process/process/action/index.vue

@@ -8,7 +8,7 @@
     <lw-nav-bar :title="$lwLanguage.get('','加工 - 执行')"/>
     <div class="lw-global-page-box">
       <dock-info v-if="order.workTableId" :code="order.workTableId"/>
-      <div style="margin-top: 10px" class="lw-global-tab-box">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs type="card" animated v-model="tabActive">
           <van-tab name="info" :title="$lwLanguage.get('','基础信息')">
             <dock-task-info style="margin-bottom: 10px" :item="order" :show-click="false"/>
@@ -25,7 +25,7 @@
             <over-collapse v-for="p in order.products" :key="p.id" :product="p" @printComplete="printProductComplete"/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
     <lw-bottom-bar-btn-hidden v-if="order.status === '500'" :btn-list="btnList"/>
     <lw-bottom-bar v-else>

package/src/components/page/process/process/components/FinishView.vue

@@ -2,7 +2,7 @@
   <div class="finish-view">
     <lw-nav-bar :title="type === 'lot' ? $lwLanguage.get('','加工 - 完成加工批次') : $lwLanguage.get('','加工 - 完成加工')" :leftArrow="false"/>
     <div class="lw-global-page-box">
-      <div style="margin-top: 10px" class="lw-global-tab-box">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs type="card" animated v-model="tabActive">
           <van-tab name="product" :title="$lwLanguage.get('','成品')">
             <div v-for="p in order.products" :key="p.id" class="lw-global-model-box">
@@ -84,7 +84,7 @@
             </div>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
     <lw-bottom-bar>
       <lw-button @click="$emit('cancel')" plain>{{ $lwLanguage.get('', '取消') }}</lw-button>
@@ -272,7 +272,7 @@ export default {
           return this.$lwShowErrorMsg('拆装完成批次时，原料消耗量不能为空')
         }
       }
-      
+
       window.lwWindowGlobalData.set('input.dom', null)
 
       const param = { workOrderId: this.order.id, products, materialLines }

package/src/components/page/process/process/console/index.vue

@@ -8,7 +8,7 @@
     <lw-nav-bar :title="$lwLanguage.get('','加工控制台')"/>
     <div class="lw-global-page-box">
       <dock-info :code="tableId"/>
-      <div style="margin-top: 10px" class="lw-global-tab-box">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs type="card" animated v-model="tabActive">
           <van-tab name="ing" :title="$lwLanguage.get('','正在加工')">
             <dock-task-info v-if="doingTask" :item="doingTask" @click="taskClick(doingTask)"/>
@@ -29,7 +29,7 @@
             <lw-not-data v-else/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
       <lw-bottom-bar v-if="tabActive==='ing' && doingTask">
         <lw-button @click="start(doingTask)">
           {{ $lwLanguage.get('', '执行加工') }}

package/src/components/page/process/process/content/index.vue

@@ -328,6 +328,12 @@ export default {
     },
     // 进入
     enter () {
+      if(!this.onlineWorkers.length){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','请添加员工')
+        )
+        return
+      }
       this.$router.push({
         path: '/process/action/lwConsole',
         query: { workTableId: this.table.id }

package/src/components/page/receive/putaway/caseAction/index.vue

@@ -9,7 +9,7 @@
     <div class="lw-global-page-box">
 
       <!-- tab -->
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           type="card"
           animated
@@ -24,7 +24,7 @@
             :title="i"
           />
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
       <!-- 托盘数据 -->
       <div v-if="lpnTaskData">
@@ -42,28 +42,38 @@
           </div>
 
           <!-- 原库位、目标库位 -->
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.receive.putaway.fromLocal', '原库位')"
+            :value="lpnTaskData.fromLocationCode"
+            val-bold
+          />
           <div class="lw-global-row lw-global-flex-between">
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位')"
+              :value="lpnTaskData.toLocationCode"
+              val-bold
+              :is-row="false"
+            />
 
-            <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.receive.putaway.fromLocal', '原库位') }}
-            </span>
-              <span class="lw-global-value-bold">
-              {{ lpnTaskData.fromLocationCode }}
-            </span>
-            </div>
-
-            <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位') }}
-            </span>
-              <span class="lw-global-value-bold">
-              {{ lpnTaskData.toLocationCode }}
-            </span>
-            </div>
+            <lw-button
+              style="flex-shrink: 0"
+              mini
+              round
+              @click.stop="reloadLoc"
+            >
+              {{ $lwLanguage.get('','库位重新分配') }}
+            </lw-button>
 
           </div>
 
+          <lw-title-value-cell
+            v-if="lpnTaskData.secondToLocationCode"
+            :title="$lwLanguage.get('', '二次分配')"
+            :value="lpnTaskData.secondToLocationCode"
+            val-bold
+            val-red
+          />
+
           <!-- 总数量、行数 -->
           <div class="lw-global-row lw-global-flex-between">
 
@@ -256,7 +266,7 @@
 import CaseInfo from './../components/CaseInfo/index.vue'
 
 import {
-  wmsMobileGetPutawayTaskByWholeLpn,
+  wmsMobileGetPutawayTaskByWholeLpn, wmsMobileSecondAllocatePutawayByWholeCase,
   wmsMobileSubmitPutawayByWholeCase
 } from "../../../../../api/receive/putaway";
 
@@ -384,7 +394,7 @@ export default {
       if (!caseNum) {
         this.caseNum.value = null
         this.caseNum.focus = true
-        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.receive.putaway.error.caseNum.null', '箱号 不能为空'))
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.receive.putaway.error.caseNum.null', '箱号不能为空'))
       }
 
       if (this.scanCaseList.find(i => i.fromCase === caseNum)) {
@@ -393,8 +403,7 @@ export default {
         return this.$lwShowErrorMsg(caseNum + this.$lwLanguage.get('wms_project.pda.receive.putaway.case.error.scan', '箱号已扫描，请检查'))
       }
       const i = this.lpnTaskData.caseList.findIndex(i => i.fromCase === caseNum)
-      console.log("---index----")
-      console.log(i)
+
       if (i < 0) {
         this.caseNum.value = null
         this.caseNum.focus = true
@@ -538,6 +547,27 @@ export default {
           )
         }
       })
+    },
+
+    // 库位二次分配
+    async reloadLoc(){
+
+      try {
+        if (this.scanCaseList.length){
+          await this.$lwDialog.confirm({
+            title: this.$lwLanguage.get('','提示'),
+            message: this.$lwLanguage.get('','当前存在扫描箱，重新分配后数据将会被清空'),
+          })
+        }
+
+        await wmsMobileSecondAllocatePutawayByWholeCase({
+          taskId: this.lpnTaskData.taskId,
+          caseNumList: this.lpnTaskData.caseList.map(item=>item.fromCase)
+        })
+        this.tabChange()
+      }catch{
+        console.log('库位分配取消')
+      }
     }
   }
 }

package/src/components/page/receive/putaway/components/SkuInfo/index.vue

@@ -131,29 +131,31 @@
           val-red
         />
 
-        <lw-title-value-cell
-          v-if="showTo && hasPutaway"
-          :title="$lwLanguage.get('wms_project.pda.receive.putaway.actToLocal', '实际库位')"
-          :value="i.toActLocationCode"
-          :is-row="false"
-          val-bold
-        />
-
-        <lw-title-value-cell
-          v-else-if="showTo"
-          :title="$lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位')"
-          :value="i.toLocationCode"
-          :is-row="false"
-          val-bold
-        />
-
-        <lw-title-value-cell
-          v-else
-          :title="$lwLanguage.get('wms_project.pda.receive.putaway.local', '库位')"
-          :value="i.fromLocationCode"
-          :is-row="false"
-          val-bold
-        />
+        <template v-if="showLoc">
+          <lw-title-value-cell
+            v-if="showTo && hasPutaway"
+            :title="$lwLanguage.get('wms_project.pda.receive.putaway.actToLocal', '实际库位')"
+            :value="i.toActLocationCode"
+            :is-row="false"
+            val-bold
+          />
+
+          <lw-title-value-cell
+            v-else-if="showTo"
+            :title="$lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位')"
+            :value="i.toLocationCode"
+            :is-row="false"
+            val-bold
+          />
+
+          <lw-title-value-cell
+            v-else
+            :title="$lwLanguage.get('wms_project.pda.receive.putaway.local', '库位')"
+            :value="i.fromLocationCode"
+            :is-row="false"
+            val-bold
+          />
+        </template>
 
         <lw-button
           v-if="showAbnormal"
@@ -244,6 +246,12 @@ export default {
     showTo:{
       type: Boolean,
       default: true
+    },
+
+    // 是否显示库位信息
+    showLoc:{
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -287,6 +295,7 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.receive.putaway.abnSuccess','异常上报成功')
         )
+        this.$refs.abnormal.printLabel()
         this.$emit('abnSuccess')
       })
     }

package/src/components/page/receive/putaway/components/SkuPutAwayInfo/index.vue

@@ -119,14 +119,34 @@
       </div>
 
       <!-- 推荐库位 -->
-      <div style="margin-top: 5px">
-      <span class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.receive.putaway.recommend','推荐库位') }}
-      </span>
-        <span class="lw-global-value-bold" style="font-size: 16px">
-        {{ item.toLocationCode }}
-      </span>
+      <div
+        style="margin-bottom: 1px"
+        class="lw-global-flex-between"
+      >
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.receive.putaway.recommend','推荐库位')"
+          :value="item.toLocationCode"
+          :is-row="false"
+        />
+
+        <lw-button
+          v-if="showReload"
+          mini
+          round
+          @click="$emit('reload')"
+        >
+          {{ $lwLanguage.get('','库位重新分配') }}
+        </lw-button>
       </div>
+
+      <lw-title-value-cell
+        v-if="item.secondToLocationCode"
+        :title="$lwLanguage.get('','二次分配')"
+        :value="item.secondToLocationCode"
+        :is-row="false"
+        val-bold
+        val-red
+      />
     </div>
 
     <!-- 看板 -->
@@ -183,6 +203,9 @@ export default {
       type: String,
       default: 'bottom'
     },
+
+    // 是否显示重新分配库位的按钮
+    showReload: Boolean
   },
   data() {
     return {}

package/src/components/page/receive/putaway/components/TaskInfo/index.vue

@@ -220,7 +220,8 @@ export default {
   },
   data() {
     return {
-      activeNames:[]
+      activeNames:[],
+      printInfo:{}
     }
   },
   methods: {
@@ -236,10 +237,23 @@ export default {
 
     // 补打标签
     printLabel(){
+
+      if (!Object.keys(this.printInfo).length){
+        const {success, printData} = this.$lwPrint.test(
+          'PART_PUTAWAY_LABEL',
+          this.$lwLanguage.get('','入库上架标签')
+        )
+        if (!success) return
+
+        this.printInfo = printData
+      }
+
       wmsMobilePrintPutawayLabel({
-        taskId: this.item.taskId
+        taskId: this.item.taskId,
+        printTemplate: this.printInfo.templateId,
+        printDeviceId: this.printInfo.printId,
       }).then(res=>{
-        console.log('补打标签返回的数据', res)
+        res.forEach(item=>this.$lwPrint.bluetoothPrint(item.id))
       })
     }
   }

package/src/components/page/receive/putaway/components/lpnBatchItem.vue

@@ -39,9 +39,30 @@
             :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.lpnBatchItem.yeiaxvun','原库位')"
             :value="item.fromLocationCode"
           />
+
+          <div class="lw-global-flex-between lw-global-row">
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.lpnBatchItem.eyfuhbkf','目标库位')"
+              :value="item.toLocationCode"
+              :is-row="false"
+            />
+
+            <lw-button
+              v-if="showReloadLoc"
+              style="flex-shrink: 0"
+              mini
+              round
+              @click.stop="$emit('reloadLoc')"
+            >
+              {{ $lwLanguage.get('','库位重新分配') }}
+            </lw-button>
+          </div>
           <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.lpnBatchItem.eyfuhbkf','目标库位')"
-            :value="item.toLocationCode"
+            v-if="item.secondToLocationCode"
+            :title="$lwLanguage.get('', '二次分配')"
+            :value="item.secondToLocationCode"
+            val-bold
+            val-red
           />
 
           <div class="lw-global-flex-between lw-global-row-end">
@@ -96,7 +117,10 @@ export default {
     item:{
       type: Object,
       default: () => {}
-    }
+    },
+
+    // 是否显示库位重新分配
+    showReloadLoc: Boolean
   },
   data() {
     return {

package/src/components/page/receive/putaway/index/index.vue

@@ -10,7 +10,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
 
         <van-tabs
           type="card"
@@ -89,7 +89,7 @@
           </van-tab>
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/receive/putaway/lpnAction/index.vue

@@ -11,7 +11,7 @@
     <div class="lw-global-page-box">
 
       <!-- tab -->
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           type="card"
           animated
@@ -26,7 +26,7 @@
             :title="i"
           />
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
       <!-- 托盘数据 -->
       <div class="lw-global-model-box" v-if="lpnTaskData">
@@ -42,27 +42,36 @@
         </div>
 
         <!-- 原库位、目标库位 -->
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.receive.putaway.fromLocal', '原库位')"
+          :value="lpnTaskData.fromLocationCode"
+          val-bold
+        />
         <div class="lw-global-row lw-global-flex-between">
 
-          <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.receive.putaway.fromLocal', '原库位') }}
-            </span>
-            <span class="lw-global-value-bold">
-              {{ lpnTaskData.fromLocationCode }}
-            </span>
-          </div>
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位')"
+            :value="lpnTaskData.toLocationCode"
+            val-bold
+            :is-row="false"
+          />
 
-          <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位') }}
-            </span>
-            <span class="lw-global-value-bold">
-              {{ lpnTaskData.toLocationCode }}
-            </span>
-          </div>
+          <lw-button
+            mini
+            round
+            @click="reloadLoc"
+          >
+            {{ $lwLanguage.get('','库位重新分配') }}
+          </lw-button>
 
         </div>
+        <lw-title-value-cell
+          v-if="lpnTaskData.secondToLocationCode"
+          :title="$lwLanguage.get('', '二次分配')"
+          :value="lpnTaskData.secondToLocationCode"
+          val-bold
+          val-red
+        />
 
         <!-- 总数量、行数 -->
         <div class="lw-global-row lw-global-flex-between">
@@ -103,6 +112,7 @@
           :show-abnormal="showSkuAbnormal"
           :location-code="lpnTaskData.fromLocationCode"
           :task-id="lpnTaskData.taskId"
+          :show-loc="false"
           @abnSuccess="tabChange"
         />
 
@@ -183,7 +193,7 @@ import SkuInfo from './../components/SkuInfo/index.vue'
 import CaseInfo from './../components/CaseInfo/index.vue'
 
 import {
-  wmsMobileGetPutawayTaskByWholeLpn,
+  wmsMobileGetPutawayTaskByWholeLpn, wmsMobileSecondAllocatePutawayByWholeLpn,
   wmsMobileSubmitPutawayByWholeLpn
 } from "../../../../../api/receive/putaway";
 
@@ -198,7 +208,7 @@ export default {
     showSkuAbnormal:{
       type: Boolean,
       default: true
-    }
+    },
 
   },
   data() {
@@ -352,6 +362,15 @@ export default {
         )
         history.go(this.backStep)
       })
+    },
+
+    // 库位重新分配
+    async reloadLoc(){
+      await wmsMobileSecondAllocatePutawayByWholeLpn({
+        fromLpn:this.lpnTaskData.lpn
+      })
+
+      this.tabChange()
     }
   }
 }