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

package/src/views/wms/page/outbound/pick/components/exchangePickContainer.vue

@@ -0,0 +1,464 @@
+<!--
+  换容器拣选
+  @author: 张文
+  @date: 2023-08-22
+-->
+<template>
+  <div class="lw-global-flex-between lw-global-row">
+
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('','托盘号')"
+      :value="item.fromLpn"
+      val-bold
+      :is-row="false"
+    />
+
+    <lw-button
+      v-if="item.canExchangePick"
+      mini
+      @click="popup.show=true"
+    >
+      {{ $lwLanguage.get('', '换容器拣选') }}
+    </lw-button>
+
+    <!-- 换容器拣选弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('','换容器拣选')"
+      v-model="popup.show"
+      @open="popupOpen"
+      @opened="popupOpened"
+      @closed="popupOff"
+    >
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','托盘号')"
+        :value="item.fromLpn"
+        val-bold
+        is-row-start
+      />
+
+      <div
+        style="align-items: flex-start"
+        class="lw-global-row lw-global-flex-between"
+      >
+
+        <div style="flex: 1;margin-right: 10px">
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('','商品')"
+            :value="item.skuCode"
+            val-bold
+            :is-row="false"
+          />
+
+          <div class="lw-global-title">{{ item.skuName }}</div>
+        </div>
+
+        <lw-tag
+          v-if="item.skuSizeLabel"
+          style="flex-shrink: 0"
+          plain
+          round
+        >
+          {{ item.skuSizeLabel }}
+        </lw-tag>
+
+
+      </div>
+
+      <lw-data-look-bg
+        class="lw-global-row"
+        type="null"
+        :show-end-line="false"
+        need-show
+      >
+
+        <lw-data-look-item
+          :title="$lwLanguage.get('','单位量')"
+          :value="item.uomQty"
+        />
+
+        <lw-data-look-item
+          :title="$lwLanguage.get('', '待拣量')"
+          :value="caseLabelStr(item.waitPickQty)"
+        />
+
+        <lw-data-look-item
+          color="#d50000"
+          :title="$lwLanguage.get('', '需取出量')"
+          :value="caseLabelStr(item.exchangePickTakeQty)"
+        />
+
+      </lw-data-look-bg>
+
+      <lw-title-value-cell
+        :title="$lwLanguage.get('','库位')"
+        :value="item.fromLocationCode"
+        val-bold
+      />
+
+      <!-- 是否需要序列号 -->
+      <template v-if="item.needHandleSn">
+
+        <lw-input
+          :title="$lwLanguage.get('','物流码/盒码')"
+          v-model="popup.sn.value"
+          :get-focus.sync="popup.sn.focus"
+          :create-rule="$lwScanRule.create('拣选-换容器拣选弹框-序列号','SN')"
+          rule-key="sn"
+          rule-prefix="exchangePickContainerPopup"
+          :owner-id="item.ownerId"
+          :rule-serve-query="item"
+          required
+          @confirm="snConfirm"
+        />
+
+        <lw-scan-data-list-module
+          class="lw-global-row"
+          v-model="popup.snList"
+          row-type="sn"
+          row-id="exchangePickContainer"
+          total-type="sn"
+          total-type-id="exchangePickContainer"
+          start-bright
+        />
+
+      </template>
+      <template v-else>
+        <lw-input
+          :title="$lwLanguage.get('','商品条码')"
+          v-model="popup.sku.value"
+          :get-focus.sync="popup.sku.focus"
+          :create-rule="$lwScanRule.create('拣选-换容器拣选弹框-商品条码','SKU')"
+          rule-key="sku"
+          rule-prefix="exchangePickContainerPopup"
+          :owner-id="item.ownerId"
+          :rule-serve-query="item"
+          @confirm="skuConfirm"
+        />
+
+        <div
+          class="lw-global-row lw-global-flex-between"
+          style="padding: 0"
+        >
+
+          <lw-input
+            v-if="item.uom === 'CS'"
+            style="flex: 1;flex-shrink: 0"
+            :title="$lwLanguage.get('','箱数')"
+            v-model="popup.caseNo.value"
+            :get-focus.sync="popup.caseNo.focus"
+            :show-bottom-border="false"
+            type="digit"
+            @confirm="popup.qty.focus = true"
+          />
+
+          <lw-input
+            style="flex: 1;flex-shrink: 0"
+            :title="item.uom === 'CS' ?
+              $lwLanguage.get('','盒数'):
+              $lwLanguage.get('','数量')
+            "
+            v-model="popup.qty.value"
+            :get-focus.sync="popup.qty.focus"
+            :show-bottom-border="false"
+            :required="item.uom !== 'CS'"
+            type="digit"
+            @confirm="popup.lpn.focus = true"
+          />
+
+
+        </div>
+
+      </template>
+
+
+      <lw-input
+        :title="$lwLanguage.get('','上架托盘')"
+        v-model="popup.lpn.value"
+        :get-focus.sync="popup.lpn.focus"
+        :create-rule="$lwScanRule.create('拣选-换容器拣选弹框-上架托盘','LPN')"
+        rule-key="lpn"
+        rule-prefix="exchangePickContainerPopup"
+        :owner-id="item.ownerId"
+        :rule-serve-query="item"
+        @confirm="popup.loc.focus=true"
+      />
+
+      <lw-input
+        :title="$lwLanguage.get('','上架库位')"
+        v-model="popup.loc.value"
+        :get-focus.sync="popup.loc.focus"
+        :create-rule="$lwScanRule.create('拣选-换容器拣选弹框-上架库位','LOCATION')"
+        rule-key="loc"
+        rule-prefix="exchangePickContainerPopup"
+        :owner-id="item.ownerId"
+        :rule-serve-query="item"
+        required
+        @confirm="confirmExchange"
+      />
+
+
+      <template #button>
+
+        <lw-button @click="confirmExchange">
+          {{ $lwLanguage.get('', '确认') }}
+        </lw-button>
+
+      </template>
+
+    </lw-popup>
+
+  </div>
+</template>
+
+<script>
+
+import {
+  projectWmsOutboundExchangePickCheckSn,
+  projectWmsOutboundExchangePickSubmit
+} from "./../../../../api/outbound/pick/exchangePickContainer";
+
+export default {
+  name: "exchangePickContainer",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+      }
+    },
+
+    // 当前拣选容器
+    pickContainer: null,
+    // 当前拣选id
+    pickId: null,
+  },
+  data() {
+    return {
+      popup: {
+        show: false,
+        sn: {
+          value: '',
+          focus: false
+        },
+        snList: [],
+
+        sku: {
+          value: '',
+          focus: false
+        },
+        caseNo: {
+          value: '',
+          focus: false
+        },
+        qty: {
+          value: '',
+          focus: false
+        },
+        lpn: {
+          value: '',
+          focus: false
+        },
+        loc: {
+          value: '',
+          focus: false
+        },
+      },
+    }
+  },
+  methods: {
+    // 箱数转换
+    caseLabelStr(total, qty) {
+      const {uomLabel, eaLabel, uomQty} = this.item
+      const t = Number(total || 0)
+      if (!t) return t
+      const u = Number(qty || uomQty || 1)
+
+      let msg = ''
+      const digit = Math.floor(t / u)
+      if (digit) msg += (digit + uomLabel)
+
+      const num = t % u
+      if (num) msg += num + eaLabel
+
+      return `${msg}(${t})`
+
+    },
+
+
+    // 弹框 - 打开
+    popupOpen() {
+      this.popup.lpn.value = this.pickContainer
+      this.popup.loc.value = this.item.fromLocationCode
+    },
+    // 弹框 - 打开完成
+    popupOpened() {
+      if (this.item.needHandleSn) {
+        this.popup.sn.focus = true
+      } else {
+        this.popup.sku.focus = true
+      }
+    },
+    // 弹框 - 关闭
+    popupOff() {
+      this.popup.sn.value = ''
+      this.popup.sku.value = ''
+      this.popup.caseNo.value = ''
+      this.popup.qty.value = ''
+      this.popup.lpn.value = ''
+      this.popup.loc.value = ''
+      this.popup.snList = []
+    },
+    // 弹框 - 商品条码确认
+    skuConfirm() {
+
+      const key = this.item.uom === 'CS' ? 'caseNo' : 'qty'
+
+      this.popup[key].focus = true
+    },
+    // 弹框 - 序列号输入确认
+    snConfirm(val, {data}) {
+
+      const sn = data.sn || data.key
+      if (!sn) {
+        this.popup.sn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '物流码/盒码不能为空')
+        )
+        return
+      }
+
+      if (this.$lwUtils.checkRepeat(this.popup.snList, sn).repeat) {
+        this.$lwToast.fail(
+          this.$lwLanguage.get('', '当前序列号已存在列表中')
+        )
+        return;
+      }
+
+      const {ownerId, fromLpn, skuId} = this.item
+      projectWmsOutboundExchangePickCheckSn({
+        pickId: this.pickId,
+        fromLpn,
+        ownerId,
+        skuId,
+        sn,
+        qty: data.qty || 0
+      }).then(res => {
+
+        const exceed = this.$lwUtils.checkQtyExceed({
+          list: this.popup.snList,
+          check: this.item.exchangePickTakeQty,
+          qty: res.qty
+        })
+        if (exceed.exceed) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '当前取出量【{qty}】大于待取出量【{wait}】，不允许取出', {
+              qty: res.qty,
+              wait: exceed.max
+            })
+          )
+          return
+        }
+
+        this.popup.snList.unshift(res)
+      })
+
+    },
+    // 弹框 - 确认换容器
+    confirmExchange() {
+      const {snList, sku, lpn, loc, caseNo, qty} = this.popup
+      let exchangeQty = 0
+      if (this.item.needHandleSn) {
+        if (!snList.length) {
+          this.popup.sn.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '物流码/盒码不能为空')
+          )
+          return
+        }
+        exchangeQty = snList.reduce((t, i) => Number(i.qty || 0) + t, 0)
+      } else {
+        if (!sku.value) {
+          this.popup.sku.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '请确认商品')
+          )
+          return
+        }
+
+        const {uomQty, skuCode} = this.item
+        if (sku.value !== skuCode) {
+          this.popup.sku.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '确认商品与需要取出商品不一致')
+          )
+          return
+        }
+
+        const caseNum = Number(caseNo.value || 0)
+        const uomNum = Number(qty.value || 0)
+
+        /*if (this.item.uom !== 'CS') {
+
+          this.popup.qty.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '数量不能同时为空，且应当是大于0的正整数')
+          )
+          return
+        } else {
+          if (!caseNum && !uomNum) {
+            this.popup.caseNo.focus = true
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get('', '箱数或盒数不能同时为空，或值为0')
+            )
+            return
+          }
+        }*/
+
+
+        exchangeQty = caseNum * Number(uomQty || 0) + uomNum
+      }
+
+      if (exchangeQty !== Number(this.item.exchangePickTakeQty || 0)) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '当前取出总量与需要取出量不一致')
+        )
+        return
+      }
+
+      if (!loc.value) {
+        this.popup.loc.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '上架库位不能为空')
+        )
+        return
+      }
+
+      const {ownerId, fromLpn, skuId, fromLocationId, lineGroupKey, needHandleSn} = this.item
+      projectWmsOutboundExchangePickSubmit({
+        pickId: this.pickId,
+        ownerId,
+        skuId,
+        fromLpn,
+        fromLocationId,
+        lineGroupKey,
+        currentPickQty: this.item.waitPickQty,
+        currentTakeQty: exchangeQty,
+        targetToLpn: lpn.value,
+        targetToLocation: loc.value,
+        needHandleSn,
+        snList
+      }).then(res => {
+        this.$emit('exchangeSuccess', res, fromLpn)
+        this.popup.show = false
+      })
+
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/outbound/pick/components/skuLocationInfo/index.vue

