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

package/src/components/page/outbound/bale/checkBale/allCheck/index.vue

@@ -12,6 +12,7 @@
       v-if="Object.keys(packContainer).length"
       class="lw-global-page-box"
     >
+      <check-pack-config/>
 
       <!-- 客户信息 -->
       <store-info-sku-list
@@ -36,6 +37,11 @@
         :abnormal-count="packContainer.abnormalQty"
         :sku-list="packContainer.packSkuList"
       />
+
+      <!-- 推荐包材 -->
+      <suggest-material
+        :material-list="suggestMaterialList"
+      />
     </div>
 
     <lw-bottom-bar>
@@ -58,6 +64,8 @@
 <script>
 import containerInfo from './../../components/containerInfo/index.vue'
 import storeInfoSkuList from './../../components/storeInfoSkuList/index.vue'
+import suggestMaterial from './../../components/suggestMaterial/index.vue'
+import checkPackConfig from "../../components/checkPackConfig/index.vue";
 import {
   projectWmsMixPackQueryPackData
 } from "../../../../../../api/outbound/bale/checkBale/allCheck";
@@ -66,13 +74,16 @@ export default {
   name: "lwOutboundBaleAllCheckPage",
   components:{
     containerInfo,
-    storeInfoSkuList
+    storeInfoSkuList,
+    checkPackConfig,
+    suggestMaterial,
   },
   data() {
     return {
 
       // 复核数据
-      packContainer:{}
+      packContainer:{},
+
 
     }
   },
@@ -81,12 +92,17 @@ export default {
     projectWmsMixPackQueryPackData({
       queryContainer: this.$route.query.lwContainer
     }).then(res=>{
-      if (!res.packContainer || !res.packContainer.canWholePack){
+      if (
+        !res.packContainer ||
+        !res.packContainer.canWholePack ||
+        (res.packBox && res.packBox.boxId)
+      ){
         this.scanCheck()
         return
       }
 
       this.packContainer = res.packContainer || {}
+      this.suggestMaterialList = res.suggestPackMaterialList || []
 
     }).catch(()=>history.go(-1))
 

package/src/components/page/outbound/bale/checkBale/index/index.vue

@@ -10,6 +10,11 @@
 
     <div class="lw-global-page-box lw-global-tab-box">
 
+      <check-pack-config :need-bind="false"/>
+
+      <!-- 占位用 -->
+      <div style="height: 0;padding: 0" class="lw-global-model-box"></div>
+
       <van-tabs
         type="card"
         animated
@@ -124,6 +129,7 @@
 <script>
 
 import planCollapse from './../../components/planCollapse/index.vue'
+import checkPackConfig from "../../components/checkPackConfig/index.vue";
 import storeInfo from '../../components/storeInfo/index.vue'
 import {
   projectWmsGetPackStatisticsData,
@@ -131,12 +137,14 @@ import {
   projectWmsOutboundQueryMixPackedBox,
   projectWmsOutboundQueryMixPackingBox
 } from "../../../../../../api/outbound/bale/checkBale";
+import {projectWmsGetPrintBoxData} from "../../../../../../api/outbound/bale/checkBale/action";
 
 export default {
   name: "lwOutboundBaleIndexPage",
   components: {
     planCollapse,
-    storeInfo
+    storeInfo,
+    checkPackConfig,
   },
   data() {
     return {
@@ -165,10 +173,14 @@ export default {
       baleIng:[],
 
       // 已捆包的数据
-      baleOver:[]
+      baleOver:[],
+
+      // 打印机数据
+      printData:{}
     }
   },
   mounted() {
+
     // 获取捆包进度tab项
     projectWmsGetWarehouseHandoverTabKey().then(res=>{
       this.plan.tabList = res
@@ -240,9 +252,33 @@ export default {
         this.baleOver = res
       })
     },
-    // 捆包中数据按钮点击 TODO 需要调用打印服务
-    baleOverBtnClick(item){
-      console.log(item)
+    // 已捆包打印出货票
+    async baleOverBtnClick(item){
+
+      if (!Object.keys(this.printData).length){
+        // 判断当前是否配置了打印机
+        const {success,printData} = await this.$lwPrint.test(
+          'OUTBOUND_BOX_LABEL',
+          this.$lwLanguage.get('','出库箱票标签')
+        )
+
+        if (!success) return
+
+        this.printData = printData
+      }
+
+
+
+      try {
+       const res = await projectWmsGetPrintBoxData({
+         boxId: item.boxId,
+         printDeviceId: this.printData.printId
+       })
+
+       await this.$lwPrint.bluetoothPrint({taskId:res.id})
+     }catch (e) {
+       console.log(e)
+     }
     },
 
 

package/src/components/page/outbound/bale/checkBale/newBale/index.vue

@@ -11,16 +11,29 @@
 
       <div class="lw-global-model-box">
 
-        <div class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.newBale.qflcifgh','拣选容器号 / 捆包箱号') }}
-        </div>
+        <check-pack-config
+          class="lw-global-row-start"
+          :show-model="false"
+          :need-bind="false"
+        />
+
         <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.newBale.qflcifgh','拣选容器号 / 捆包箱号')"
           v-model="container.value"
           :get-focus.sync="container.focus"
           rule-key="boxNo"
+          required
           @confirm="containerConfirm"
         />
 
+        <lw-button
+          style="margin-top: 10px"
+          block
+          @click="containerConfirm"
+        >
+          {{$lwLanguage.get('','确定')}}
+        </lw-button>
+
       </div>
 
     </div>
@@ -29,9 +42,13 @@
 </template>
 
 <script>
+import checkPackConfig from "../../components/checkPackConfig/index.vue";
 
 export default {
   name: "lwOutboundBaleNewBalePage",
+  components:{
+    checkPackConfig
+  },
   data() {
     return {
       // 容器号

package/src/components/page/outbound/bale/components/checkPackConfig/index.vue

@@ -0,0 +1,177 @@
+<!--
+  当前捆包台
+  @author: 张文
+  @date: 2022-11-22
+-->
+<template>
+  <div
+    v-if="show"
+    :style="{
+      marginBottom: showModel ? '10px' : ''
+    }"
+  >
+    <div
+      :class="[
+        'lw-global-flex-between',
+        showModel ? 'lw-global-model-box' : ''
+      ]"
+    >
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','当前捆包台')"
+        :value="(packTable.packTableCode || '') + '-' + (packTable.packTableName || '')"
+        :is-row="false"
+        val-bold
+      />
+
+      <lw-button
+        mini
+        round
+        @click="changePackTable"
+      >
+        {{
+          Object.keys(this.packTable).length ?
+            $lwLanguage.get('','切换'):
+            $lwLanguage.get('','绑定')
+        }}
+      </lw-button>
+
+    </div>
+
+    <!-- 切换弹框 -->
+    <lw-popup
+      :title="popup.title"
+      v-model="popup.show"
+      :close-on-click-overlay="!popup.back"
+      :off-btn-text="
+        popup.back ?
+          $lwLanguage.get('','返回') :
+          $lwLanguage.get('','取消')
+      "
+      @close="packTableOff"
+    >
+
+      <lw-input
+        :title="$lwLanguage.get('','捆包台')"
+        v-model="popup.inp.val"
+        :get-focus.sync="popup.inp.focus"
+        rule-key="packTable"
+        :create-rule="$lwScanRule.create('捆包绑定捆包台','BOXING_LINE')"
+        required
+        :show-bottom-border="false"
+        @confirm="packTableConfirm"
+      />
+
+      <template #button>
+        <lw-button @click="packTableConfirm">
+          {{$lwLanguage.get('','绑定')}}
+        </lw-button>
+      </template>
+
+    </lw-popup>
+  </div>
+</template>
+
+<script>
+import {
+  projectWmsOutboundGetPackTableInfo,
+  projectWmsOutboundMobileGetPackConfig
+} from "../../../../../../api/outbound/bale/packTableConfig";
+
+export default {
+  name: "index",
+  props:{
+    showModel: {
+      type: Boolean,
+      default: true
+    },
+    // 是否强制校验绑定
+    needBind:{
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      show:false,
+
+      // 捆包台数据
+      packTable:{
+        packTableCode:'',
+        packTableName:''
+      },
+
+      popup:{
+        title: '',
+        show: false,
+        back: false,
+        inp:{
+          val:'',
+          focus:false
+        }
+      }
+    }
+  },
+  mounted() {
+    projectWmsOutboundMobileGetPackConfig().then(res=>{
+      this.show = res.needPackTable
+      if (this.show){
+        this.packTable = this.$lwLocalStorage.get('lwPackTableData') || {}
+        // 如果本地没有捆包台就强制弹出绑定捆包台
+        if (!Object.keys(this.packTable).length && this.needBind){
+          this.popup.title = this.$lwLanguage.get('','绑定捆包台')
+          this.popup.back = true
+          this.popup.show = true
+          this.$nextTick(()=>this.popup.inp.focus = true)
+        }
+      }else {
+        this.$lwLocalStorage.set('lwPackTableData', {})
+      }
+    })
+  },
+  methods:{
+    // 切换捆包台按钮
+    changePackTable(){
+      this.popup.title = Object.keys(this.packTable).length? this.$lwLanguage.get('','切换捆包台') : this.$lwLanguage.get('','绑定捆包台')
+      this.popup.back = false
+      this.popup.show = true
+      this.popup.inp.focus = true
+    },
+
+    // 弹框关闭按钮点击
+    packTableOff(){
+      if (this.popup.back){
+        history.go(-1)
+        return
+      }
+      this.popup.inp.val = ''
+      this.popup.inp.focus = true
+    },
+
+    // 捆包台确认
+    packTableConfirm(){
+      const val = this.popup.inp.val
+
+      if (!val){
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','捆包台编号不能为空')
+        )
+        return
+      }
+
+      projectWmsOutboundGetPackTableInfo({
+        packTableCode: val
+      }).then(res=>{
+        this.packTable = res
+        this.$lwLocalStorage.set('lwPackTableData', res)
+        this.popup.back = false
+        this.popup.show = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>