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

package/src/views/wms/page/outbound/pick/notAlone/index.vue

@@ -19,27 +19,51 @@
   >
 
     <div
-      style="margin-bottom: 10px"
-      class="lw-global-model-box lw-global-model-box-3px"
+      style="margin-bottom: 10px;"
+      class="lw-global-model-box"
     >
+      <div class="lw-global-flex-start">
+
+        <div class="lw-global-title lw-global-required">
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.unljebyh', '拣选容器号') }}
+        </div>
+
+        <lw-button
+          v-if="!container.confirm"
+          style="margin-left: 10px"
+          mini
+          type="last"
+          @click="createContainer()"
+        >
+          {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pick.notAlone.index.ydsbtouh', '生成容器号') }}
+        </lw-button>
+      </div>
       <lw-input
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.unljebyh','拣选容器号')"
         v-model="container.value"
         :get-focus.sync="container.focus"
         :disabled="container.confirm"
         :create-rule="$lwScanRule.create('非独立件拣选-拣选容器号','CONTAINER')"
         rule-key="container"
         :rule-serve-query="nowPickData"
-        required
         :show-bottom-border="false"
         @confirm="containerBtnClick"
       >
         <template #button>
+          <lw-button
+            v-if="container.confirm"
+            type="last"
+            plain
+            mini
+            @click="reprint"
+          >
+            {{ $lwLanguage.get('', '补打') }}
+          </lw-button>
           <lw-button
             round
             mini
             @click="containerBtnClick"
-          >{{
+          >
+            {{
               container.confirm ?
                 $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.txptjnap', '切换容器') :
                 $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.qfccyeko', '确定')
@@ -77,10 +101,19 @@
                 v-if="nowPickData.fromLpn"
                 :item="nowPickData"
                 :pick-container="container.value"
-                :pick-id="pickData.pickId"
+                :pick-id="apiCommonParam.pickId"
                 @exchangeSuccess="mixinAlonePickSuccessCheck"
               />
 
+              <!-- 托盘剩余量 -->
+              <lw-title-value-cell
+                v-if="nowPickData.showRemainQty"
+                style="background: yellow"
+                :title="$lwLanguage.get('', '托盘剩余量')"
+                :value="nowPickData.remainQtyLabel"
+                val-bold
+              />
+
               <!-- 箱号 -->
               <lw-title-value-cell
                 v-if="nowPickData.fromCase"
@@ -89,6 +122,15 @@
                 val-bold
               />
 
+              <!-- 最大可拣量 -->
+              <lw-title-value-cell
+                v-if="nowPickData.showMaxPickQty"
+                :title="$lwLanguage.get('', '最大可拣量')"
+                :value="nowPickData.maxPickQtyLabel"
+                val-bold
+                val-red
+              />
+
               <!-- 库位 -->
               <lw-input
                 v-if="mixinNeedInputLoc"
@@ -145,6 +187,14 @@
               />
               <!-- 序列号 -->
               <template v-if="nowPickData.needHandleSn">
+                <lw-scan-data-list-module v-if="nowPickData.limitPickSnList?.length"
+                  class="lw-global-group-base-color"
+                  :title="$lwLanguage.get('', '待拣序列号')"
+                  v-model="nowPickData.limitPickSnList"
+                  :is-change="false"
+                  :row-title="$lwLanguage.get('', '序列号')"
+                  :edit-text="$lwLanguage.get('', '查看全部')"
+                />
                 <lw-input
                   ref="snInp"
                   :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.gwtjldug','序列号')"
@@ -155,7 +205,7 @@
                   rule-key="sn"
                   :rule-serve-query="nowPickData"
                   :owner-id="nowPickData.ownerId"
-                  @confirm="mixinAloneSnConfirm"
+                  @confirm="snConfirm"
                 />
                 <lw-scan-data-list-module
                   row-type="sn"
@@ -198,6 +248,20 @@
                 </lw-get-qty-by-type>
               </template>
 
+              <!-- 打印原标签开关 -->
+              <div
+                v-if="nowPickData.remainQty > 0"
+                class="lw-global-row lw-global-flex-between"
+              >
+                <div class="lw-global-title">
+                  {{ $lwLanguage.get('', '打印原标签') }}
+                </div>
+
+                <van-switch
+                  v-model="printOldLabel.open"
+                  size="18px"
+                />
+              </div>
 
               <lw-cut-card
                 v-model="taskIndex"
@@ -212,7 +276,7 @@
 
           <!-- 拣选明细行 -->
           <van-tab
-            :title="$lwLanguage.get('','待拣列表')"
+            :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pick.notAlone.index.oposmrhb', '待拣列表')"
             name="wait"
           >
 
@@ -256,7 +320,17 @@
         rule-key="cutContainer"
         :create-rule="$lwScanRule.create('非独立件拣选-新容器','CONTAINER')"
         @confirm="containerConfirm"
-      />
+      >
+        <template #button>
+          <lw-button
+            mini
+            type="last"
+            @click="createContainer('popup')"
+          >
+            {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pick.notAlone.index.ydsbtouh', '生成容器号') }}
+          </lw-button>
+        </template>
+      </lw-input>
 
       <template #button>
         <lw-button @click="containerConfirm">
@@ -279,9 +353,10 @@ import {all} from "../mixin/all";
 import {aloneAndNotAlone} from "../mixin/aloneAndNotAlone";
 import {
   projectQueryStandardPickData,
-  projectWmsOutboundPickCheckContainer,
+  projectWmsOutboundPickCheckContainer, projectWmsOutboundPickPrint,
   projectWmsOutboundStandardPick
 } from "../../../../api/outbound/pick/notAlone";
+import {projectWmsOutboundPickCheckSn} from "../../../../api/outbound/pick/alone";
 
 export default {
   name: "lwOutboundPickNotAloneActionPage",
@@ -310,12 +385,74 @@ export default {
         }
       },
 
+
+      // 打印机
+      printLpnData: {},
+      // 是否打印原标签开关
+      printOldLabel: {
+        open: false,
+      },
+
+      // TODO 开发数据
+      needSnList: [
+        {sn: 123, qty: 1}
+      ]
     }
   },
   mounted() {
-    this.getData()
+    this.getData().then(() => {
+      // 检验是否自带扫描托盘号拣选
+      const pickLpn = this.$route.query.pickLpn
+      if (this.hasLpn && pickLpn) {
+        const pending = this.pickData.pendingPickLineList || []
+        for (let i = 0; i < pending.length; i++) {
+          const item = pending[i]
+          if (item.fromLpn === pickLpn) {
+            this.taskIndex = i
+            this.lpn.value = pickLpn
+            this.mixinAloneLpnConfirm(
+              pickLpn,
+              {data: {key: pickLpn, lpn: pickLpn}}
+            )
+            break
+          }
+        }
+      }
+    })
+    this.checkLpnPrint()
   },
   methods: {
+
+    // 托盘打印机校验
+    checkLpnPrint(needCheck) {
+
+      if (this.printLpnData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test({
+        templateCode: 'PART_RECEIVE_LABEL',
+        msg: this.$lwLanguage.get('', '托盘标签'),
+        msgType: needCheck ? 'HARD' : ''
+      })
+      this.printLpnData = printData
+      return success
+    },
+
+    // 补打拣选容器
+    reprint() {
+      projectWmsOutboundPickPrint({
+        ...this.apiCommonParam,
+        soId: this.$route.query.soId,
+        pickId: this.pickData.pickId,
+        containerNo: this.container.value,
+        type: 'container',
+        printDeviceId: this.createLpnPrintData.printId,
+        printTemplate: this.createLpnPrintData.templateId
+      }).then(res => {
+        res.ids?.forEach(item => {
+          this.$lwPrint.bluetoothPrint(item)
+        })
+      })
+    },
     // 拣选容器按钮点击
     containerBtnClick() {
       if (this.container.confirm) {
@@ -333,7 +470,7 @@ export default {
 
       const container = this.container.confirm ? this.container.popup.value : this.container.value
       projectWmsOutboundPickCheckContainer({
-        pickId: this.pickData.pickId,
+        ...this.apiCommonParam,
         pickNo: this.pickData.pickNo,
         pickContainer: container
       }).then(() => {
@@ -367,12 +504,15 @@ export default {
 
     // 获取数据
     getData() {
-      projectQueryStandardPickData({
-        pickId: this.$route.query.lwPickId
-      }).then(this.mixinAloneFormatData).catch((e) => {
-        console.log(e)
-        history.go(-1)
+      return new Promise((resolve) => {
+        projectQueryStandardPickData(this.apiCommonParam).then(res => {
+          this.mixinAloneFormatData(res)
+
+          resolve()
+
+        }).catch(() => history.go(-1))
       })
+
     },
 
     // 商品确认
@@ -409,49 +549,196 @@ export default {
 
     },
 
+    // 检查指定的序列号是否存在待拣序列号中
+    checkSnExist(sn) {
+      return this.nowPickData.limitPickSnList?.length ? this.nowPickData.limitPickSnList.some(item => item.sn === sn) : true
+    },
+    // 序列号确认
+    snConfirm(val, {data}) {
+
+      const sn = data.sn || data.key
+      if (!sn) {
+        this.$lwLanguage.get('', '序列号不能为空')
+        this.sn.focus = true
+        return
+      }
+
+
+      // 校验序列号是否重复
+      if (this.$lwUtils.checkRepeat(this.sn.list, sn).repeat) {
+        this.$lwToast.fail(
+          this.$lwLanguage.get('', '当前序列号已存在列表中')
+        )
+        return
+      }
+
+
+      // 获取商品信息
+      const item = this.nowPickData
+      projectWmsOutboundPickCheckSn({
+        ownerId: item.ownerId,
+        skuId: item.skuId,
+        sn,
+        qty: data.qty || 0
+      }).then(res => {
+        try {
+          // 校验序列号的商品号是否为当前拣选的商品
+          if (res.skuCode && !this.mixinAllInputCheck({
+            key: 'sku',
+            checkVal: this.nowPickData.skuCode,
+            value: res.skuCode,
+            type: 'value'
+          })) throw new Error()
+
+          // 校验当前序列号是否是必须拣选的序列号
+          if (this.nowPickData.needHandleSn && !this.checkSnExist(res.sn)) {
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get('', '唯一码：【{sn}】不满足当前拣选要求，不允许拣选非待拣序列号！', {sn: res.sn})
+            )
+            throw new Error()
+          }
+
+          /*const nowSnIsNeedPickSn = this.checkSnExist(res.sn)
+          if (!nowSnIsNeedPickSn) {
+            // 必须拣选的sn总量
+            const needPickSnTotal = this.nowPickData.limitPickSnList.reduce((t, item) => item.qty + t, 0)
+
+            // 当前拣选量中不是必须拣选的序列号的数量加当前sn的数量
+            const notNeedPickSnTotal = this.sn.list.reduce((t, item) => {
+              if (this.checkSnExist(item.sn)) return t
+              return item.qty + t
+            }, 0) + res.qty
+
+
+            if (this.nowPickData.waitPickQty === needPickSnTotal) {
+              this.$lwShowErrorMsg(
+                this.$lwLanguage.get('', '唯一码：【{sn}】不满足当前拣选要求，不允许拣选非待拣序列号！', {sn: res.sn})
+              )
+              throw new Error()
+            }
+
+            if ((notNeedPickSnTotal + needPickSnTotal) > this.nowPickData.waitPickQty) {
+              this.$lwShowErrorMsg(
+                this.$lwLanguage.get('', '唯一码：【{sn}】不满足当前拣选要求，请拣选指定的待拣序列号！', {sn: res.sn})
+              )
+              throw new Error()
+            }
+
+          }*/
+
+          // 校验数量是否满足要求
+          if (!this.mixinAloneCheckPickQtyBySn(res).success) throw new Error()
+
+          this.sn.list.unshift(res)
+          throw new Error()
+        } catch {
+          this.sn.focus = true
+          this.sn.value = ''
+        }
+      })
+    },
+
 
     // 切换后
     cutEnd() {
       this.mixinAloneCutEnd()
+      this.printOldLabel.open = false
     },
 
+    // 数量校验
+    checkQty() {
+      let qty = this.$refs.qty?.getQty()
+
+      if (!qty) {
+        this.$refs.qty.getFocus()
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pick.mixin.all.ruoaoxke', '拣选数量不能为空，且应当是大于0的整数')
+        )
+        return false
+      }
+
+      // 判断是否允许超拣，且判断当前拣选量是否大于最大拣选量
+      if (this.nowPickData.showMaxPickQty) {
+        if (qty > this.nowPickData.maxPickQty) {
+          this.$refs.qty.getFocus()
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '当前拣选量{qty}大于最大可拣量{maxPickQty}，请调整数量！', {
+              qty,
+              maxPickQty: this.nowPickData.maxPickQty
+            })
+          )
+          return false
+        }
+      } else if (qty > Number(this.nowPickData.waitPickQty)) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '拣选数量不能大于待拣量')
+        )
+        return false
+      }
+
+      return true
+    },
     // 数量确认
     qtyConfirm() {
-      if (this.mixinAllCheckQty()) this.pickConfirm()
+      if (this.checkQty()) this.pickConfirm()
+    },
+
+    // sn校验
+    snCheck() {
+      if (!this.sn.list.length) {
+        this.sn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.xazaxefu', '序列号不能为空')
+        )
+        return false
+      }
+
+      const qty = this.sn.list.reduce((t, i) => Number(i.qty || 0) + t, 0)
+      // 判断是否允许超拣，且判断当前拣选量是否大于最大拣选量
+      if (this.nowPickData.showMaxPickQty) {
+        if (qty > this.nowPickData.maxPickQty) {
+          this.$refs.qty.getFocus()
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '当前拣选量{qty}大于最大可拣量{maxPickQty}，请调整数量！', {
+              qty,
+              maxPickQty: this.nowPickData.maxPickQty
+            })
+          )
+          return false
+        }
+      }
+
+      return true
     },
 
 
     // 确认拣选
     async pickConfirm() {
 
-      if (!this.checkAllInput() || !this.mixinAllCheckQty()) return
+      if (!this.checkAllInput()) return
 
       const item = this.nowPickData
 
       let data = {}
       if (item.needHandleSn) {
 
-        if (!this.sn.list.length) {
-          this.sn.focus = true
-          this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.index.xazaxefu', '序列号不能为空')
-          )
-          return
-        }
+        if (!this.snCheck()) return
 
         data = {
           currentPickQty: this.sn.list.reduce((t, i) => Number(i.qty || 0) + t, 0),
           snList: this.sn.list
         }
       } else {
+        if (!this.checkQty()) return
         data = {
           currentPickQty: this.mixinAllGetQty(),
         }
       }
 
 
+      const {printId = '', templateId = ''} = this.printLpnData
       const res = await projectWmsOutboundStandardPick({
-        pickId: this.pickData.pickId,
+        ...this.apiCommonParam,
         pickNo: this.pickData.pickNo,
         fromLocationId: item.fromLocationId,
         fromLpn: item.fromLpn,
@@ -466,12 +753,32 @@ export default {
         lineGroupKey: item.lineGroupKey,
         actualPickLpn: this.lpn.value,
         actualPickCaseNum: this.box.value,
+        printDeviceId: printId,
+        printTemplate: templateId,
+        needPrintOldLpnLabel: this.printOldLabel.open,
         ...data
       })
 
+      // 打印原始标签
+      if (this.printOldLabel.open) {
+        res.printList?.forEach(item => this.$lwPrint.bluetoothPrint(item.id))
+      }
+
       await this.mixinAlonePickSuccessCheck(res)
 
     },
+
+
+    // 生成容器
+    async createContainer(type) {
+      const container = await this.mixinAllCreateContainerApi()
+      if (type === 'popup') {
+        this.container.popup.value = container
+      } else {
+        this.container.value = container
+        this.containerBtnClick()
+      }
+    }
   }
 }
 </script>

package/src/views/wms/page/outbound/pick/sow/index.vue

@@ -6,8 +6,7 @@
 <template>
   <div>
 
-    <lw-nav-bar
-      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.kbenunwi','边拣边分')"/>
+    <lw-nav-bar :title="title"/>
 
     <lw-page-body-module>
 
@@ -190,7 +189,7 @@
                               <lw-input
                                 v-if="nowPickData.uom==='CS'"
                                 style="flex: 1"
-                                :title="$lwLanguage.get('','箱数')"
+                                :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pick.sow.index.mqyapdms', '箱数')"
                                 v-model="caseNo.value"
                                 :get-focus.sync="caseNo.focus"
                                 type="digit"
@@ -200,7 +199,7 @@
                               <lw-input
                                 style="flex: 1"
                                 :title="nowPickData.uom==='CS'?
-                                  $lwLanguage.get('','盒数'):
+                                  $lwLanguage.get('wms_project.pda.wms.page.outbound.pick.sow.index.srszxgtq', '盒数'):
                                   $lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.busfurmf','数量')
                                 "
                                 v-model="qty.value"
@@ -241,7 +240,7 @@
 
           <van-tab
             name="line"
-            :title="$lwLanguage.get('','待拣列表')"
+            :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pick.sow.index.qxbusntt', '待拣列表')"
           >
 
             <wait-pick-collapse-item
@@ -427,7 +426,7 @@
           <div class="col-1">
             <lw-input
               v-model="i.allocateSowQty"
-              type="digit"
+              type="number"
               input-align="center"
               :show-bottom-border="false"
             />
@@ -662,7 +661,7 @@ export default {
   mixins: [all],
   data() {
     return {
-
+      title: '',
       // 拣选小车
       sowCar: {
         // 是否已绑定
@@ -773,7 +772,7 @@ export default {
     // 调用接口时候需要的数据
     actionQuery() {
       return {
-        pickId: this.pickData.pickId,
+        ...this.apiCommonParam,
         pickNo: this.pickData.pickNo,
         pickSowToolCode: this.pickData.pickSowToolCode,
         fromLocationId: this.nowPickData.fromLocationId,
@@ -793,14 +792,15 @@ export default {
 
   },
   mounted() {
+    this.title = this.$route.query.deliveryId ?
+      this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pick.sow.index.vkhyxknq', '按运单拣选装车') :
+      this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.kbenunwi', '边拣边分')
     this.getTaskData()
   },
   methods: {
     // 获取任务数据
     getTaskData() {
-      projectQueryPickSowData({
-        pickId: this.$route.query.lwPickId
-      }).then(res => {
+      projectQueryPickSowData(this.apiCommonParam).then(res => {
         this.sowCar.car.value = res.pickSowToolCode || ''
         this.sowCar.needBind = !this.sowCar.car.value
         this.canUnbind = res.canUnbind
@@ -867,7 +867,7 @@ export default {
       }
 
       projectWmsPickSowBind({
-        pickId: this.pickData.pickId,
+        ...this.apiCommonParam,
         pickSowToolCode: val
       }).then(() => {
         this.getTaskData()
@@ -881,7 +881,7 @@ export default {
       }).then(() => {
 
         projectWmsPickSowUnbind({
-          pickId: this.pickData.pickId,
+          ...this.apiCommonParam,
           pickSowToolCode: this.sowCar.car.value
         }).then(() => {
           this.$lwToast.success(
@@ -923,7 +923,7 @@ export default {
       }
 
       projectWmsPickSowBindContainer({
-        pickId: this.pickData.pickId,
+        ...this.apiCommonParam,
         pickSowToolCode: this.sowCar.car.value,
         sowLineCode: sowItem.sowLineCode,
         bindContainer: popup.container.value,
@@ -953,7 +953,7 @@ export default {
         message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.aekhpwnr', '当前绑定容器将会被全部清空')
       }).then(() => {
         projectWmsPickSowRebindContainer({
-          pickId: this.pickData.pickId,
+          ...this.apiCommonParam,
           pickSowToolCode: this.sowCar.car.value
         }).then(() => {
           this.bindContainerPopup.sowList.forEach(item => {

package/src/views/wms/page/outbound/pickConsole/createOrder/index.vue

@@ -6,8 +6,8 @@
 <template>
   <create-order-page
     action-path="/outbound/pickConsole/lwOrderAction"
-  >
-  </create-order-page>
+    operate-type="NORMAL_OUT"
+  />
 </template>
 
 <script>