@@ -21,18 +21,27 @@
         <div style="flex-shrink: 0">
 
           <!-- 尺寸 -->
+          <!--          <lw-tag
+                      v-if="item.skuSizeLabel"
+                      plain
+                      round
+                    >
+                    {{ item.skuSizeLabel }}
+                    </lw-tag>-->
           <lw-tag
-            v-if="item.skuSizeLabel"
             plain
             round
-          >{{ item.skuSizeLabel }}</lw-tag>
+          >
+            {{ item.uom + ' - ' + item.uomLabel }}
+          </lw-tag>
 
           <!-- 拣选状态 -->
           <lw-tag
             plain
             round
             :type="pickStatus.type"
-          >{{ pickStatus.msg }}</lw-tag>
+          >{{ pickStatus.msg }}
+          </lw-tag>
         </div>
       </div>
 
@@ -54,63 +63,48 @@
         :is-row="false"
       />
 
-      <lw-title-value-cell
-        v-if="waitPick"
-        :title="item.uomLabel.top"
-        :value="item.uomQty"
-        val-bold
-        val-red
-        :is-row="false"
-      />
-      <lw-title-value-cell
-        v-else
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.fwtrskro','已拣选/计划')"
-        :value="item.pickQty + ' / ' + item.totalQty"
-        val-bold
-        val-red
-        :is-row="false"
-      />
+      <!--      <lw-title-value-cell
+              v-if="waitPick"
+              :title="item.uomLabel"
+              :value="item.uomQty"
+              val-bold
+              val-red
+              :is-row="false"
+            />
+            <lw-title-value-cell
+              v-else
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.fwtrskro','已拣选/计划')"
+              :value="item.pickQty + ' / ' + item.totalQty"
+              val-bold
+              val-red
+              :is-row="false"
+            />-->
     </div>
 
     <!-- 数据看板 -->
