@logwire/logwire-wms-pda-ui 1.1.19 → 3.1.0

package/src/components/page/outbound/packCollect/components/containerInfo.vue

@@ -0,0 +1,108 @@
+<!--
+  容器信息
+  @author: 张文
+  @date: 2022-11-21
+-->
+<template>
+  <div class="lw-global-model-box">
+
+    <div class="lw-global-flex-between lw-global-row-start">
+
+      <lw-title-value-cell
+        style="flex: 1"
+        :title="$lwLanguage.get('','容器号')"
+        :value="item.pickContainerNo"
+        :is-row="false"
+      />
+
+      <van-icon
+        name="clear"
+        color="#d50000"
+        size="20px"
+        @click="$emit('del')"
+      />
+
+    </div>
+
+    <div class="lw-global-flex-between lw-global-row">
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','品种数')"
+        :value="item.skuTypeCount"
+        :is-row="false"
+        val-red
+        val-bold
+      />
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','商品数')"
+        :value="item.skuQty"
+        :is-row="false"
+        val-red
+        val-bold
+      />
+
+    </div>
+
+    <div class="lw-global-collapse-box">
+      <!-- 折叠框 -->
+      <van-collapse
+        v-model="activeNames"
+        :border="false"
+      >
+        <van-collapse-item
+          :title="$lwLanguage.get('','商品列表')"
+          name="1"
+        >
+          <template #value>
+            <div>
+              <span class="lw-global-value-bold-red">
+                {{item.skuList.length}}
+              </span>
+              <span class="lw-global-value-bold">
+                {{$lwLanguage.get('','行')}}
+              </span>
+            </div>
+          </template>
+
+
+          <lw-sku-info-module
+            v-for="(i,k) in item.skuList"
+            :key="k"
+            :sku-name="i.skuName"
+            :sku-code="i.skuCode"
+            :qty="i.qty"
+            is-row
+            :is-row-last="(k+1) === item.skuList.length"
+            :is-row-first="k===0"
+          />
+        </van-collapse-item>
+      </van-collapse>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "containerInfo",
+  props:{
+    item:{
+      type: Object,
+      default:()=>{}
+    }
+  },
+  data() {
+    return {
+      activeNames:[]
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -0,0 +1,11 @@
+/*
+* 捆包集货 - 起始页
+* @author: 张文
+* @date: 2022-11-21
+* */
+
+import lwOutboundPackCollectIndexPage from "./index.vue";
+
+lwOutboundPackCollectIndexPage.install = Vue => Vue.component(lwOutboundPackCollectIndexPage.name, lwOutboundPackCollectIndexPage)
+
+export default lwOutboundPackCollectIndexPage

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

@@ -0,0 +1,192 @@
+<!--
+  捆包集货 - 起始页
+  @author: 张文
+  @date: 2022-11-21
+-->
+<template>
+  <div>
+
+    <lw-nav-bar
+      :title="$lwLanguage.get('','捆包集货')"
+      :click-left="back"
+    />
+
+    <div class="lw-global-page-box">
+
+      <div class="lw-global-model-box">
+        <lw-input
+          :title="$lwLanguage.get('','待集货容器')"
+          v-model="container.val"
+          :get-focus.sync="container.focus"
+          rule-key="container"
+          :create-rule="$lwScanRule.create('捆包集货 - 待集货容器','CONTAINER')"
+          :show-bottom-border="false"
+          auto-clear-val
+          @confirm="containerConfirm"
+        />
+      </div>
+
+      <template v-if="containerList.length">
+        <div
+          class="lw-global-flex-between"
+          style="margin: 10px 0"
+        >
+          <div class="lw-global-title">
+            {{$lwLanguage.get('','已添加容器')}}
+          </div>
+
+          <div class="lw-global-value-bold-red">{{containerList.length + $lwLanguage.get('','个')}}</div>
+        </div>
+
+        <container-info
+          v-for="(i,k) in containerList"
+          :key="k"
+          :item="i"
+          @del="delContainer(k)"
+        />
+      </template>
+
+
+
+    </div>
+
+    <lw-bottom-bar
+      v-if="containerList.length"
+      :height="90"
+    >
+
+      <div style="flex: 1">
+
+        <lw-input
+          style="padding-top: 0;margin-bottom: 10px"
+          :title="$lwLanguage.get('','集货库位')"
+          v-model="packCollectLocation"
+          required
+          @confirm="over"
+        />
+
+        <lw-button
+          block
+          @click="over"
+        >
+          {{$lwLanguage.get('','完成')}}
+        </lw-button>
+
+      </div>
+
+    </lw-bottom-bar>
+
+  </div>
+</template>
+
+<script>
+import containerInfo from "../components/containerInfo.vue";
+import {
+  projectWmsPackCollectExecute,
+  projectWmsPackCollectGetContainerInfo
+} from "../../../../../api/outbound/packCollect";
+
+export default {
+  name: "lwOutboundPackCollectIndexPage",
+  components:{
+    containerInfo
+  },
+  data() {
+    return {
+      // 容器号
+      container:{
+        val:'',
+        focus: true
+      },
+
+      // 容器列表
+      containerList:[],
+
+      // 集货库位
+      packCollectLocation:''
+    }
+  },
+  watch:{
+    containerList:{
+      handler(n){
+        if (!n.length){
+          this.packCollectLocation = ''
+        }
+      }
+    }
+  },
+  methods: {
+    // 返回按钮
+    back(){
+
+      if (!this.containerList.length){
+        history.go(-1)
+        return
+      }
+
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('','警告'),
+        message: this.$lwLanguage.get('','当前扫描数据将会被全部清空'),
+        type: 'error'
+      }).then(()=>{
+        history.go(-1)
+      }).catch(()=>{})
+
+    },
+
+    // 集货容器号确认
+    containerConfirm(val){
+
+      if (!val){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','集货容器不能为空')
+        )
+        return
+      }
+
+      projectWmsPackCollectGetContainerInfo({
+        pickContainerNo: val
+      }).then(res=>{
+
+        if (this.containerList.some(item=>item.pickContainerNo===res.pickContainerNo)){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','容器号{n}已在容器列表中，不允许重复添加!',{n:res.pickContainerNo})
+          )
+          return
+        }
+
+        this.containerList.unshift(res)
+      })
+    },
+    // 删除容器号
+    delContainer(index){
+      this.containerList.splice(index,1)
+    },
+
+    // 完成
+    over(){
+      if (!this.packCollectLocation){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','集货库位不能为空')
+        )
+        return
+      }
+
+      projectWmsPackCollectExecute({
+        packCollectLocation: this.packCollectLocation,
+        containerList: this.containerList
+      }).then(()=>{
+        this.$lwToast.success(
+          this.$lwLanguage.get('','集货成功')
+        )
+        this.containerList = []
+        this.container.focus = true
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -27,27 +27,35 @@
 
         <!-- 正在拣选 -->
         <van-tab
-          :title="$lwLanguage.get('','正在拣选')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.xixsdred','正在拣选')"
           name="ing"
         >
           <div class="lw-global-model-box">
 
             <sku-location-info
-              :item="pickData.pendingPickLineList[taskIndex]"
+              :item="nowPickData"
               wait-pick
             />
 
             <!-- 托盘号 -->
             <lw-title-value-cell
-              v-if="hasLpn"
-              :title="$lwLanguage.get('','托盘号')"
-              :value="pickData.pendingPickLineList[taskIndex].fromLpn"
+              v-if="nowPickData.fromLpn"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.fktwehuj','托盘号')"
+              :value="nowPickData.fromLpn"
+              val-bold
+            />
+
+            <!-- 箱 -->
+            <lw-title-value-cell
+              v-if="nowPickData.fromCase"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.fktwsehuj','箱号')"
+              :value="nowPickData.fromCase"
               val-bold
             />
 
             <!-- 库位 -->
             <lw-input
-              :title="$lwLanguage.get('','拣选库位')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.xkcxzwcj','拣选库位')"
               v-model="locationCode.value"
               :get-focus.sync="locationCode.focus"
               required
@@ -58,7 +66,7 @@
             <!-- 托盘号 -->
             <lw-input
               v-if="hasLpn"
-              :title="$lwLanguage.get('','托盘号')"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.fktwehuj','托盘号')"
               v-model="lpn.value"
               :get-focus.sync="lpn.focus"
               required
@@ -66,12 +74,22 @@
               @confirm="lpnConfirm"
             />
 
+            <!-- 箱号 -->
+            <lw-input
+              v-if="nowPickData.fromCase"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.fktwsehuj','箱号')"
+              v-model="box.value"
+              :get-focus.sync="box.focus"
+              required
+              rule-key="case"
+              :create-rule="$lwScanRule.create('独立件拣选-箱号','CASE')"
+              @confirm="boxConfirm"
+            />
+
             <!-- 需要SN -->
-            <template
-              v-if="pickData.pendingPickLineList[taskIndex].needHandleSn"
-            >
+            <template v-if="nowPickData.needHandleSn">
               <lw-input
-                :title="$lwLanguage.get('','序列号')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.ktwfjnre','序列号')"
                 v-model="sn.value"
                 :get-focus.sync="sn.focus"
                 required
@@ -88,15 +106,16 @@
             <!-- 商品号 -->
             <template v-else>
               <lw-input
-                :title="$lwLanguage.get('','商品号')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.dzyhigll','商品号')"
                 v-model="sku.value"
                 :get-focus.sync="sku.focus"
                 required
-                rule-value-key="skuCode"
+                rule-key="skuCode"
+                :create-rule="$lwScanRule.create('独立件拣选-商品号','SKU')"
                 @confirm="skuConfirm"
               />
               <lw-input
-                :title="$lwLanguage.get('','数量')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.wrqohiqb','数量')"
                 v-model="qty.value"
                 :get-focus.sync="qty.focus"
                 required
@@ -110,7 +129,7 @@
                     mini
                     round
                     @click="qtyConfirm"
-                  >{{ $lwLanguage.get('','确认') }}</lw-button>
+                  >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.ursidwbt','确认') }}</lw-button>
                 </template>
               </lw-input>
             </template>
@@ -130,7 +149,7 @@
 
         <!-- 拣选明细行 -->
         <van-tab
-          :title="$lwLanguage.get('','拣选明细行')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.nchbxbuq','拣选明细行')"
           name="wait"
         >
 
@@ -190,7 +209,13 @@ export default {
   computed:{
     // 是否有lpn
     hasLpn(){
-      return !!this.pickData.pendingPickLineList[this.taskIndex].fromLpn
+      return !this.nowPickData.fromCase && this.nowPickData.fromLpn
+    },
+    nowPickData(){
+      if (this.pickData.pendingPickLineList && this.pickData.pendingPickLineList.length){
+        return this.pickData.pendingPickLineList[this.taskIndex]
+      }
+      return {}
     }
   },
   data() {
@@ -217,6 +242,12 @@ export default {
         focus: false
       },
 
+      // 箱号
+      box:{
+        value:'',
+        focus: false
+      },
+
       // 商品
       sku:{
         value:'',
@@ -243,7 +274,7 @@ export default {
         show: false,
         // 后端返回的全部数据
         data:{},
-      }
+      },
     }
   },
   mounted() {
@@ -266,6 +297,8 @@ export default {
       if (this.locationCodeCheck()){
         if (this.hasLpn){
           this.lpn.focus = true
+        }else if (this.nowPickData.fromCase){
+          this.box.focus = true
         }else {
           this.skuOrSnFocus()
         }
@@ -276,7 +309,7 @@ export default {
 
       return this.inputCheck({
         key: 'locationCode',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].fromLocationCode,
+        checkVal: this.nowPickData.fromLocationCode,
       })
     },
 
@@ -291,13 +324,28 @@ export default {
 
       return this.inputCheck({
         key: 'lpn',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].fromLpn,
+        needCheck: false
+      })
+    },
+
+    // 箱号确认
+    boxConfirm(){
+      if (this.boxCheck()) this.skuOrSnFocus()
+    },
+    // 箱号校验
+    boxCheck(){
+
+      if (!this.nowPickData.fromCase) return true
+
+      return this.inputCheck({
+        key: 'box',
+        needCheck: false
       })
     },
 
     // 商品或者sn输入框获取焦点
     skuOrSnFocus(){
-      if (this.pickData.pendingPickLineList[this.taskIndex].needHandleSn){
+      if (this.nowPickData.needHandleSn){
         this.sn.focus = true
       }else {
         this.sku.focus = true
@@ -305,7 +353,7 @@ export default {
     },
 
     // 商品确认
-    skuConfirm(val,{data}){
+    skuConfirm(val,data){
 
       if (!this.skuCheck()) return
 
@@ -318,14 +366,14 @@ export default {
       }
 
       this.qty.disabled = false
-      this.qty.value = this.pickData.pendingPickLineList[this.taskIndex].uomQty
+      this.qty.value = this.nowPickData.uomQty
       this.qty.focus = true
     },
     // 商品检查
     skuCheck(){
       return this.inputCheck({
         key: 'sku',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].skuCode,
+        checkVal: this.nowPickData.skuCode,
       })
     },
 
@@ -339,24 +387,24 @@ export default {
       if (!qty){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.jpjuedkd','拣选数量不能为空，且应当是大于0的整数')
         )
         this.qty.value = ''
         return false
       }
 
-      const item = this.pickData.pendingPickLineList[this.taskIndex]
+      const item = this.nowPickData
       const uomQty = Number(item.uomQty || 0)
 
       if (uomQty === 0){
-        console.warn('拣选最小单位数据异常，值为：', uomQty)
+        console.warn(this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.sjyimafr', '拣选最小单位数据异常，值为：'), uomQty)
         return true
       }
 
       if (qty%item.uomQty !== 0){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('','的倍数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.sicaarrb','拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.gqzzynli','的倍数')
         )
         this.qty.value = ''
         return false
@@ -366,7 +414,7 @@ export default {
       if (qty > waitQty){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量不能大于待拣量')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.ytdthflm','拣选数量不能大于待拣量')
         )
         this.qty.value = ''
         return false
@@ -377,7 +425,7 @@ export default {
 
     // 序列号确认
     snConfirm(val, {data}){
-      const item = this.pickData.pendingPickLineList[this.taskIndex]
+      const item = this.nowPickData
       projectWmsOutboundPickCheckSn({
         ownerId: item.ownerId,
         skuId: item.skuId,
@@ -402,7 +450,7 @@ export default {
     // 任务行切换前
     cutStart(){
       return this.checkInputVal(
-        ['locationCode', 'lpn', 'sku', 'qty', 'sn'],
+        ['locationCode', 'lpn', 'box', 'sku', 'qty', 'sn'],
         !!this.sn.list.length
       )
 
@@ -410,20 +458,21 @@ export default {
     // 任务行切换后
     cutEnd(){
       this.clearInputVal(
-        ['locationCode', 'lpn', 'sku', 'qty', 'sn'],
+        ['locationCode', 'lpn', 'box', 'sku', 'qty', 'sn'],
       )
       this.sn.list = []
     },
 
     // 确认拣选
-    pickConfirm(){
+    async pickConfirm(){
       // 库位、托盘号
       if (!(
         this.locationCodeCheck() &&
-        this.lpnCheck()
+        this.lpnCheck() &&
+        this.boxCheck()
       )) return
 
-      const item = this.pickData.pendingPickLineList[this.taskIndex]
+      const item = this.nowPickData
       let currentPickQty = 0
 
       // 是否需要处理SN
@@ -432,7 +481,7 @@ export default {
         if (!this.sn.list.length) {
           this.sn.focus = true
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('', '请扫描拣选商品的序列号')
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.gzosuwuw','请扫描拣选商品的序列号')
           )
           return
         }
@@ -450,11 +499,12 @@ export default {
       }
 
 
-      projectWmsOutboundAlonePick({
+      const res = await projectWmsOutboundAlonePick({
         pickId: this.pickData.pickId,
         pickNo: this.pickData.pickNo,
         fromLocationId: item.fromLocationId,
         fromLpn: item.fromLpn,
+        fromCase: item.fromCase,
         ownerId: item.ownerId,
         skuId: item.skuId,
         uom: item.uom,
@@ -464,29 +514,33 @@ export default {
         currentPickQty: currentPickQty,
         lineGroupKey: item.lineGroupKey,
         snList: this.sn.list,
-      }).then(res=>{
+        actualPickLpn: this.lpn.value,
+        actualPickCaseNum: this.box.value
+      })
 
-        // 判断是否需要打印箱票
-        if(res.needPrintBox){
-          this.$refs.dataLookAndChange.print(res)
+      // 判断是否需要打印箱票
+      if(res.needPrintBox){
+        try {
+          await this.$refs.dataLookAndChange.print(res)
+        }catch (e) {
+          console.warn('独立件打印箱票失败：', e)
         }
+      }
 
-        this.splitPopup.data = res
-
-        this.$lwToast.success(
-          this.$lwLanguage.get('','拣选成功')
-        )
+      this.splitPopup.data = res
 
-        // 是否需要拆板下架
-        if(res.needSplitDown){
-          this.splitPopup.show = true
-          this.splitPopup.container.focus = true
-          return
-        }
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.wweaupol','拣选成功')
+      )
 
-        this.splitOff()
+      // 是否需要拆板下架
+      if(res.needSplitDown){
+        this.splitPopup.show = true
+        this.splitPopup.container.focus = true
+        return
+      }
 
-      })
+      this.splitOff()
     },
   }
 }