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

package/src/components/page/outbound/reprint-box/LwOutboundReprintBoxListPage.vue

@@ -1,79 +1,115 @@
 <template>
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.pvsffdcy', '出货票补打')"/>
+
     <div class="lw-global-page-box">
-      <div class="lw-global-model-box">
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.bzfgwgga', '客户编码')" v-model="param.customerCode.value" :get-focus.sync="param.customerCode.focus"
-                  @confirm="param.soNo.focus = true"/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.ysxswhiu', '出库单号')" v-model="param.soNo.value" :get-focus.sync="param.soNo.focus"
-                  @confirm="param.boxNo.focus = true"/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.kxymijkx', '箱号')" v-model="param.boxNo.value" :get-focus.sync="param.boxNo.focus"
-                  @confirm="param.sn.focus = true"/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.bgifgkzp', '商品序列号')" v-model="param.sn.value" :get-focus.sync="param.sn.focus"
-                  rule-key="sn" rule-value-key="sn"
-                  @confirm="queryData"/>
-        <lw-button block @click="queryData">{{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.coyucmhf', '查询')}}</lw-button>
+      <div
+        class="lw-global-model-box"
+        style="margin-bottom: 10px;padding-top: 5px"
+      >
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.bzfgwgga', '客户编码')"
+          v-model="param.customerCode.value"
+          :get-focus.sync="param.customerCode.focus"
+          @confirm="param.soNo.focus = true"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.ysxswhiu', '出库单号')"
+          v-model="param.soNo.value"
+          :get-focus.sync="param.soNo.focus"
+          @confirm="param.boxNo.focus = true"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.kxymijkx', '箱号')"
+          v-model="param.boxNo.value"
+          :get-focus.sync="param.boxNo.focus"
+          @confirm="param.sn.focus = true"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.bgifgkzp', '商品序列号')"
+          v-model="param.sn.value"
+          :get-focus.sync="param.sn.focus"
+          rule-key="sn"
+          rule-value-key="sn"
+          @confirm="queryData"
+        />
+        <lw-button
+          style="margin-top: 10px"
+          block
+          @click="queryData"
+        >
+          {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.coyucmhf', '查询')}}
+        </lw-button>
       </div>
 
-      <div v-if="showEmpty">
-        <lw-not-data/>
-      </div>
+      <lw-not-data v-if="showEmpty"/>
       <div v-else>
-        <div v-for="box in boxes" :key="box.boxNo" class="lw-global-model-box box-item">
+        <div
+          v-for="box in boxes"
+          :key="box.boxNo"
+          class="lw-global-model-box"
+          style="padding-bottom: 5px"
+        >
           <div>
-            <div class="box-item-info">
-              <div class="box-item-label">{{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.pjtloamy', '客户')}}</div>
-              <div class="box-item-value">
-                <p>{{ box.customerCode }}</p>
-                <p>{{ box.customerName }}</p>
-              </div>
-            </div>
-            <div class="lw-global-sh"></div>
-            <div class="lw-global-flex-between">
-              <div>
-                <div class="box-item-info">
-                  <div class="box-item-label">{{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.qdetdtmw', '捆包箱号')}}</div>
-                  <div class="box-item-value">{{ box.boxNo }}</div>
-                </div>
-                <div class="box-item-info">
-                  <div class="box-item-label">{{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.xavynmlc', '捆包时间')}}</div>
-                  <div class="box-item-value">{{ $lwDate.format(box.boxTime, 'yyyy-MM-dd hh:mm') }}</div>
-                </div>
+            <div class="lw-global-flex-start-start lw-global-row-start">
+              <div class="lw-global-title">
+                {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.pjtloamy', '客户')}}
               </div>
-              <div style="flex-basis: 9em; text-align: right;">
-                <lw-button @click="executePrint(box)">{{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.rmxmarpu', '补打出货票')}}</lw-button>
+              <div class="lw-global-value">
+                <div class="lw-global-value-bold">{{ box.customerCode }}</div>
+                <div class="lw-global-title">{{ box.customerName }}</div>
               </div>
             </div>
-          </div>
-          <div class="box-item-bar">
-            <div style="flex: 1;">{{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.iwomuosq', '捆包箱商品列表')}}</div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.spsgqdjo', '行数 ')}}<span>{{ box.skuList.length }}</span></div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.nxxcraqt', '数量 ')}}<span>{{ box.skuQty }}</span></div>
-            <div>
-              <van-icon class="btn-shrink" :class="{inverted: !box.fold}" @click="box.fold = !box.fold" name="arrow-up"/>
-            </div>
-          </div>
-          <div v-if="box.fold">
-            <div v-for="sku in box.skuList" :key="sku.skuId" class="box-item-sku">
-              <div>
-                <div class="box-item-sku-code">{{ sku.skuCode }}</div>
-                <div class="box-item-sku-name">{{ sku.skuName }}</div>
-              </div>
-              <div class="box-item-sku-qty">{{ sku.qty }}</div>
+
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.qdetdtmw', '捆包箱号')"
+              :value="box.boxNo"
+            />
+
+            <div class="lw-global-flex-between lw-global-row">
+
+              <lw-title-value-cell
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.xavynmlc', '捆包时间')"
+                :value="$lwDate.format(box.boxTime, 'yyyy-MM-dd hh:mm')"
+                :is-row="false"
+              />
+              <lw-button
+                mini
+                round
+                @click="executePrint(box)"
+              >
+                {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.rmxmarpu', '补打出货票')}}
+              </lw-button>
             </div>
+
           </div>
+
+          <collapse-item :item="box"/>
+
         </div>
         <lw-pages v-model="query.pageNum" :page-size="query.pageSize" :page-total="query.total" @change="loadPage"/>
       </div>
     </div>
+
   </div>
 </template>
 
 <script>
-import { outboundQueryCanHandleBox } from '../../../../api/outbound/reprint-box'
+import collapseItem from "./collapseItem.vue";
+import {
+  outboundQueryCanHandleBox,
+  projectWmsGetPrintBoxData
+} from '../../../../api/outbound/reprint-box'
 
 export default {
   name: 'LwOutboundReprintBoxListPage',
+  components:{
+    collapseItem
+  },
   data () {
     return {
       param: {
@@ -105,6 +141,7 @@ export default {
         boxNo: null,
         sn: null,
       },
+      printData:{}
     }
   },
   methods: {
@@ -130,77 +167,37 @@ export default {
         }
       })
     },
-    executePrint (box) {
-      console.log(this.$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.bcmiyggj', '执行补打'), box)
+
+    // 检查打印机
+    checkPrint(){
+      if (this.printData.printId) return true
+
+      // 判断当前是否配置了打印机
+      const {success,printData} = this.$lwPrint.test(
+        'OUTBOUND_BOX_LABEL',
+        this.$lwLanguage.get('','出库箱票标签')
+      )
+      if (!success)return false
+      this.printData = printData
+      return true
+    },
+    async executePrint (box) {
+      if (!this.checkPrint()) return
+      try {
+        const res = await projectWmsGetPrintBoxData({
+          boxId: box.boxId,
+          printDeviceId: this.printData.printId
+        })
+
+        await this.$lwPrint.bluetoothPrint({taskId:res.id})
+      }catch (e){
+        console.log(e)
+      }
     }
   }
 }
 </script>
 
 <style lang="less" scoped>
-.btn-shrink {
-  padding: 5px;
-
-  &.inverted {
-    transform: rotate(180deg);
-  }
-}
-
-.box-item {
-  margin-top: 10px;
 
-  &-info {
-    display: flex;
-    margin: 8px 0;
-    align-items: center;
-  }
-
-  &-label {
-    color: gray;
-    flex-basis: 4em;
-    margin-right: 0.5em;
-  }
-
-  &-value {
-    flex: 1;
-  }
-
-  &-bar {
-    margin: 0 -10px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background: lightblue;
-
-    & > div {
-      margin: 5px 10px;
-    }
-  }
-
-  &-sku {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin: 12px 0 5px;
-    padding-bottom: 8px;
-
-    &:not(:last-child) {
-      border-bottom: 1px solid lightgray;
-    }
-
-    &-code {
-      font-weight: bold;
-    }
-
-    &-name {
-      color: gray;
-      font-size: 0.9em;
-    }
-
-    &-qty {
-      font-weight: bold;
-      font-size: 1.2em;
-    }
-  }
-}
 </style>

package/src/components/page/outbound/reprint-box/collapseItem.vue

@@ -0,0 +1,71 @@
+<!--
+  折叠项
+  @author: 张文
+  @date: 2022-11-30
+-->
+<template>
+  <div class="lw-global-collapse-box">
+    <van-collapse
+      v-model="activeCollapse"
+      :border="false"
+    >
+      <van-collapse-item name="1">
+
+        <template #title>
+          <div class="lw-global-flex-between">
+
+            <div class="lw-global-title">
+              {{ $lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.iwomuosq', '捆包箱商品列表') }}
+            </div>
+
+            <div class="lw-global-title">
+              {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.spsgqdjo', '行数 ')}}
+              <span class="lw-global-value-bold">{{ item.skuList.length }}</span>
+            </div>
+
+            <div class="lw-global-title">
+              {{$lwLanguage.get('wms_project.pda.components.page.outbound.reprint_box.nxxcraqt', '数量 ')}}
+              <span class="lw-global-value-bold-red">{{ item.skuQty }}</span>
+            </div>
+
+
+          </div>
+        </template>
+
+        <lw-sku-info-module
+          v-for="(i,k) in item.skuList"
+          :key="i.skuId"
+          :sku-name="i.skuName"
+          :sku-code="i.skuCode"
+          :qty="i.qty"
+          :is-row="k!==0 && (k+1) < item.skuList.length"
+          :is-row-first="k===0"
+          :is-row-last="(k+1) === item.skuList.length"
+        />
+      </van-collapse-item>
+    </van-collapse>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "collapseItem",
+  props:{
+    item:{
+      type: Object,
+      default:()=>{}
+    }
+  },
+  data() {
+    return {
+      activeCollapse:[]
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -134,6 +134,7 @@
                 :get-focus.sync="skuSow.sku.focus"
                 auto-clear-val
                 rule-key="batchSku"
+                :create-rule="$lwScanRule.create('播种-商品号','SKU')"
                 @confirm="skuSowConfirm"
               />
 
@@ -145,6 +146,7 @@
                 :get-focus.sync="snSow.focus"
                 auto-clear-val
                 rule-key="sn"
+                :create-rule="$lwScanRule.create('播种-序列号','SN')"
                 @confirm="snSowConfirm"
               />
             </div>
@@ -622,7 +624,7 @@
 import sowLocationList from './../components/sowLocationList/index.vue'
 import waitSowCollapse from './../components/waitSowCollapse/index.vue'
 import {
-  projectWmsBindSowPositionContainer,
+  projectWmsBindSowPositionContainer, projectWmsOutboundFrontSkuScan,
   projectWmsSowBatchSubmit,
   projectWmsSowChangePositionContainer,
   projectWmsSowComputeSkuSowPosition,
@@ -836,10 +838,12 @@ export default {
               this.startSow.data.sowQty = data.sowQty
 
               over = data.sowQty === data.pickQty
+              this.skuSow.sku.focus = this.sowMethod.sku
+              this.snSow.focus = !this.sowMethod.sku
               over && !isSn && this.cutPickContainer()
-
             }else {
-              !isSn && this.cutPickContainer()
+              // 如果没有数据就是容器拣选完成，让拣选量等于容器量
+              this.startSow.data.sowQty = this.startSow.data.pickQty
             }
 
             const msg = over ?
@@ -1007,7 +1011,7 @@ export default {
         } 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','商品序列号'),
+            inputTitle: this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.tueftwyn','商品号'),
             sku: false
           }
           this.snSow.focus = true
@@ -1044,12 +1048,9 @@ export default {
       })
 
       if(!skuList.length){
-        this.skuSow.sku.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.lvlquawh','当前商品不在拣选容器内')
-        )
         return {
-          success: false
+          success: true,
+          skuList: null
         }
       }
 
@@ -1078,13 +1079,45 @@ export default {
     // 批量播种商品扫描完成
     skuSowConfirm(val, data){
 
-      const {key, qty} = data.data
+      const {qty, skuCode, sn, key} = data.data
 
       this.nowSowSkuInfo.animation = false
 
-      const {success, skuList} = this.skuCodeCheck(key)
+      const code = skuCode || key
+
+      const {success, skuList} = this.skuCodeCheck(code)
       if(!success) return
 
+      // 找到了商品信息就执行播种
+      if(skuList){
+        this.skuSowConfirmApi(code, qty, skuList[0])
+        return;
+      }
+
+      // 没有找到商品信息就提交给后台找
+      projectWmsOutboundFrontSkuScan({
+        sn: sn || key,
+        qty,
+        limitSkuIds: this.startSow.data.skuList.map(item=>item.skuId)
+      }).then(res=>{
+
+        if(res && Object.keys(res).length){
+          const skuInfo = this.startSow.data.skuList.filter(item=>item.skuId===res.skuId)[0]
+
+          this.skuSowConfirmApi(skuInfo.skuCode, res.qty, skuInfo)
+          return
+        }
+
+        this.skuSow.sku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.xtpkcohvA','商品号输入有误，没有查询到商品信息')
+        )
+      })
+
+
+    },
+    // 批量执行播种
+    skuSowConfirmApi(key,qty,skuInfo){
       const oldSkuCode = this.nowSowSkuInfo.data.skuCode
       if (oldSkuCode && oldSkuCode !== key){
         this.skuSow.sku.focus = true
@@ -1099,9 +1132,9 @@ export default {
         sowWallCode: this.sowData.sowWallCode,
         sowLot: this.sowData.sowLot,
         pickContainer: this.startSow.pickContainer.value,
-        ownerId: skuList[0].ownerId,
-        skuId: skuList[0].skuId,
-        skuCode: skuList[0].skuCode,
+        ownerId: skuInfo.ownerId,
+        skuId: skuInfo.skuId,
+        skuCode: skuInfo.skuCode,
       }).then(res=>{
 
         const oldSowWall = this.nowSowSkuInfo.data.sowWallLineCode
@@ -1115,14 +1148,15 @@ export default {
 
         this.setNowSowSkuInfo(res)
 
-        const total = Number(this.skuSow.qty.value || 0) + Number(qty || 0)
+        this.skuSow.qty.value = Number(this.skuSow.qty.value || 0) + Number(qty || 0)
+        /*const total = Number(this.skuSow.qty.value || 0) + Number(qty || 0)
         this.skuSow.qty.value = total
 
         // 如果播种量等于待播种量就自动提交
         if (total === Number(res.waitSowQty || 0)){
           this.skuSowQtyConfirm()
           return
-        }
+        }*/
 
         this.skuSow.sku.focus = true
       })
@@ -1171,26 +1205,45 @@ export default {
 
     // 逐件扫描序列号确认
     snSowConfirm(val,data){
-      const {skuCode, sn, qty} = data.data
+      const {skuCode, sn, qty, key} = data.data
       this.nowSowSkuInfo.animation = false
 
-      const {success, skuList} = this.skuCodeCheck(skuCode)
+      const code = skuCode || key
+      const {success, skuList} = this.skuCodeCheck(code)
       if(!success) return
 
-      if (!sn){
-        this.skuSow.sku.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.hdrtexta','序列号不能为空')
-        )
+      if (skuList){
+        this.snSowConfirmApi(sn, qty, skuList[0])
         return
       }
 
+      // 没有找到商品信息就提交给后台找
+      projectWmsOutboundFrontSkuScan({
+        sn: sn || key,
+        qty,
+        limitSkuIds: this.startSow.data.skuList.map(item=>item.skuId)
+      }).then(res=>{
+        if(res && Object.keys(res).length){
+          const skuInfo = this.startSow.data.skuList.filter(item=>item.skuId===res.skuId)[0]
+
+          this.snSowConfirmApi(res.sn, res.qty, skuInfo)
+          return
+        }
+
+        this.snSow.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.sow.action.xtpkcohvA','商品号输入有误，没有查询到商品信息')
+        )
+      })
+    },
+    // 逐件扫描 - 提交api
+    snSowConfirmApi(sn, qty, skuInfo){
       const scanData = {
         sn,
-        qty: qty || skuList[0].minSellQty,
-        ownerId: skuList[0].ownerId,
-        skuId: skuList[0].skuId,
-        skuCode: skuList[0].skuCode,
+        qty: qty || skuInfo.minSellQty,
+        ownerId: skuInfo.ownerId,
+        skuId: skuInfo.skuId,
+        skuCode: skuInfo.skuCode,
         sowWallId: this.sowData.sowWallId,
         sowLot: this.sowData.sowLot,
         pickContainer: this.startSow.pickContainer.value,
@@ -1254,8 +1307,6 @@ export default {
 
       !isSn && this.clearSkuSowData()
 
-      !isSn && this.cutPickContainer()
-
       if(this.checkSowOver(res)) return
 
       this.getData(true, isSn)