-    <div
+    <lw-data-look-bg
       v-if="waitPick"
-      class="lw-global-flex-around"
-      style="margin-top: 10px"
+      type="null"
+      :show-end-line="false"
+      need-show
     >
 
-      <!-- 最小单位数 -->
-      <div style="text-align: center">
-        <div
-          class="lw-global-value-bold"
-          style="font-size: 16px"
-        >{{ topNum }}</div>
-        <div class="lw-global-title">{{ item.uomLabel.table }}</div>
-      </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.spymmddbc', '单位量')"
+        :value="item.uomQty"
+      />
 
-      <!-- 总量 -->
-      <div style="text-align: center">
-        <div
-          class="lw-global-value-bold"
-          style="font-size: 16px"
-        >{{ item.pickQty }} / {{ item.totalQty }}</div>
-        <div class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.spymmddb','总量') }}
-        </div>
-      </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.spymmddb','总量')"
+        :value="item.pickQtyLabel + ' / ' + item.totalQtyLabel"
+      />
 
-      <!-- 待拣量 -->
-      <div style="text-align: center">
-        <div
-          class="lw-global-value-bold-red"
-          style="font-size: 16px"
-        >{{ waitQty }}</div>
-        <div class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.ghoxuwxz','待拣量') }}
-        </div>
-      </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.ghoxuwxz','待拣量')"
+        :value="item.waitPickQtyLabel"
+      />
 
