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

package/src/views/wms/page/outbound/bale/aloneBale/action/index.vue

@@ -16,14 +16,9 @@
         <!-- 容器信息 -->
         <container-info
           :container="packContainer.pickContainer"
-          :customer-count="packContainer.customerCount"
-          :sku-count="packContainer.skuTypeCount"
-          :over-count="packContainer.packQty"
-          :wait-count="packContainer.waitPackQty"
-          :abnormal-count="packContainer.abnormalQty"
           :sku-list="packContainer.packSkuList"
+          :label-qty-list="packContainer.labeledQtyList"
           show-abn-btn
-          show-customer
           :abn-confirm="abnConfirm"
           @abnSuccess="mixinAbnSuccess"
         />
@@ -41,10 +36,11 @@
             :get-focus.sync="sku.focus"
             required
             rule-key="sku"
+            :create-rule="$lwScanRule.create('独立捆包-执行页-商品条码','SKU')"
             @confirm="skuConfirm"
           />
 
-          <template v-if="Object.keys(nowScanSkuInfo).length">
+          <template v-if="showNowScanSkuInfo">
             <lw-input
               v-if="sn.show"
               :title="$lwLanguage.get('wms_project.pda.outbound.aloneBale.sn','序列号')"
@@ -52,39 +48,30 @@
               :get-focus.sync="sn.focus"
               required
               rule-key="sn"
+              :create-rule="$lwScanRule.create('独立捆包-执行页-序列号','SN')"
               @confirm="snConfirm"
             />
 
-            <lw-input
+            <lw-get-qty-by-type
+              v-else
               :title="$lwLanguage.get('wms_project.pda.outbound.aloneBale.qty','复核数量')"
-              v-model="qty.value"
-              :get-focus.sync="qty.focus"
-              :disabled="sn.show"
-              required
+              ref="qty"
+              :sku-id="nowScanSkuInfo.skuId"
               @confirm="qtyConfirm"
             >
-
               <template #button>
 
-
-                <lw-tag
-                  v-if="sn.show"
-                  round
-                  plain
-                  type="danger"
-                >{{ $lwLanguage.get('wms_project.pda.outbound.aloneBale.notChange', '不可修改') }}
-                </lw-tag>
                 <lw-button
-                  v-else
                   round
                   mini
                   @click="qtyConfirm"
-                >{{ $lwLanguage.get('wms_project.pda.outbound.aloneBale.confirm', '确认') }}
+                >
+                  {{ $lwLanguage.get('wms_project.pda.outbound.aloneBale.confirm', '确认') }}
                 </lw-button>
 
               </template>
 
-            </lw-input>
+            </lw-get-qty-by-type>
 
             <lw-sku-info-module
               :sku-name="nowScanSkuInfo.skuName"
@@ -95,7 +82,7 @@
 
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.outbound.aloneBale.needQty','当前客户需求量')"
-              :value="nowScanSkuInfo.currentSkuCustomerNeedPackQty"
+              :value="nowScanSkuInfo.currentSkuCustomerNeedPackQtyLabel"
               val-bold
               val-red
             />
@@ -133,7 +120,7 @@
 
           <lw-title-value-cell
             :title="$lwLanguage.get('wms_project.pda.outbound.aloneBale.needQty','当前客户需求量')"
-            :value="submitSuccessData.currentSkuCustomerNeedPackQty"
+            :value="submitSuccessData.currentSkuCustomerNeedPackQtyLabel"
             val-bold
             val-red
           />
@@ -150,14 +137,19 @@
 
         </div>
       </template>
-      <!-- 客户信息 -->
-      <template v-if="showStoreModel">
-
+      <!-- 捆包信息 -->
+      <div
+        v-if="showPackInfo"
+        style="margin-top: 10px"
+      >
 
-        <div style="padding: 15px 0 5px ">
+        <div
+          v-if="packBox.customerCode"
+          style="padding-bottom: 5px "
+        >
 
           <span class="lw-global-value-bold">{{ packBox.customerCode }}</span>
-          <span> - </span>
+          <span> / </span>
           <span class="lw-global-title">{{ packBox.customerName }}</span>
 
         </div>
@@ -189,7 +181,7 @@
                     style="flex-shrink: 0"
                     mini
                     round
