@logwire/logwire-wms-pda-ui 3.3.4 → 3.4.0

package/src/views/wms/page/outbound/assignLpnPick/action.vue

@@ -0,0 +1,417 @@
+<!--
+  指定整托拣选 - 执行
+  @author: 张文
+  @date: 2023-06-05
+-->
+<template>
+  <div>
+
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.irmkxdij','指定整托拣选')"/>
+
+    <lw-page-body-module>
+
+      <order-head-data
+        :order-data="orderData"
+        hidden-wait-pick-row
+        edit-path="/outbound/assignLpnPick/lwCreateOrder"
+      />
+
+      <!-- 拣选tab页 -->
+      <lw-tab-box style="margin-top: 10px">
+        <van-tabs
+          type="card"
+          animated
+          v-model="tabActive"
+        >
+
+          <template v-if="showWait && tabShowType">
+
+            <!-- 正在拣选 -->
+            <van-tab
+              name="ing"
+              :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.tnzcvvzf','正在拣选')"
+            >
+
+              <div class="lw-global-model-box" style="padding-bottom: 3px">
+
+                <div class="lw-global-flex-between lw-global-row-start">
+
+                  <div class="lw-global-title">
+                    {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.cceacjjx','整托拣选') }}
+                  </div>
+
+                  <van-switch
+                    v-model="isLpnPick"
+                    size="18px"
+                    @change="isLpnPickChange"
+                  />
+
+                </div>
+
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.vohtroej','外托号')"
+                  v-model="extLpn.value"
+                  :get-focus.sync="extLpn.focus"
+                  :create-rule="$lwScanRule.create('指定整托拣选-执行拣选-外托号','LPN')"
+                  rule-key="extLpn"
+                  required
+                  @confirm="extLpnConfirm"
+                />
+
+                <lw-input
+                  :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.krrbydfu','托盘号')"
+                  v-model="lpn.value"
+                  :get-focus.sync="lpn.focus"
+                  :create-rule="$lwScanRule.create('指定整托拣选-执行拣选-外托号','LPN')"
+                  rule-key="lpn"
+                  required
+                  :show-bottom-border="false"
+                  :disabled="lpn.disabled"
+                  need-show-clear
+                  @confirm="lpnConfirm"
+                  @clear="lpnClear"
+                />
+
+              </div>
+
+              <!-- 非整托拣选显示的数据 -->
+              <div
+                v-if="lpn.disabled"
+                class="lw-global-model-box lw-global-row-box"
+              >
+
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.krrbydfu','托盘号')"
+                  :value="lpnPickData.lpn"
+                  val-bold
+                  :is-row="false"
+                />
+
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.gsqnqgbe','拣货库位')"
+                  :value="lpnPickData.locCode"
+                  val-bold
+                  :is-row="false"
+                />
+
+                <lw-title-value-cell
+                  :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.cgyziyde','数量')"
+                  :value="lpnPickData.qty"
+                  val-bold
+                  val-red
+                  :is-row="false"
+                />
+
+                <div class="lw-global-bottom-border"></div>
+
+                <div
+                  v-for="i in lpnPickData.skuList"
+                  :key="i.skuId"
+                >
+
+                  <div class="lw-global-flex-between">
+
+                    <div>
+                      <span class="lw-global-value-bold">{{ i.skuCode }}</span>
+                      <span> - </span>
+                      <span class="lw-global-title">{{ i.skuName }}</span>
+                    </div>
+
+
+                    <lw-title-value-cell
+                      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.imbemfmh','商品数')"
+                      :value="i.skuQty"
+                      val-bold
+                      val-red
+                      :is-row="false"
+                    />
+
+                  </div>
+
+
+                  <lw-input
+                    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.hopmgogq','拣选数')"
+                    v-model="i.qty"
+                    type="digit"
+                  />
+
+                </div>
+
+              </div>
+
+            </van-tab>
+
+            <!-- 商品明细 -->
+            <van-tab
+              name="wait"
+              :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.uplvdrkm','商品明细')"
+            >
+              <div
+                class="lw-global-model-box lw-global-row-box"
+                v-for="i in orderData.skuList"
+                :key="i.skuId"
+              >
+
+                <div>
+                  <span class="lw-global-value-bold">{{ i.skuCode }}</span>
+                  <span> - </span>
+                  <span class="lw-global-title">{{ i.skuName }}</span>
+                </div>
+
+                <div class="lw-global-flex-between">
+
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.onycdciw','计划量')"
+                    :value="i.totalQty"
+                    :is-row="false"
+                  />
+
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.fooptjsy','待拣量')"
+                    :value="i.waitPickQty"
+                    :is-row="false"
+                    val-bold
+                  />
+
+                </div>
+
+              </div>
+              <lw-not-data v-if="!orderData.skuList.length"/>
+            </van-tab>
+
+          </template>
+
+          <!-- 已拣明细 -->
+          <van-tab
+            name="over"
+            :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.qqxkpknu','已拣明细')"
+          >
+
+            <wait-over-task-item
+              v-for="(i,k) in orderData.pickedList"
+              :key="k"
+              :item="i"
+              type="over"
+              :show-back="showWait"
+              @backSuccess="init()"
+            />
+            <lw-not-data v-if="!orderData.pickedList.length"/>
+          </van-tab>
+        </van-tabs>
+      </lw-tab-box>
+
+
+    </lw-page-body-module>
+
+    <lw-bottom-bar v-if="tabActive==='ing'">
+
+      <lw-button @click="submitConfirm">
+        {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.efeuodwm','确认拣选') }}
+      </lw-button>
+
+    </lw-bottom-bar>
+
+  </div>
+</template>
+
+<script>
+import orderHeadData from "./../../../components/consoleAndPick/orderHeadData.vue";
+import waitOverTaskItem from "./../../../components/consoleAndPick/waitOverTaskItem.vue";
+import {
+  projectWmsOutboundPDASoAppointLpnQuery,
+  projectWmsOutboundPDASoAppointLpnSkuPick,
+  projectWmsOutboundPDASoAppointLpnWholePick,
+  projectWmsOutboundPDASoLoadAppointPickData
+} from "../../../api/outbound/assignLpnPick";
+
+export default {
+  name: "lwOutboundAssignLpnPickAction",
+  components: {
+    orderHeadData,
+    waitOverTaskItem,
+  },
+  data() {
+    return {
+      orderData: {
+        currentPickList: [],
+        pendingList: [],
+        pickedList: [],
+        totalQty: 0,
+        pickQty: 0,
+      },
+
+      tabActive: 'ing',
+
+      // 是否是整托拣选
+      isLpnPick: true,
+
+      // 外托号
+      extLpn: {
+        value: '',
+        focus: false
+      },
+      // 托盘号
+      lpn: {
+        value: '',
+        focus: false,
+        disabled: false
+      },
+      // 非整托拣选数据
+      lpnPickData: {}
+    }
+  },
+  computed: {
+    nowPickData() {
+      return this.orderData.currentPickList[this.nowPickIndex] || {}
+    },
+    // 显示拣货中和带拣货
+    showWait() {
+      const {billStatus} = this.orderData
+      return billStatus !== '550' && billStatus !== '600'
+    },
+    tabShowType() {
+      const {totalQty, pickQty} = this.orderData
+      const t = Number(totalQty || 0) - Number(pickQty || 0)
+      return !!t
+    },
+  },
+  watch: {
+    tabShowType: {
+      handler(n) {
+        this.$nextTick(() => {
+          this.tabActive = n ? 'ing' : 'over'
+          this.$nextTick(() => {
+            if (this.tabActive === 'ing') this.extLpn.focus = true
+          })
+        })
+      }
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      projectWmsOutboundPDASoLoadAppointPickData({
+        soId: this.$route.query.lwOrderId
+      }).then(res => {
+        this.orderData = res
+      }).catch(() => history.go(-1))
+    },
+
+    // 是否是整托盘拣选改变
+    isLpnPickChange() {
+      if (this.isLpnPick) this.lpnClear()
+    },
+
+    // 外托号、托号 - 校验
+    lpnCheck(key) {
+      if (this[key].value) return true
+
+      this[key].focus = true
+      const msg = key === 'lpn' ?
+        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.tfctsshj','托盘号不能为空') :
+        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.rnldvebp','外托号不能为空')
+
+      this.$lwShowErrorMsg(msg)
+      return false
+    },
+    // 外托号 - 确认
+    extLpnConfirm() {
+      if (this.lpnCheck('extLpn')) this.lpn.focus = true
+    },
+    // 托盘号 - 确认
+    lpnConfirm() {
+      if (!this.lpnCheck('lpn')) return
+
+      if (this.isLpnPick) return this.submitConfirm()
+
+      projectWmsOutboundPDASoAppointLpnQuery({
+        soId: this.$route.query.lwOrderId,
+        actualLpn: this.lpn.value
+      }).then(res => {
+        res.skuList = res.skuList.map(item => {
+          item.qty = item.skuQty
+          item.focus = false
+          return item
+        })
+        this.lpnPickData = res
+        this.lpn.disabled = true
+      })
+    },
+    // 托盘号 - 清除
+    lpnClear() {
+      this.lpn.disabled = false
+      this.lpnPickData = {}
+    },
+
+    // 非整托拣选时的数据校验
+    notLpnPickCheck() {
+
+      let sum = 0
+      for (const i of this.lpnPickData.skuList) {
+        const num = Number(i.qty || 0)
+        if (num > Number(i.skuQty)) {
+          i.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.vfvnwgsu','商品{sku}拣选数不能大于实际数', {sku: i.skuCode})
+          )
+          return false
+        }
+        sum += num
+      }
+
+      if (sum === 0) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.mheysjme','托盘拣选总量应当是大于0的正整数')
+        )
+        return false
+      }
+
+      return true
+
+    },
+    // 数据提交
+    submitConfirm() {
+      if (!this.lpnCheck('extLpn') || !this.lpnCheck('lpn')) return
+
+      if (!this.isLpnPick) {
+        if (!Object.keys(this.lpnPickData).length) return this.lpnConfirm()
+        if (!this.notLpnPickCheck()) return
+      }
+
+      const api = this.isLpnPick ?
+        projectWmsOutboundPDASoAppointLpnWholePick :
+        projectWmsOutboundPDASoAppointLpnSkuPick
+
+      api({
+        soId: this.$route.query.lwOrderId,
+        actualLpn: this.lpn.value,
+        extLpn: this.extLpn.value,
+        skuList: !this.isLpnPick ? this.lpnPickData.skuList.map(item => {
+          return {
+            skuId: item.skuId,
+            skuQty: item.qty || 0
+          }
+        }) : []
+      }).then(res => {
+        this.orderData = res
+        this.$lwToast.success(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.action.ibqeyvit','拣选成功')
+        )
+        this.lpnClear()
+        this.isLpnPick = true
+        this.extLpn.value = ''
+        this.extLpn.focus = true
+        this.lpn.value = ''
+      })
+
+    },
+
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/assignLpnPick/createOrder.vue

@@ -0,0 +1,30 @@
+<!--
+  指定整托拣选 - 创建、编辑订单
+  @author: 张文
+  @date: 2023-06-05
+-->
+<template>
+  <create-order-page
+    action-path="/outbound/assignLpnPick/lwAction"
+  >
+  </create-order-page>
+</template>
+
+<script>
+
+import createOrderPage from "./../../../components/consoleAndPick/createOrderPage.vue";
+
+export default {
+  name: "lwOutboundAssignLpnPickCreateOrder",
+  components: {
+    createOrderPage
+  },
+  data() {
+    return {}
+  },
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/assignLpnPick/index.js

@@ -0,0 +1,22 @@
+/*
+* 指定整托拣选
+* @author: 张文
+* @date  2023-06-05
+* */
+
+import lwOutboundAssignLpnPackIndex from "./index.vue";
+import lwOutboundAssignLpnPickCreateOrder from "./createOrder.vue";
+import lwOutboundAssignLpnPickAction from "./action.vue";
+
+
+const components = [
+  lwOutboundAssignLpnPackIndex,
+  lwOutboundAssignLpnPickCreateOrder,
+  lwOutboundAssignLpnPickAction,
+]
+
+
+components.forEach(item => item.install = Vue => Vue.component(item.name, item))
+
+
+export default components

package/src/views/wms/page/outbound/assignLpnPick/index.vue

@@ -0,0 +1,34 @@
+<!--
+  指定整托拣选 - 起始页
+  @author: 张文
+  @date: 2023-06-05
+-->
+<template>
+  <index-page
+    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.assignLpnPick.index.fwfwjnjw','指定整托拣选')"
+    now-path="/outbound/assignLpnPick/lwIndex"
+    action-path="/outbound/assignLpnPick/lwAction"
+    create-path="/outbound/assignLpnPick/lwCreateOrder"
+  >
+  </index-page>
+</template>
+
+<script>
+
+import indexPage from "./../../../components/consoleAndPick/indexPage.vue";
+
+export default {
+  name: "lwOutboundAssignLpnPackIndex",
+  components: {
+    indexPage
+  },
+  data() {
+    return {}
+  },
+
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/bale/checkBale/action/index.vue

@@ -594,9 +594,14 @@ export default {
         }).then(res=>{
 
           this.formatData(res)
-          if (res.packContainer && res.packContainer.blockStatus === '200') this.allBlockShow = true
 
-          first ? this.actionCheck.sku.focus = true : ''
+          const packContainer = res.packContainer
+          if (packContainer && packContainer.blockStatus === '200') {
+            this.mixinCheckBlock({containerBlockData: res.packContainer})
+          } else {
+            first ? this.actionCheck.sku.focus = true : ''
+          }
+
           PR()
         }).catch(()=>{
           PE()
@@ -1014,7 +1019,7 @@ export default {
 
         await this.$lwPrint.bluetoothPrint({taskId:res.id})
       }catch (e) {
-        console.log(e)
+        console.log('打印失败：', e)
       }
     }
   }

package/src/views/wms/page/outbound/block/index.js

@@ -1,11 +1,13 @@
 import LwOutboundBlockBoxListPage from './LwOutboundBlockBoxListPage.vue'
 import LwOutboundBlockExecutePage from './LwOutboundBlockExecutePage.vue'
 
-LwOutboundBlockBoxListPage.install = Vue => Vue.component(LwOutboundBlockBoxListPage.name, LwOutboundBlockBoxListPage)
-LwOutboundBlockExecutePage.install = Vue => Vue.component(LwOutboundBlockExecutePage.name, LwOutboundBlockExecutePage)
-
-
-export default  [
+const page = [
   LwOutboundBlockBoxListPage,
   LwOutboundBlockExecutePage,
 ]
+
+export default page.map(item => {
+
+  item.install = Vue => Vue.component(item.name, item)
+  return item
+})