-    </div>
+    </lw-data-look-bg>
 
     <!-- 批次数据 -->
     <div
@@ -144,14 +138,14 @@ export default {
     // 显示最小销售量
     waitPick: Boolean
   },
-  computed:{
+  computed: {
     // 徽标
     pickStatus() {
       switch (this.item.pickStatus) {
         case '100':
           return {
             type: 'danger',
-            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.dgwlpfxf','未拣选')
+            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.dgwlpfxf', '未拣选')
           }
         case '200':
           return {
@@ -161,41 +155,16 @@ export default {
         case '300':
           return {
             type: 'success',
-            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.gfspoqjr','已拣选')
+            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.gfspoqjr', '已拣选')
           }
         default:
           return {
             type: 'primary',
-            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.hrcwcwcb','未知')
+            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.hrcwcwcb', '未知')
           }
       }
     },
 
-    // 待拣量
-    waitQty(){
-      return Number(this.item.totalQty || 0) - Number(this.item.pickQty || 0)
-    },
-
-    // 最小单位数
-    topNum(){
-      function dig(num){
-        const str = num.toString()
-        if (str && str.includes('.') && str.length > 4){
-          return num.toFixed(2)
-        }
-        return  num
-      }
-
-      const uomQty = Number(this.item.uomQty || 0)
-      if (uomQty === 0) {
-        console.warn(this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.xdvunhnd', '拣选最小单位数据异常，无法做除法运算！值为：'),this.item.uomQty)
-        return 0
-      }
-
-      const mother = dig(Number(this.item.totalQty || 0) / uomQty)
-      const son = dig(Number(this.item.pickQty || 0) / uomQty)
-      return son + ' / ' + mother
-    }
   },
   data() {
     return {}

package/src/views/wms/page/outbound/pick/components/sowList.vue

@@ -76,7 +76,7 @@
 
           <lw-title-value-cell
             :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.sowList.idqomvls','已拣选/计划')"
-            :value="i.pickQty + ' / ' + i.totalQty"
+            :value="i.pickQtyLabel + ' / ' + i.totalQtyLabel"
             val-red
             val-bold
             :is-row="false"
@@ -124,6 +124,7 @@ export default {
         item.sowWallLineCode = item.sowLineCode
         item.sowPositionContainer = item.containerNo
         item.sowQty = item.pickQty
+        item.sowQtyLabel = item.pickQtyLabel
         return item
       })
     }

package/src/views/wms/page/outbound/pick/components/splitPutDown/index.vue

@@ -55,6 +55,7 @@
         :get-focus.sync="container.focus"
         required
         rule-key="putContainer"
+        rule-prefix="pick/splitPutDown"
         @confirm="containerConfirm"
       />
 
@@ -64,6 +65,7 @@
         :get-focus.sync="locationCode.focus"
         :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.splitPutDown.wrmlggbk','默认为移动虚拟库位')"
         rule-key="putLocation"
+        rule-prefix="pick/splitPutDown"
         @confirm="locationCodeConfirm"
       />
     </template>