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

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

@@ -0,0 +1,257 @@
+<!--
+  拣选分货 - 起始页
+  @author: 张文
+  @date: 2023-06-15
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.nrlnmria', '拣选分货')"/>
+
+    <lw-page-body-module>
+
+      <div class="lw-global-model-box">
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.qklmynxb', '拣选容器号')"
+          :value="containerData.container"
+          is-row-start
+          val-bold
+          text-align="right"
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.hsbygmbk', '待分拣总量')"
+          :value="waitSortQty"
+          val-bold
+          val-red
+          text-align="right"
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.qzwwvbnu', '待分拣组数')"
+          :value="containerData.items.length + $lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.jlpzflza', ' 组')"
+          is-row-end
+          val-bold
+          val-red
+          text-align="right"
+        />
+
+      </div>
+
+      <div
+        class="lw-global-model-box"
+        v-for="(i,k) in containerData.items"
+        :key="k"
+      >
+
+        <div class="lw-global-flex-start lw-global-row-start">
+
+          <div class="lw-global-flex-center index">{{ $lwCheckVal(i.serial) }}</div>
+
+          <div
+            style="flex: 1"
+            class="lw-global-flex-between"
+          >
+
+            <div style="flex: 1">
+
+              <lw-title-value-cell
+                v-for="(item,index) in i.labelValues"
+                :key="'label'+index"
+                :title="item.label"
+                :value="item.value"
+                :is-row="false"
+                val-bold
+              />
+            </div>
+
+            <lw-button
+              style="flex-shrink: 0"
+              mini
+              @click="overSort(i.pickLineIdList)"
+            >
+              {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.ojjzhcnv', '完成分货') }}
+            </lw-button>
+
+          </div>
+
+        </div>
+
+        <div
+          v-for="(item,key) in i.skuList"
+          :key="'sku'+key"
+          :class="[
+            'lw-global-flex-between',
+            (key+1) === i.skuList.length ? 'lw-global-row-end' : 'lw-global-row'
+          ]"
+        >
+
+          <div>
+            <div class="lw-global-value-bold">{{ item.skuCode }}</div>
+            <div class="lw-global-title">{{ item.skuName }}</div>
+          </div>
+
+          <div style="text-align: center">
+            <div class="lw-global-value-bold-red">{{ skuQty(item) }}</div>
+            <div class="lw-global-title">{{ $lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.ceqflewl', '待分货') }}</div>
+          </div>
+
+        </div>
+
+      </div>
+
+    </lw-page-body-module>
+
+    <lw-bottom-bar>
+
+      <lw-button
+        type="last"
+        plain
+        @click="goBack"
+      >
+        {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.sstgxgbd', '返回') }}
+      </lw-button>
+
+      <lw-button @click="allOverSort">
+        {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.yolyfwio', '全部完成分货') }}
+      </lw-button>
+
+    </lw-bottom-bar>
+
+  </div>
+</template>
+
+<script>
+import {
+  projectWmsOutboundContainerDistribute,
+  projectWmsOutboundContainerQueryDistributeData
+} from './../../../api/outbound/pick/sort'
+
+export default {
+  name: "lwOutboundSortAction",
+  data() {
+    return {
+      containerData: {
+        items: []
+      },
+    }
+  },
+  computed: {
+    // 待分货量
+    waitSortQty() {
+      const {distributedQty = 0, total = 0, caseCount, fragSkuCount, caseUomLabel, eaUomLabel} = this.containerData
+
+      let str = ''
+      if (caseCount) {
+        str += caseCount + this.$lwCheckVal(caseUomLabel, '')
+        if (fragSkuCount) str += fragSkuCount + this.$lwCheckVal(eaUomLabel, '')
+      }
+
+      return total - distributedQty + (str ? ` (${str}) ` : '')
+    }
+  },
+  mounted() {
+    this.getSortData()
+  },
+  methods: {
+    // 分拣完成提示框及返回
+    successSort() {
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.ojjzhcnv', '分货完成')
+      )
+      this.goBack()
+    },
+
+    // 获取待分货数据
+    getSortData() {
+      projectWmsOutboundContainerQueryDistributeData({
+        container: this.$route.query.lwContainer
+      }).then(res => {
+        this.containerData = res
+        const items = this.containerData.items
+        if (!items || !items.length) this.successSort()
+      }).catch(this.goBack)
+    },
+
+    // 商品数量
+    skuQty({qty, caseCount, fragSkuCount} = {}) {
+      const {eaUomLabel, caseUomLabel} = this.containerData
+      let str = ''
+      if (caseCount) {
+        str += caseCount + this.$lwCheckVal(caseUomLabel, '')
+        if (fragSkuCount) str += fragSkuCount + this.$lwCheckVal(eaUomLabel, '')
+      }
+      return qty + (str ? ` (${str}) ` : '')
+    },
+
+    // 完成分货
+    overSort(list) {
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.fdtuulvc', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.cbsskmhc', '确认完成当前分货?'),
+      }).then(() => this.submitSort(list)).catch(() => {
+      })
+
+    },
+
+    // 全部完成分货
+    allOverSort() {
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.fdtuulvc', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.gcaidpje', '确认全部完成分货?'),
+      }).then(() => {
+        let list = []
+        this.containerData.items.forEach(item => {
+          list = list.concat(item.pickLineIdList)
+        })
+        this.submitSort(list)
+      }).catch(() => {
+      })
+
+    },
+
+    // 执行分拣
+    submitSort(list) {
+      projectWmsOutboundContainerDistribute({
+        pickId: this.containerData.pickId,
+        pickLineIdList: list,
+        container: this.$route.query.lwContainer
+      }).then(res => {
+
+        if (res.finished) {
+          this.successSort()
+          return
+        }
+
+        this.$lwToast.success(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.action.bmrgrnix', '操作成功')
+        )
+        this.getSortData()
+
+      })
+    },
+
+    // 返回
+    goBack() {
+      history.go(-1)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import "./../../../../../assets/css/var.less";
+
+
+.index {
+  font-size: 20px;
+  margin-right: 5px;
+  width: 25px;
+  text-align: center;
+  font-weight: bold;
+  color: @baseColor;
+  border: solid 1px @baseColor;
+  border-radius: 4px;
+}
+
+</style>

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

@@ -0,0 +1,21 @@
+/*
+* 拣选分货 - 起始页
+* @author: 张文
+* @date  2023-06-15
+* */
+
+
+import lwOutboundSortIndex from "./index.vue";
+import lwOutboundSortAction from "./action.vue";
+
+
+const page = [
+  lwOutboundSortIndex,
+  lwOutboundSortAction,
+]
+
+
+export default page.map(item => {
+  item.install = Vue => Vue.component(item.name, item)
+  return item
+})

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

@@ -0,0 +1,102 @@
+<!--
+  拣选分货 - 起始页
+  @author: 张文
+  @date: 2023-06-15
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.index.nwfladbs', '拣选分货')"/>
+
+    <lw-page-body-module>
+
+      <div class="lw-global-model-box lw-global-model-box-3px">
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.index.jtzhylbg', '拣选容器号')"
+          v-model="container.value"
+          :get-focus.sync="container.focus"
+          :show-bottom-border="false"
+          rule-key="container"
+          :create-rule="$lwScanRule.create('拣选分货 - 起始页 - 拣选容器号','CONTAINER')"
+          @confirm="searchContainer"
+        >
+
+          <template #button>
+            <lw-button
+              round
+              mini
+              @click="searchContainer"
+            >
+              {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.sort.index.lttkxchp', '查询') }}
+            </lw-button>
+          </template>
+
+        </lw-input>
+
+      </div>
+
+    </lw-page-body-module>
+  </div>
+</template>
+
+<script>
+
+import {projectWmsOutboundContainerQueryDistributeData} from "./../../../api/outbound/pick/sort";
+
+export default {
+  name: "lwOutboundSortIndex",
+  data() {
+    return {
+      container: {
+        value: '',
+        focus: true
+      }
+    }
+  },
+  methods: {
+    searchContainer() {
+      const container = this.container.value
+      if (!container) {
+        this.container.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.index.wcsloihv', '拣选容器号不能为空')
+        )
+        return
+      }
+
+      projectWmsOutboundContainerQueryDistributeData({
+        container
+      }).then(res => {
+        const items = res?.items || []
+        if (items.length) {
+          this.$router.push({
+            path: '/outbound/sort/lwAction',
+            query: {
+              lwContainer: container,
+            }
+          })
+          return
+        }
+
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.index.kumjcjsf', '当前拣选容器没有需要分货的商品')
+        )
+
+      }).catch(() => {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.sort.index.duvonvfy', '没有查询到分货数据')
+        )
+      }).finally(() => {
+        this.container.value = ''
+        this.container.focus = true
+      })
+
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/sow/action/index.vue

@@ -52,24 +52,25 @@
         click-style
         @click="openWaitSowPopup"
       >
-        <div>
-          <div>{{ sowData.containerCount }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.zvaqhzwl','托盘数') }}</div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.zvaqhzwl','托盘数')"
+          :value="sowData.containerCount"
+        />
 
-        <div>
-          <div>{{ sowData.waitSowQty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.ybyxwflh','待播种') }}</div>
-        </div>
-        <div>
-          <div>{{ sowData.sowQty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.lyojpssf','已播种') }}</div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.ybyxwflh','待播种')"
+          :value="sowData.waitSowQty"
+        />
 
-        <div>
-          <div>{{ sowData.abnormalQty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.pnlvhvbv','异常') }}</div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.lyojpssf','已播种')"
+          :value="sowData.sowQty"
+        />
+
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.pnlvhvbv','异常')"
+          :value="sowData.abnormalQty"
+        />
       </lw-data-look-bg>
 
       <!-- 绑定周转箱的提示信息 -->
@@ -1010,8 +1011,8 @@ export default {
           this.skuSow.sku.focus = true
         } else {
           this.sowMethod = {
-            method: this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.chibydou','逐件扫描播种'),
-            inputTitle: this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.tueftwyn','商品号'),
+            method: this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.chibydou', '逐件扫描播种'),
+            inputTitle: this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.tueftwynk', '商品条码/序列号'),
             sku: false
           }
           this.snSow.focus = true

package/src/views/wms/page/outbound/stockout/LwOutboundStockoutExecutePage.vue

@@ -51,16 +51,29 @@ export default {
     this.loadData(planTime, customerCode)
   },
   methods: {
-    loadData (planTime, customerCode) {
+    loadData(planTime, customerCode) {
       outboundQueryStockoutOrderDetail(planTime, customerCode).then(res => this.stock = res)
     },
-    confirmStock (item) {
-      this.doConfirmStock([item])
+
+    // 提示弹框
+    dialogFn(callback) {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.munxfxanq', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.munxfxanqs', '确认缺货?')
+      }).then(callback).catch(() => {
+      })
+    },
+
+    confirmStock(item) {
+      this.dialogFn(() => this.doConfirmStock([item]))
     },
-    confirmAllStock () {
-      this.doConfirmStock(this.stock.soSkuList)
+    confirmAllStock() {
+
+      this.dialogFn(() => this.doConfirmStock(this.stock.soSkuList))
+
     },
-    doConfirmStock (list) {
+    doConfirmStock(list) {
       outboundConfirmStockOut(this.stock.planTime, this.stock.customerCode, list).then(res => {
         if (res.customerStockoutFinish) {
           this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.jmmzxdxs', '已全部完成'))

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

@@ -2,12 +2,13 @@ import LwOutboundStockoutListPage from './LwOutboundStockoutListPage.vue'
 import LwOutboundStockoutExecutePage from './LwOutboundStockoutExecutePage.vue'
 
 
-LwOutboundStockoutListPage.install = Vue => Vue.component(LwOutboundStockoutListPage.name, LwOutboundStockoutListPage)
-LwOutboundStockoutExecutePage.install = Vue => Vue.component(LwOutboundStockoutExecutePage.name, LwOutboundStockoutExecutePage)
-
-
-export default [
+const page = [
   LwOutboundStockoutListPage,
   LwOutboundStockoutExecutePage,
 ]
 
+export default page.map(item => {
+  item.install = Vue => Vue.component(item.name, item)
+  return item
+})
+

package/src/views/wms/page/receive/console/components/orderInfo.vue

@@ -135,6 +135,12 @@ export default {
       type: Object,
       default: () => {
       }
+    },
+    // 页面跳转前的回调函数
+    pageJumpFn: {
+      type: Function,
+      default: () => {
+      }
     }
   },
   computed: {
@@ -197,6 +203,7 @@ export default {
     // 模块点击
     modelClick() {
       if (this.item.billStatus === '500') {
+        this.pageJumpFn()
         this.$router.push({
           path: '/receive/console/lwLook',
           query: {
@@ -226,6 +233,7 @@ export default {
     },
     // 收货回单按钮点击
     orderBack() {
+      this.pageJumpFn()
       this.$router.push({
         path: '/receive/receipt/lwReceiptConfirm',
         query: {
@@ -256,6 +264,7 @@ export default {
     },
     // 订单 - 编辑
     orderEdit() {
+      this.pageJumpFn()
       this.$router.push({
         path: '/receive/console/lwCreateEditOrder',
         query: {
@@ -283,6 +292,7 @@ export default {
 
     // 跳转页面
     goPage(path) {
+      this.pageJumpFn()
       this.$router.push({path, query: {asnNo: this.item.asnNo}})
     }
   }

package/src/views/wms/page/receive/console/index/index.vue

@@ -39,6 +39,7 @@
         v-for="i in orderList"
         :key="i.id"
         :item="i"
+        :page-jump-fn="pageJumpFn"
         @orderCancel="pageChange"
         @orderConfirm="pageChange"
       />
@@ -114,6 +115,10 @@ export default {
     wmsMobileInboundGetReceiveMethodList().then(res => {
       res.forEach(item => this.btnList.push(this.jumpPagePath[item]))
     })
+    const {searchVal, pageNum, pageSize} = this.$route.query
+    this.searchVal = searchVal || ''
+    this.pageNum = Number(pageNum || 1)
+    this.pageSize = Number(pageSize || 10)
     this.pageChange()
   },
   methods: {
@@ -137,7 +142,21 @@ export default {
 
     // 底部按钮点击
     bottomClick(path) {
+      this.pageJumpFn()
       this.$router.push(path)
+    },
+
+    // 页面跳转前记录当前搜索信息及页码信息
+    pageJumpFn() {
+      this.$router.replace({
+        path: '/receive/console/lwIndex',
+        query: {
+          searchVal: this.searchVal,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
+          _time: Date.now()
+        }
+      })
     }
   }
 }

package/src/views/wms/page/receive/index.js

@@ -33,6 +33,17 @@ import lwReceiveConsoleLook from "./console/look"
 // 收货控制台 - 创建、修改收货单
 import lwReceiveConsoleCreateEditOrder from "./console/createEditOrder"
 
+// 多单收货 - 起始页
+import lwReceiveMoreOrderIndex from "./moreOrder/index"
+// 多单收货 - 选择收货方式
+import lwReceiveMoreOrderSelectType from "./moreOrder/selectType"
+// 多单收货 - 按托盘收货
+import lwReceiveMoreOrderLpn from "./moreOrder/lpn"
+// 多单收货 - 按商品收货
+import lwReceiveMoreOrderSku from "./moreOrder/sku"
+// 多单收货 - 按箱收货
+import lwReceiveMoreOrderBox from "./moreOrder/box"
+
 
 export const receive = [
   lwReceiveReceiptPage,
@@ -48,4 +59,10 @@ export const receive = [
   lwReceiveConsoleIndex,
   lwReceiveConsoleLook,
   lwReceiveConsoleCreateEditOrder,
+
+  lwReceiveMoreOrderIndex,
+  lwReceiveMoreOrderSelectType,
+  lwReceiveMoreOrderLpn,
+  lwReceiveMoreOrderSku,
+  lwReceiveMoreOrderBox,
 ]

package/src/views/wms/page/receive/moreOrder/box/index.js

@@ -0,0 +1,12 @@
+/*
+* 多单收货 - 按箱收货
+* @author: 张文
+* @date  2023-06-14
+* */
+
+
+import lwReceiveMoreOrderBox from "./index.vue";
+
+lwReceiveMoreOrderBox.install = Vue => Vue.component(lwReceiveMoreOrderBox.name, lwReceiveMoreOrderBox)
+
+export default lwReceiveMoreOrderBox