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

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

@@ -10,46 +10,51 @@
 
     <div class="lw-global-page-box">
 
-      <div v-if="tabList.length" class="lw-global-tab-box">
+      <div
+        class="lw-global-model-box"
+        style="padding: 5px 10px;margin-bottom: 10px"
+      >
 
-        <van-tabs
-          type="card"
-          animated
-          v-model="tabActive"
-          @change="tabChange"
+        <lw-input
+          :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.gqwxdyfh','线路名/线路编码/箱票号搜索')"
+          v-model="search"
+          :show-bottom-border="false"
+          rule-key="case"
+          @confirm="searchConfirm"
+          @clear="searchConfirm"
         >
-          <van-tab
-            v-for="(i,k) in tabList"
-            :key="k"
-            :name="i"
-            :title="i"
-          ></van-tab>
-        </van-tabs>
-
-        <div class="lw-global-model-box">
-
-          <lw-input
-            :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.gqwxdyfh','线路名/线路编码/箱票号搜索')"
-            v-model="search"
-            :show-bottom-border="false"
-            rule-key="case"
-            @confirm="searchConfirm"
-            @clear="searchConfirm"
-          >
 
-            <template #button>
+          <template #button>
 
-              <lw-button
-                round
-                mini
-                @click="searchConfirm"
-              >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.zgbyciol','搜索') }}</lw-button>
+            <lw-button
+              round
+              mini
+              @click="searchConfirm"
+            >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.handover.index.zgbyciol','搜索') }}</lw-button>
 
-            </template>
+          </template>
 
-          </lw-input>
+        </lw-input>
+
+      </div>
 
-        </div>
+      <template v-if="tabList.length">
+
+        <lw-tab-box>
+          <van-tabs
+            type="card"
+            animated
+            v-model="tabActive"
+            @change="tabChange"
+          >
+            <van-tab
+              v-for="(i,k) in tabList"
+              :key="k"
+              :name="i"
+              :title="i"
+            ></van-tab>
+          </van-tabs>
+        </lw-tab-box>
 
         <collapse-item
           v-for="(i,k) in dataList"
@@ -59,7 +64,7 @@
           @click="itemClick"
         />
         <lw-not-data v-if="!dataList.length"/>
-      </div>
+      </template>
       <lw-not-data v-else/>
 
     </div>