-                    @click="printClick"
+                    @click="printClick(true)"
                   >
                     {{$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.index.ghuxtifq','打印')}}
                   </lw-button>
@@ -202,7 +194,7 @@
                   :qty-text="$lwLanguage.get('wms_project.pda.outbound.aloneBale.pack','已复核')"
                   :sku-name="i.skuName"
                   :sku-code="i.skuCode"
-                  :qty="i.qty"
+                  :qty="i.qtyLabel || i.qty"
                   is-row
                 />
 
@@ -222,7 +214,7 @@
                 :style="{animationDelay: 50 * k + 'ms'}"
               >
                 <lw-sku-info-module
-                  :qty="Number(i.totalQty || 0) - Number(i.packQty || 0)"
+                  :qty="i.waitPackQtyLabel"
                   :sku-code="i.skuCode"
                   :sku-name="i.skuName"
                   :qty-text="$lwLanguage.get('wms_project.pda.outbound.aloneBale.hasQty','需求量')"
@@ -235,14 +227,13 @@
         </lw-tab-box>
 
 
-
-      </template>
+      </div>
 
 
     </div>
 
     <lw-bottom-bar-btn-hidden
-      v-if="showStoreModel"
+      v-if="showPackInfo"
       :btn-list="btnList"
     />
 
@@ -255,7 +246,7 @@
       <container-sku-qty
         v-if="packBox"
         :box-no="packBox.boxNo"
-        :pack-qty="packBox.packQty"
+        :pack-qty="packBox.packQtyLabel"
         :type-count="packBox.skuTypeCount"
       />
 
@@ -288,6 +279,8 @@
         :get-focus.sync="overBalePopup.materials.focus"
         :show-bottom-border="false"
         :required="packTableConfig.forceUseSuggestPackMaterial && overBalePopup.data.suggestPackMaterialCodeListStr"
+        rule-key="packSku"
+        :create-rule="$lwScanRule.create('独立捆包-执行页-捆包包材','SKU')"
         @confirm="materialsConfirm"
       />
 
@@ -364,7 +357,7 @@
         :get-focus.sync="overBalePopup.packedLocation.focus"
         :show-bottom-border="false"
         rule-key="packedLocation"
-        :create-rule="$lwScanRule.create('复核捆包 - 执行捆包 - 放置库位','LOCATION')"
+        :create-rule="$lwScanRule.create('复核捆包-执行捆包-放置库位','LOCATION')"
         required
         @confirm="overBaleConfirm"
       />
@@ -496,16 +489,17 @@ export default {
 
       // 捆包台配置信息
       packTableConfig:{},
-
-      // 打印机数据
-      printData:{},
     }
   },
-  computed:{
+  computed: {
     // 是否显示客户模块
-    showStoreModel(){
-      return !!this.packBox.customerCode
+    showPackInfo() {
+      return !!this.packBox.boxNo
     },
+    // 是否显示当前扫描数据模块
+    showNowScanSkuInfo() {
+      return !!Object.keys(this.nowScanSkuInfo).length
+    }
   },
   mounted() {
     this.init()
@@ -547,13 +541,12 @@ export default {
     },
 
     // 清空输入框及当前扫描的数据
-    clearInputAndScanData(){
-      this.nowScanSkuInfo = {}
+    clearInputAndScanData() {
       this.sku.value = ''
       this.sku.focus = true
-      this.qty.value = ''
       this.sn.value = ''
       this.sn.show = false
+      this.$nextTick(() => this.nowScanSkuInfo = {})
     },
     // 商品号确认
     skuConfirm(val, {data}){
@@ -570,7 +563,6 @@ export default {
       if (this.sn.show){
         this.packBox = {}
         this.nowScanSkuInfo = {}
-        this.qty.value = 0
       }
 
       projectWmsAlonePackScanSubmit({
@@ -594,22 +586,22 @@ export default {
     // 数量确认
     qtyConfirm(){
 
-      const qty = Number(this.qty.value || 0)
+      const qty = this.$refs.qty?.getQty() || 0
 
       if (!qty){
-        this.qty.focus = true
+        this.$refs.qty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.ywbtitmp','复核数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.ywbtitmp', '复核数量不能为空，且应当是大于0的整数')
         )
         return
       }
 
       if (qty > this.nowScanSkuInfo.currentSkuCustomerNeedPackQty){
-        this.qty.focus = true
+        this.$refs.qty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.smmmcisz','复核数量不能大于待复核量')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.smmmcisz', '复核数量不能大于待复核量')
         )
-        this.qty.value = ''
+        this.$refs.qty?.clearInput()
         return
       }
 
@@ -662,40 +654,38 @@ export default {
       const skuData = {
         ...res.skuData,
         currentSkuCustomerNeedPackQty: res.currentSkuCustomerNeedPackQty,
+        currentSkuCustomerNeedPackQtyLabel: res.currentSkuCustomerNeedPackQtyLabel,
         suggestPackMaterial: res.suggestPackMaterial
       }
 
       // 判断当前扫描数据是否被复核
       if (res.successPackQty && res.successPackQty > 0){
         this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.sgdxsnar','已复核')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.sgdxsnar', '已复核')
         )
         this.submitSuccessData = skuData
 
         // 判断当前商品是否还需要复核
-        if (!res.currentSkuCustomerNeedPackQty){
+        if (!res.currentSkuCustomerNeedPackQty) {
           this.clearInputAndScanData()
           return
         }
       }
 
-      if (res.needHandleSn){
+      this.nowScanSkuInfo = skuData
+
+      if (res.needHandleSn) {
         this.sn.show = true
         this.sn.value = ''
         this.sn.focus = true
-      }else {
+        this.sn.qty = skuData.qty
+      } else {
+        this.sn.show = false
         this.sku.value = ''
         this.sku.focus = true
+        this.$nextTick(() => this.$refs.qty.setQty(this.$refs.qty?.getQty() || 0 + skuData.qty))
       }
 
-      this.nowScanSkuInfo = skuData
-
-      if (this.nowScanSkuInfo.sn){
-        this.qty.value = skuData.qty
-      }else {
-        this.qty.value = Number(this.qty.value || 0) + skuData.qty
-        if (this.qty.value === skuData.currentSkuCustomerNeedPackQty) this.qtyConfirm()
-      }
     },
 
 
@@ -728,7 +718,7 @@ export default {
       )
 
       try {
-        await this.printClick()
+        await this.printClick(false)
       }finally {
         history.go(-1)
       }
@@ -857,7 +847,7 @@ export default {
 
         this.overBalePopup.materials.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.index.ojqymrlr','捆包包材必须使用推荐的捆包包材，推荐包材：{code}',{code:this.overBalePopup.data.suggestPackMaterialCodeListStr})
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.index.ojqymrlr', '捆包包材必须使用推荐的捆包包材，推荐包材：{code}', {code: this.overBalePopup.data.suggestPackMaterialCodeListStr})
         )
         this.overBalePopup.materials.value = ''
         return
@@ -867,7 +857,8 @@ export default {
     },
 
     // 打印
-    async printClick(){
+    async printClick(need) {
+      if (!this.mixinPrintCheck(need)) return
 
       try {
         const res = await projectWmsGetPrintBoxData({
@@ -875,8 +866,8 @@ export default {
           printDeviceId: this.printData.printId
         })
 
-        await this.$lwPrint.bluetoothPrint({taskId:res.id})
-      }catch (e){
+        await this.$lwPrint.bluetoothPrint({taskId: res.id})
+      } catch (e) {
         console.log(e)
       }
     }

package/src/views/wms/page/outbound/bale/aloneBale/index/index.vue

@@ -40,14 +40,20 @@
             :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.index.kynhtubi','已捆包')"
           >
             <store-info
-              v-for="(i,k) in baleOver"
+              v-for="(i,k) in baleOver.data"
               :key="k"
               :item="i"
               :index="k"
               is-over
               @btnClick="baleOverBtnClick(i)"
             />
-            <lw-not-data v-if="!baleOver.length"/>
+            <lw-pagination
+              v-model="baleOver.pageNum"
+              :page-size.sync="baleOver.pageSize"
+              :page-total="baleOver.pageTotal"
+              @change="getBaleOver"
+            />
+            <lw-not-data v-if="!baleOver.data.length"/>
           </van-tab>
 
         </van-tabs>
@@ -87,13 +93,18 @@ export default {
       tabActive: 'ing',
 
       // 捆包中的数据
-      baleIng:[],
+      baleIng: [],
 
       // 已捆包的数据
-      baleOver:[],
+      baleOver: {
+        data: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+      },
 
       // 打印机数据
-      printData:{}
+      printData: {}
     }
   },
   mounted() {
@@ -106,7 +117,7 @@ export default {
       if (this.tabActive === 'ing'){
         !this.baleIng.length && this.getBaleIng()
       }else {
-        !this.baleOver.length && this.getBaleOver()
+        !this.baleOver.data.length && this.getBaleOver()
       }
 
     },
@@ -120,8 +131,12 @@ export default {
 
     // 获取已捆包的数据
     getBaleOver() {
-      projectWmsOutboundQueryAlonePackedBox().then(res=>{
-        this.baleOver = res || []
+      projectWmsOutboundQueryAlonePackedBox({
+        pageNum: this.baleOver.pageNum,
+        pageSize: this.baleOver.pageSize,
+      }).then(res => {
+        this.baleOver.data = res.datas
+        this.baleOver.pageTotal = res.total
       })
     },
 
@@ -145,13 +160,14 @@ export default {
     // 已捆包的数据点击
     async baleOverBtnClick(item){
 
-      if (!Object.keys(this.printData).length){
+      if (!this.printData.printId) {
         // 判断当前是否配置了打印机
-        const {success,printData} = this.$lwPrint.test(
+        const {success, printData} = this.$lwPrint.test(
           'OUTBOUND_BOX_LABEL',
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.index.index.ycqdqjer','出库箱票标签')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.index.index.ycqdqjer', '出库箱票标签'),
+          true
         )
-        if (!success)return
+        if (!success) return
 
         this.printData = printData
 

package/src/views/wms/page/outbound/bale/aloneBale/newBale/index.vue

@@ -24,6 +24,7 @@
           v-model="container.value"
           :get-focus.sync="container.focus"
           rule-key="boxNo"
+          :create-rule="$lwScanRule.create('独立捆包-新捆包-容器号','CONTAINER')"
           @confirm="containerConfirm"
         />