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

package/src/components/page/outbound/pick/container/index.vue

@@ -0,0 +1,467 @@
+<!--
+  容器拣选
+  @author: 张文
+  @date: 2022-12-26
+-->
+<template>
+  <data-look-and-change
+    ref="dataLookAndChange"
+    type="container"
+    :title="$lwLanguage.get('','执行容器拣选')"
+    :task-index="taskIndex"
+    :pick-data="pickData"
+    :show-bottom-bar="lpn.confirm"
+    :pick-container="lpn.value"
+    :lack-confirm-fn="lackConfirm"
+    :abn-confirm-fn="abnConfirm"
+    :get-data="getData"
+    @pickConfirm="pickConfirm"
+  >
+
+    <!-- 拣选托盘 -->
+    <div
+      style="margin-bottom: 10px;padding: 3px 10px"
+      class="lw-global-model-box"
+    >
+      <lw-input
+        :title="$lwLanguage.get('','拣选托盘')"
+        v-model="lpn.value"
+        :get-focus.sync="lpn.focus"
+        :disabled="lpn.confirm"
+        rule-key="container"
+        :create-rule="$lwScanRule.create('出库 - 容器拣选 - 拣选托盘','LPN')"
+        :show-bottom-border="false"
+        required
+        @confirm="pickLpnClick"
+      >
+        <template #button>
+          <lw-button
+            round
+            mini
+            @click="pickLpnClick"
+          >{{
+              lpn.confirm ?
+                $lwLanguage.get('', '切换') :
+                $lwLanguage.get('', '确定')
+            }}
+          </lw-button>
+        </template>
+      </lw-input>
+    </div>
+
+    <!-- 左右切换滚动到顶部的锚点 -->
+    <div id="tab-top"></div>
+    <lw-tab-box v-if="lpn.confirm && Object.keys(pickData).length">
+      <van-tabs
+        type="card"
+        animated
+        v-model="tabActive"
+        @change="goTop"
+      >
+
+        <!-- 正在拣选 -->
+        <van-tab
+          :title="$lwLanguage.get('','正在拣选')"
+          name="ing"
+        >
+          <div class="lw-global-model-box">
+
+            <container-line :item="nowPickData"/>
+
+            <!-- 拣选库位、待拣量 -->
+            <div class="lw-global-flex-between lw-global-row">
+
+              <lw-title-value-cell
+                :title="$lwLanguage.get('','拣选库位')"
+                :value="nowPickData.fromLocationCode"
+                val-bold
+                :is-row="false"
+              />
+
+              <lw-title-value-cell
+                :title="$lwLanguage.get('','待拣量')"
+                :value="(nowPickData.totalQty || 0) - (nowPickData.pickQty || 0)"
+                val-bold
+                val-red
+                :is-row="false"
+              />
+
+            </div>
+
+            <!-- 库位 -->
+            <lw-input
+              :title="$lwLanguage.get('','拣选库位')"
+              v-model="locationCode.value"
+              :get-focus.sync="locationCode.focus"
+              required
+              rule-key="location"
+              :create-rule="$lwScanRule.create('容器拣选-库位','LOCATION')"
+              @confirm="locationCodeConfirm"
+            />
+
+            <!-- 容器号 -->
+            <lw-input
+              :title="$lwLanguage.get('','容器号')"
+              v-model="containerCode.value"
+              :get-focus.sync="containerCode.focus"
+              required
+              rule-key="container"
+              :create-rule="$lwScanRule.create('容器拣选-容器号','CONTAINER')"
+              auto-clear-val
+              @confirm="containerCodeConfirm"
+            />
+
+            <lw-scan-data-list-module
+              class="lw-global-row"
+              :title="$lwLanguage.get('','扫描统计')"
+              v-model="containerList"
+              :row-title="$lwLanguage.get('','容器号')"
+            />
+
+            <lw-cut-card
+              v-model="taskIndex"
+              :length="pickData.pendingPickLineList.length"
+              :cut-start="cutStart"
+              :cut-end="cutEnd"
+            />
+
+          </div>
+
+        </van-tab>
+
+        <!-- 拣选明细行 -->
+        <van-tab
+          :title="$lwLanguage.get('','拣选明细行')"
+          name="wait"
+        >
+
+          <div
+            v-for="(i,k) in pickData.allLineList"
+            :key="k"
+            :class="[
+              'lw-global-model-box',
+              'lw-global-animation-out',
+              i.pickStatus !== '300' ? 'lw-global-click-style' : ''
+              ]"
+            :style="{
+              animationDelay: 50 * k + 'ms',
+              background: i.pickStatus === '300' ? '#ddd' : ''
+            }"
+            @click="allPickClick(i)"
+          >
+            <container-line
+              :item="i"
+              show-loc
+            />
+          </div>
+
+
+        </van-tab>
+
+      </van-tabs>
+    </lw-tab-box>
+
+
+    <!-- 切换拣选托盘号弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('','切换托盘')"
+      v-model="lpn.popup.show"
+      @closed="lpn.popup.value=''"
+    >
+
+      <lw-input
+        :title="$lwLanguage.get('','新托盘')"
+        v-model="lpn.popup.value"
+        :get-focus.sync="lpn.popup.focus"
+        rule-key="cutContainer"
+        :create-rule="$lwScanRule.create('出库 - 容器拣选 - 切换拣选托盘','LPN')"
+        @confirm="pickLpnConfirm"
+      />
+
+      <template #button>
+        <lw-button @click="pickLpnConfirm">
+          {{ $lwLanguage.get('', '切换容器') }}
+        </lw-button>
+      </template>
+
+    </lw-popup>
+  </data-look-and-change>
+</template>
+
+<script>
+import dataLookAndChange from './../components/dataLookAndChange/index.vue'
+import containerLine from "../components/containerLine.vue";
+import {all} from "../mixin/all";
+import {
+  projectWmsOutboundContainerPickAbnormal, projectWmsOutboundContainerPickCheckSn,
+  projectWmsOutboundContainerPickOrderQueryInfo,
+  projectWmsOutboundContainerPickStockout, projectWmsOutboundContainerPickSubmit
+} from "../../../../../api/outbound/pick/container";
+import {Language} from "../../../../../utils/Language";
+
+export default {
+  name: "lwOutboundPickContainerActionPage",
+  components: {
+    dataLookAndChange,
+    containerLine,
+  },
+  mixins: [all],
+  data() {
+    return {
+      // 当前任务索引
+      taskIndex: 0,
+
+      // 拣选数据
+      pickData: {},
+
+      // tab激活项
+      tabActive: 'ing',
+
+      // 绑定的容器号
+      lpn: {
+        value: '',
+        focus: true,
+        confirm: false,
+        popup: {
+          value: '',
+          focus: false,
+          show: false
+        }
+      },
+
+      // 拣选库位
+      locationCode: {
+        value: '',
+        focus: false
+      },
+      // 拣选库位
+      containerCode: {
+        value: '',
+        focus: false
+      },
+      // 扫描的容器列表
+      containerList: []
+    }
+  },
+  computed: {
+    // 当前拣选数据
+    nowPickData() {
+      const list = this.pickData.pendingPickLineList
+      return list ? list[this.taskIndex] : {}
+    },
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+
+    // 获取数据
+    getData() {
+      this.checkTaskIndex(this.pickData.pendingPickLineList?.length || 0)
+      projectWmsOutboundContainerPickOrderQueryInfo({
+        pickId: this.$route.query.lwPickId
+      }).then(res => {
+        this.pickData = res
+        this.checkTaskIndex(this.pickData.pendingPickLineList.length)
+      }).catch(() => history.go(-1))
+    },
+
+    // 确认、切换拣选托盘
+    pickLpnClick() {
+
+      if (this.lpn.confirm) {
+        this.lpn.popup.value = this.lpn.value
+        this.lpn.popup.show = true
+        this.lpn.popup.focus = true
+        return
+      }
+
+      if (!this.lpn.value){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','拣选托盘不能为空')
+        )
+        return
+      }
+      this.lpn.confirm = true
+
+    },
+    // 弹框确认切换托盘
+    pickLpnConfirm() {
+
+      if (this.lpn.popup.value) {
+        this.lpn.value = this.lpn.popup.value
+        this.lpn.popup.show = false
+        return
+      }
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('', '拣选托盘不能为空')
+      )
+    },
+
+    // 拣选库位确认
+    locationCodeConfirm() {
+      if (this.locationCodeCheck()) this.containerCode.focus = true
+    },
+    // 检查拣选库位
+    locationCodeCheck() {
+
+      return this.inputCheck({
+        key: 'locationCode',
+        checkVal: this.nowPickData.fromLocationCode,
+      })
+    },
+
+    // 容器号扫描完成
+    containerCodeConfirm(val, {data}) {
+
+      if (!data.key || !this.locationCodeCheck()) return
+
+      this.containerCode.focus = false
+      projectWmsOutboundContainerPickCheckSn({
+        skuId: this.nowPickData.skuId,
+        container: data.key
+      }).then(res => {
+        this.containerList.push({
+          sn: res.container,
+          qty: Number(res.qty || 1)
+        })
+        this.containerCode.focus = true
+
+        const waitQty = (this.nowPickData.totalQty || 0) - (this.nowPickData.pickQty || 0)
+        if (this.containerList.reduce((t,n)=>{return t+n.qty},0) === waitQty){
+          this.pickConfirm()
+        }
+
+      }).catch(err => {
+        this.containerCode.focus = true
+        this.$lwShowErrorMsg({
+          message: err.data && err.data.message ?
+            err.data.message :
+            Language.get('', '未知错误（可能是系统正在升级或异常）请稍后再试')
+        })
+      })
+    },
+
+    // 任务行切换前
+    cutStart() {
+
+      return new Promise((res, err) => {
+
+        if (
+          this.containerList.length ||
+          ['locationCode', 'containerCode'].some(item => !!this[item].value)
+        ) {
+          this.$lwDialog.confirm({
+            title: this.$lwLanguage.get('','警告'),
+            message: this.$lwLanguage.get('','切换后当前输入数据将会被清空')
+          }).then(() => res()).catch(() => err('用户取消'))
+          return
+        }
+
+        res()
+      })
+
+    },
+    // 任务行切换后
+    cutEnd() {
+      this.clearInputVal(
+        ['locationCode', 'containerCode'],
+      )
+      this.locationCode.focus = true
+      this.containerList = []
+    },
+
+
+    // 拣选明细行点击未拣选行
+    allPickClick(item) {
+      if (item.pickStatus === '300') return
+
+      const wait = this.pickData.pendingPickLineList
+      for (let i = 0; i < wait.length; i++) {
+        if (wait[i].lineGroupKey === item.lineGroupKey) {
+          this.taskIndex = i
+          this.tabActive = 'ing'
+          this.cutEnd()
+          return;
+        }
+      }
+    },
+
+
+    // 确认缺货
+    lackConfirm(data) {
+      const item = this.nowPickData
+      return projectWmsOutboundContainerPickStockout({
+        pickId: this.pickData.pickId,
+        pickNo: this.pickData.pickNo,
+        fromLocationId: item.fromLocationId,
+        fromLpn: item.fromLpn,
+        ownerId: data.ownerId,
+        skuId: data.skuId,
+        stockoutQty: data.lackQty,
+        lineGroupKey: item.lineGroupKey,
+      })
+    },
+
+    // 确认异常
+    abnConfirm(data) {
+      const item = this.nowPickData
+      return projectWmsOutboundContainerPickAbnormal({
+        pickId: this.pickData.pickId,
+        pickNo: this.pickData.pickNo,
+        fromLocationId: item.fromLocationId,
+        fromLpn: item.fromLpn,
+        fromCase: item.fromCase,
+        ownerId: data.ownerId,
+        skuId: data.skuId,
+        lineGroupKey: item.lineGroupKey,
+        ...data.data
+      })
+    },
+
+    // 确认拣选
+    async pickConfirm() {
+
+      if (!this.containerList.length) {
+        this.containerCode.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '请扫描或输入需要拣选的容器号')
+        )
+        return
+      }
+      const res = await projectWmsOutboundContainerPickSubmit({
+        pickId: this.pickData.pickId,
+        skuId: this.nowPickData.skuId,
+        fromLocationId: this.nowPickData.fromLocationId,
+        pickContainerNo: this.lpn.value,
+        containers: this.containerList.map(item => item.sn)
+      })
+
+      this.$lwToast.success(
+        this.$lwLanguage.get('','拣选成功')
+      )
+
+      // 判断是否需要打印箱票
+      try {
+        await this.$refs.dataLookAndChange.print(res)
+      } catch (e) {
+        console.warn('独立件打印箱票失败：', e)
+      }
+
+      // 判断当前拣选任务是否完成
+      if (res.pickOrderFinish) {
+        this.$refs.dataLookAndChange.openPickSuccessPopup()
+        return
+      }
+
+      this.cutEnd()
+      this.pickData = res.pickTaskData
+      this.checkTaskIndex(this.pickData.pendingPickLineList.length)
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -127,7 +127,7 @@
       <lw-data-look-bg>
 
         <div>