@@ -146,7 +151,9 @@ export default {
     getTabList(){
       this.tabList = []
       return new Promise((PR,PE)=>{
-        projectWmsGetWarehouseHandoverTabKey().then(res=>{
+        projectWmsGetWarehouseHandoverTabKey({
+          queryParam: this.search
+        }).then(res=>{
           this.tabList = res || []
           PR()
         }).catch(()=>PE())
@@ -172,7 +179,7 @@ export default {
 
     // 确认搜索
     searchConfirm(){
-      this.getData()
+      this.init()
     },
 
     // 显示数据被点击

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

@@ -16,7 +16,7 @@
     @inputFocus="lpn.focus=true"
   >
     <!-- tab -->
-    <div class="lw-global-tab-box">
+    <lw-tab-box>
 
       <van-tabs
         type="card"
@@ -119,7 +119,7 @@
         </van-tab>
 
       </van-tabs>
-    </div>
+    </lw-tab-box>
 
 
 

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

@@ -32,6 +32,8 @@ import lwOutboundPickAloneActionPage from "./pick/alone";
 import lwOutboundPickNotAloneActionPage from "./pick/notAlone";
 // 出库拣选 - 边拣边分
 import lwOutboundPickSowPage from "./pick/sow";
+// 出库拣选 - 容器
+import lwOutboundPickContainerActionPage from "./pick/container";
 
 // 分区拣选集合 - 起始页
 import lwOutboundPickMergeIndexPage from "./pickMerge/index";
@@ -69,9 +71,9 @@ import lwOutboundBaleChangeActionPage from "./bale/baleChange/action";
 import lwOutboundBaleChangeSkuCheckPage from "./bale/baleChange/skuCheck";
 
 // 拣选容器查询 - 起始页
-import lwOutboundPickContainerIndexPage from "./pickContainer/index";
+import lwOutboundPickContainerSearchIndexPage from "./pickContainerSearch/index";
 // 拣选容器查询 - 执行页
-import lwOutboundPickContainerActionPage from "./pickContainer/action";
+import lwOutboundPickContainerSearchActionPage from "./pickContainerSearch/action";
 
 // 滞留件转存 - 起始页
 import lwOutboundBoxTransferIndexPage from "./boxTransfer/index";
@@ -119,6 +121,7 @@ export const outbound = [
   lwOutboundPickAloneActionPage,
   lwOutboundPickNotAloneActionPage,
   lwOutboundPickSowPage,
+  lwOutboundPickContainerActionPage,
 
   lwOutboundPickMergeIndexPage,
   lwOutboundPickMergeContentPage,
@@ -140,8 +143,8 @@ export const outbound = [
   lwOutboundBaleChangeActionPage,
   lwOutboundBaleChangeSkuCheckPage,
 
-  lwOutboundPickContainerIndexPage,
-  lwOutboundPickContainerActionPage,
+  lwOutboundPickContainerSearchIndexPage,
+  lwOutboundPickContainerSearchActionPage,
 
   lwOutboundBoxTransferIndexPage,
   lwOutboundBoxTransferActionPage,

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

@@ -150,7 +150,7 @@
 
       </div>
 
-      <div class="lw-global-row-end">
+      <div class="lw-global-row">
 
         <div class="lw-global-flex-between">
 
@@ -177,6 +177,17 @@
 
       </div>
 
+      <lw-input
+        v-if="packTableConfig.palletNeedUseContainerConf !== '0'"
+        :title="$lwLanguage.get('','容器号')"
+        v-model="overLpnPopup.palletUseContainer.value"
+        :get-focus.sync="overLpnPopup.palletUseContainer.focus"
+        rule-key="containerKey"
+        :create-rule="$lwScanRule.create('打托 - 完成打托 - 捆包容器','CONTAINER')"
+        :required="packTableConfig.palletNeedUseContainerConf === '1'"
+        @confirm="overLpnConfirm"
+      />
+
       <template #button>
 
         <lw-button @click="overLpnConfirm">
@@ -201,6 +212,7 @@ import {
   projectWmsOutboundPalletSubmit,
   projectWmsSubmitPrintPallet
 } from "../../../../../api/outbound/lpnPack";
+import {projectWmsOutboundMobileGetPackConfig} from "../../../../../api/outbound/bale/packTableConfig";
 
 
 export default {
@@ -238,11 +250,18 @@ export default {
         weight: {
           value: '',
           focus: false
-        }
+        },
+        palletUseContainer: {
+          value: '',
+          focus: false
+        },
       },
 
       // 打印机信息
-      printData:{}
+      printData:{},
+
+      // 捆包台配置信息
+      packTableConfig:{},
     }
   },
   computed:{
@@ -251,19 +270,25 @@ export default {
     },
   },
   mounted() {
-    // 判断当前是否配置了打印机
-    const {success,printData} = this.$lwPrint.test(
-      'OUTBOUND_PALLET_LABEL',
-      this.$lwLanguage.get('','出库打托标签')
-    )
-    if (!success){
-      history.go(-1)
-      return
-    }
-    this.printData = printData
-    this.getLpnData()
+    this.init()
   },
   methods: {
+    async init(){
+      // 判断当前是否配置了打印机
+      const {success,printData} = this.$lwPrint.test(
+        'OUTBOUND_PALLET_LABEL',
+        this.$lwLanguage.get('','出库打托标签')
+      )
+      if (!success){
+        history.go(-1)
+        return
+      }
+      this.printData = printData
+
+      this.packTableConfig = await projectWmsOutboundMobileGetPackConfig()
+
+      this.getLpnData()
+    },
 
     // 获取托盘数据
     getLpnData(){
@@ -376,12 +401,23 @@ export default {
         if (!this.overLpnInputCheck(i)) return;
       }
 
+
+      let palletUseContainer = this.overLpnPopup.palletUseContainer.value
+      if (this.packTableConfig.palletNeedUseContainerConf === '1' && !palletUseContainer){
+        this.overLpnPopup.palletUseContainer.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','捆包容器不能为空')
+        )
+        return
+      }
+
       await projectWmsOutboundPalletFinish({
         palletId: this.lpnData.palletId,
         length: this.overLpnPopup.length.value,
         width: this.overLpnPopup.width.value,
         height: this.overLpnPopup.height.value,
         actualWeight: this.overLpnPopup.weight.value,
+        palletUseContainer
       })
 
       this.$lwToast.success(

package/src/components/page/outbound/lpnPack/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"
@@ -73,7 +73,7 @@
           </van-tab>
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
 
     </div>

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

@@ -17,7 +17,7 @@
   >
     <!-- 左右切换滚动到顶部的锚点 -->
     <div id="tab-top"></div>
-    <div class="lw-global-tab-box">
+    <lw-tab-box>
       <van-tabs
         type="card"
         animated
@@ -174,7 +174,7 @@
         </van-tab>
 
       </van-tabs>
-    </div>
+    </lw-tab-box>
 
     <!-- 确认拆板下架弹框 -->
     <split-put-down
@@ -519,12 +519,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.splitPopup.data = res

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

@@ -19,7 +19,7 @@
 
     <!-- 左右切换滚动到顶部的锚点 -->
     <div id="tab-top"></div>
-    <div class="lw-global-tab-box">
+    <lw-tab-box>
       <van-tabs
         type="card"
         animated
@@ -162,7 +162,7 @@
 
         </van-tab>
       </van-tabs>
-    </div>
+    </lw-tab-box>
 
   </data-look-and-change>
 </template>
@@ -320,12 +320,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(
@@ -334,7 +332,7 @@ export default {
 
       // 拣选完了就不要覆盖数据，会导致页面没有数据而崩溃
       if (res.pickOrderFinish){
-        this.$refs.dataLookAndChange.openPickSuccessPopup()
+        this.$refs.dataLookAndChange.openPickSuccessPopup(res)
         return
       }
 

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

@@ -0,0 +1,98 @@
+<!--
+  容器拣选行
+  @author: 张文
+  @date: 2023-01-11
+-->
+<template>
+  <div>
+    <div
+      class="lw-global-flex-between lw-global-row-start"
+      style="align-items: flex-start"
+    >
+
+      <div>
+        <div class="lw-global-value-bold">{{item.skuCode}}</div>
+        <div class="lw-global-title">{{item.skuName}}</div>
+      </div>
+
+      <lw-tag
+        round
+        plain
+        :type="pickStatus.type"
+      >{{pickStatus.msg}}</lw-tag>
+    </div>
+
+
+    <div v-if="showLoc" class="lw-global-row-end lw-global-flex-between">
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','拣选库位')"
+        :value="item.fromLocationCode"
+        val-bold
+        :is-row="false"
+      />
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','已拣选/计划')"
+        :value="item.pickQty + ' / ' + item.totalQty"
+        val-bold
+        val-red
+        :is-row="false"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "containerLine",
+  props:{
+    item:{
+      type: Object,
+      default: ()=>{}
+    },
+
+    showLoc:{
+      type: Boolean,
+      default: false
+    }
+  },
+  computed:{
+
+    // 徽标
+    pickStatus() {
+      switch (this.item.pickStatus) {
+        case '100':
+          return {
+            type: 'danger',
+            msg: this.$lwLanguage.get('','未拣选')
+          }
+        case '200':
+          return {
+            type: 'warning',
+            msg: this.$lwLanguage.get('','拣选中')
+          }
+        case '300':
+          return {
+            type: 'success',
+            msg: this.$lwLanguage.get('','已拣选')
+          }
+        default:
+          return {
+            type: 'primary',
+            msg: this.$lwLanguage.get('','未知')
+          }
+      }
+    },
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -6,7 +6,7 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gmmvhnxt','执行拣选')"/>
+    <lw-nav-bar :title=" title || $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gmmvhnxt','执行拣选')"/>
 
     <!-- 页主体 -->
     <div class="lw-global-page-box">
@@ -132,6 +132,7 @@
           </div>
 
           <lw-tag
+            v-if="lackPopup.skuInfo.skuSizeLabel"
             plain
             round
           >{{ lackPopup.skuInfo.skuSizeLabel }}</lw-tag>
@@ -152,7 +153,7 @@
               {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.ahlgyadg','最小销售量') }}
             </span>
             <span class="lw-global-value-bold-red">
-              {{ lackPopup.skuInfo.uomQty }}
+              {{ lackPopup.skuInfo.uomQty || 1 }}
             </span>
           </div>
 
@@ -174,6 +175,7 @@
         v-model="lackPopup.lackQty"
         :get-focus.sync="lackPopup.lackQtyFocus"
         type="digit"
+        required
         @confirm="lackConfirm"
       />
 
@@ -226,12 +228,23 @@
         :val-size="16"
       />
 
-      <lw-title-value-cell
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nonxcofj','播种墙')"
-        :value="pickData.sowCode"
-        val-bold
-        :val-size="16"
-      />
+      <div class="lw-global-flex-between">
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nonxcofj','播种墙')"
+          :value="pickData.sowCode"
+          val-bold
+          :val-size="16"
+          :is-row="false"
+        />
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('','待播通道')"
+          :value="pickData.sowLocation || '-'"
+          val-bold
+          :val-size="16"
+          :is-row="false"
+        />
+      </div>
 
       <template #button>
         <lw-button @click="goSowCollect">
@@ -299,11 +312,25 @@
     >
 
       <div class="lw-global-row lw-data-loot-adn-change-success">
+        {{notAloneMsg}}
+      </div>
+
+      <div
+        v-if="!notAloneMsg"
+        class="lw-global-row lw-data-loot-adn-change-success"
+      >
         {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.usntgvja','当前任务已拣选完成，请移动到捆包区:') }}
+
         <span
           class="lw-global-value-bold-red"
           style="font-size: 16px"
-        >{{ pickData.pickPackTypeLabel }}</span>
+        >
+          {{
+            pickData.pickPackType === 'MIX_PACK' ?
+              $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.usntpptl', '复合捆包') :
+              pickData.pickPackTypeLabel
+          }}
+        </span>
       </div>
 
       <!-- 独立捆包件不显示 -->
@@ -333,11 +360,15 @@ export default {
   },
   props:{
 
-    // 当前拣选类型： box-按箱、lpn-按托盘、alone-独立件、notAlone-非独立件
+    // 当前拣选类型： box-按箱、lpn-按托盘、alone-独立件、notAlone-非独立件、container-容器
     type:{
       type: String,
       required: true
     },
+    // 标题
+    title:{
+      type: String,
+    },
 
     // 拣选数据
     pickData: Object,
@@ -437,6 +468,7 @@ export default {
 
       // 非独立件
       notAloneShow: false,
+      notAloneMsg: '',
 
       // 有无打印数据
       hasPrint: false,
@@ -460,7 +492,7 @@ export default {
     lackAbnSuccess(res){
       if (res.generateStatus){
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.eknxrtel','上报缺货成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.eknxrtel','上报成功')
         )
       }
 
@@ -472,7 +504,9 @@ export default {
       this.getData()
     },
     // 拣选完成的弹出框
-    openPickSuccessPopup(){
+    openPickSuccessPopup(res){
+      this.notAloneMsg = ''
+
       if (this.pickData.sowCode){
         this.sowShow = true
         return
@@ -488,6 +522,10 @@ export default {
         return
       }
 
+      if (res && res.packBoxNo){
+        this.notAloneMsg = this.$lwLanguage.get('','当前任务已拣选完成，并且已经捆包')
+      }
+
       this.notAloneShow = true
     },
 
@@ -630,6 +668,7 @@ export default {
         ...this.abnPopup.skuInfo,
         data
       }).then((res)=>{
+        this.$refs.abnormal.printLabel()
         this.lackAbnSuccess(res)
         this.abnPopup.show = false
       })
@@ -650,6 +689,9 @@ export default {
 
     // 打印箱票
     async print(res){
+
+      if (!res.needPrintBox || !res.packBoxId) return
+
       if (!this.printData.printId) {
         console.warn('获取打印设备失败，可能是未配置打印机，打印终止')
         return

package/src/components/page/outbound/{pickContainer/action → pick/container}/index.js

@@ -1,7 +1,7 @@
 /*
-* 拣选容器查询 - 执行页
+* 容器拣选
 * @author: 张文
-* @date  2022-07-09
+* @date: 2022-12-26
 * */
 
 import lwOutboundPickContainerActionPage from "./index.vue";