-          <div>{{ taskData.pickData.receiveTaskCount }}</div>
+          <div>{{ taskData.pickData.receiveLineCount }}</div>
           <div>
             {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.lmpwxfwy','接收行') }}
           </div>
@@ -243,6 +243,28 @@
 
       </div>
 
+      <!-- 客户信息 -->
+      <div
+        v-if="taskData.pickTask && Object.keys(taskData.pickTask).length && taskData.pickTask.customerCode"
+        class="lw-global-model-box"
+      >
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','客户编码')"
+          :value="taskData.pickTask.customerCode"
+          val-bold
+          is-row-start
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','客户名称')"
+          :value="taskData.pickTask.customerName"
+          val-bold
+          is-row-end
+        />
+
+      </div>
+
     </div>
 
     <!-- 底部按钮应当在用户上线且有任务时才显示 -->
@@ -551,6 +573,15 @@ export default {
         return
       }
 
+      // 容器
+      if (data.pickSKuType === 'CONTAINER'){
+        this.$router[jumpType]({
+          path: '/outbound/pick/lwContainerAction',
+          query
+        })
+        return
+      }
+
       // 独立件
       if (data.pickPackType === 'ALONE'){
         this.$router[jumpType]({

package/src/components/page/outbound/pick/lpn/index.vue

@@ -18,7 +18,7 @@
   >
     <!-- 左右切换滚动到顶部的锚点 -->
     <div id="tab-top"></div>
-    <div class="lw-global-tab-box">
+    <lw-tab-box>
       <van-tabs
         type="card"
         animated
@@ -134,7 +134,7 @@
 
         </van-tab>
       </van-tabs>
-    </div>
+    </lw-tab-box>
   </data-look-and-change>
 </template>
 
@@ -296,12 +296,10 @@ export default {
       })
 
       // 判断是否需要打印箱票
-      if(res.needPrintBox){
-        try {
-          await this.$refs.dataLookAndChange.print(res)
-        }catch (e) {
-          console.warn('独立件打印箱票失败：', e)
-        }
+      try {
+        await this.$refs.dataLookAndChange.print(res)
+      }catch (e) {
+        console.warn('独立件打印箱票失败：', e)
       }
 
       this.$lwToast.success(
@@ -310,7 +308,7 @@ export default {
 
       // 拣选完了就不要覆盖数据，会导致页面没有数据而崩溃
       if (res.pickOrderFinish){
-        this.$refs.dataLookAndChange.openPickSuccessPopup()
+        this.$refs.dataLookAndChange.openPickSuccessPopup(res)
         return
       }
 

package/src/components/page/outbound/pick/notAlone/index.vue

@@ -28,6 +28,7 @@
         :get-focus.sync="container.focus"
         :disabled="container.confirm"
         rule-key="container"
+        required
         @confirm="containerBtnClick"
       >
         <template #button>
@@ -47,7 +48,7 @@
     <!-- 左右切换滚动到顶部的锚点 -->
     <template v-if="container.confirm">
       <div id="tab-top"></div>
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           type="card"
           animated
@@ -207,7 +208,7 @@
           </van-tab>
 
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </template>
 
 
@@ -660,12 +661,10 @@ export default {
       this.sn.list = []
 
       // 判断是否需要打印箱票
-      if(res.needPrintBox){
-        try {
-          await this.$refs.dataLookAndChange.print(res)
-        }catch (e) {
-          console.warn('独立件打印箱票失败：', e)
-        }
+      try {
+        await this.$refs.dataLookAndChange.print(res)
+      }catch (e) {
+        console.warn('独立件打印箱票失败：', e)
       }
 
       this.splitPopup.data = res

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

@@ -64,10 +64,7 @@
       </template>
 
       <!-- 执行拣选tab -->
-      <div
-        v-if="!needContainer"
-        class="lw-global-tab-box"
-      >
+      <lw-tab-box v-if="!needContainer">
 
         <van-tabs
           type="card"
@@ -274,7 +271,7 @@
         </van-tabs>
 
 
-      </div>
+      </lw-tab-box>
 
     </div>
 
@@ -1262,6 +1259,7 @@ export default {
         this.changeSuccessGetData(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.uzpvcags','异常上报成功')
         )
+        this.$refs.abnormal.printLabel()
         this.abnPopup.show = false
       })
     },

package/src/components/page/outbound/pickContainerSearch/action/index.js

@@ -0,0 +1,11 @@
+/*
+* 拣选容器查询 - 执行页
+* @author: 张文
+* @date  2022-07-09
+* */
+
+import lwOutboundPickContainerSearchActionPage from "./index.vue";
+
+lwOutboundPickContainerSearchActionPage.install = Vue => Vue.component(lwOutboundPickContainerSearchActionPage.name, lwOutboundPickContainerSearchActionPage)
+
+export default lwOutboundPickContainerSearchActionPage

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

@@ -80,7 +80,7 @@
 
       </div>
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           type="card"
           animated
@@ -154,7 +154,7 @@
 
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 
@@ -172,7 +172,7 @@
 import {projectWmsOutboundContainerInfo} from "../../../../../api/outbound/pick";
 
 export default {
-  name: "lwOutboundPickContainerActionPage",
+  name: "lwOutboundPickContainerSearchActionPage",
   data() {
     return {
       // 容器数据
@@ -203,7 +203,7 @@ export default {
 
     goBack() {
       this.$router.replace({
-        path: '/outbound/pickContainer/lwIndex'
+        path: '/outbound/pickContainerSearch/lwIndex'
       })
     }
   }

package/src/components/page/outbound/pickContainerSearch/index/index.js

@@ -0,0 +1,11 @@
+/*
+* 拣选容器查询 - 起始页
+* @author: 张文
+* @date  2022-07-09
+* */
+
+import lwOutboundPickContainerSearchIndexPage from "./index.vue";
+
+lwOutboundPickContainerSearchIndexPage.install = Vue => Vue.component(lwOutboundPickContainerSearchIndexPage.name, lwOutboundPickContainerSearchIndexPage)
+
+export default lwOutboundPickContainerSearchIndexPage