@logwire/logwire-wms-pda-ui 3.5.5 → 3.5.6

package/src/views/wms/page/outbound/pickConsoleV2/index.vue

@@ -10,28 +10,68 @@
 
     <lw-page-body-module>
 
-      <div class="lw-global-model-box lw-global-model-box-3px">
+      <div
+        style="padding-top: 3px"
+        class="lw-global-model-box"
+      >
         <lw-input
           ref="so"
           :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.ihavrluo', '单号')"
           :placeholder="$lwLanguage.get('', '请扫描或输入订单号/外部单号查询')"
-          v-model="keyword"
+          v-model="search.keyword"
           rule-key="order"
           :create-rule="$lwScanRule.create('按单拣选控制台v2-起始页-单号搜索','SO')"
-          :show-bottom-border="false"
+          input-align="right"
           @confirm="searchConfirm()"
-          @clear="searchConfirm()"
-        >
-          <template #button>
-            <lw-button
-              mini
-              round
-              @click="searchConfirm()"
-            >
-              {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.xrftvnyk', '查询') }}
-            </lw-button>
-          </template>
-        </lw-input>
+        />
+
+        <lw-cell-popup-radio
+          :title="$lwLanguage.get('', '订单类型')"
+          v-model="search.orderType"
+          dict-key="OutboundPlanOrderType"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','订单开始时间')"
+          v-model="search.orderTimeStart"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','订单结束时间')"
+          v-model="search.orderTimeEnd"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','计划开始处理时间')"
+          v-model="search.planHandleTimeStart"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','计划结束处理时间')"
+          v-model="search.planHandleTimeEnd"
+          type="datetime"
+        />
+
+        <div class="lw-global-flex-between lw-global-row-end">
+          <lw-button
+            type="last"
+            small
+            plain
+            block
+            @click="reset"
+          >
+            {{ $lwLanguage.get('', '重置') }}
+          </lw-button>
+
+          <lw-button
+            style="margin-left: 10px"
+            small
+            block
+            @click="searchConfirm()"
+          >
+            {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.xrftvnyk', '查询') }}
+          </lw-button>
+
+        </div>
       </div>
 
       <lw-tab-box style="margin-top: 10px">
@@ -163,8 +203,14 @@ export default {
   },
   data() {
     return {
-      keyword: '',
-      keywordConfirm: '',
+      search: {
+        keyword: '',
+        orderType: '',
+        orderTimeStart: '',
+        orderTimeEnd: '',
+        planHandleTimeStart: '',
+        planHandleTimeEnd: '',
+      },
       tabActive: '',
       all: {
         pageNum: 1,
@@ -194,9 +240,8 @@ export default {
   },
   mounted() {
 
-    const keyword = this.$route.query.keyword
-    this.keywordConfirm = keyword
-    this.keyword = keyword
+    const search = JSON.parse(this.$route.query.search || '{}')
+    Object.keys(search).length ? this.search = search : ''
 
     this.searchConfirm(true)
   },
@@ -212,7 +257,7 @@ export default {
       }
 
       const res = await projectWmsOutboundPDASoPickQueryPageV2({
-        keyword: this.keywordConfirm,
+        ...this.search,
         pageNum: this[key].pageNum,
         pageSize: this[key].pageSize,
         queryType: queryType[key]
@@ -221,8 +266,8 @@ export default {
       this[key].pageTotal = res.total || 0
     },
 
+    // 搜索
     searchConfirm(first) {
-      this.keywordConfirm = this.keyword
       this.all.pageNum = 1
       this.ing.pageNum = 1
       this.abnormal.pageNum = 1
@@ -251,13 +296,20 @@ export default {
       })
 
     },
+    // 重置
+    reset() {
+      for (const k in this.search) {
+        this.search[k] = ''
+      }
+      this.searchConfirm()
+    },
 
     soClick(item) {
 
       this.$router.replace({
         path: '/outbound/pickConsoleV2/lwIndex',
         query: {
-          keyword: this.keywordConfirm,
+          search: JSON.stringify(this.search),
           tabActive: this.tabActive,
           _t: Date.now()
         }

package/src/views/wms/page/receive/byLpnLabel/index.vue

@@ -439,7 +439,6 @@ import {
   wmsMobileInboundSubmitAsnLabelReceive
 } from "../../../api/receive/byLpnLabel";
 import {wmsMobileQueryContainerSkuList} from "../../../api/receive/byContainer";
-import stringRandom from "string-random";
 
 export default {
   name: "lwReceiveByLpnLabelIndex",
@@ -515,7 +514,8 @@ export default {
         list: this.receive.list.map(item => {
           return {
             lpn: item.lpn,
-            skuId: item.sku.id
+            skuId: item.sku.id,
+            lotAttributes: item.lotAttributes
           }
         }),
         asnId: this.$route.query.asnId
@@ -746,7 +746,7 @@ export default {
     // 容器收货 - 增加容器
     addContainerReceive() {
       this.containerReceive.list.unshift({
-        id: stringRandom(10, {numbers: true}) + Date.now(),
+        id: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
         skuId: '',
         qty: '',
         qtyFocus: true

package/src/views/wms/page/receive/bySku/action.vue

@@ -402,7 +402,6 @@ import containerPrintPopup from "./../../inbound/components/containerPrintPopup.
 import QualityCard from "./../../inbound/components/QualityCard.vue";
 import receiveSkuGroupPopup from "../../../components/receiveSkuGroup/popup.vue";
 import {wmsMobileQueryContainerSkuList} from "../../../api/receive/byContainer";
-import stringRandom from "string-random";
 
 export default {
   name: "lwReceiveBySkuAction",
@@ -916,7 +915,7 @@ export default {
     // 容器收货 - 增加容器
     addContainerReceive() {
       this.containerReceive.list.unshift({
-        id: stringRandom(10, {numbers: true}) + Date.now(),
+        id: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
         skuId: '',
         qty: '',
         qtyFocus: true

package/src/views/wms/page/receive/bySkuBatch/action.vue

@@ -225,7 +225,6 @@ import {
   wmsMobileExtInGetAsnV2
 } from "../../../api/receive/bySkuBatch";
 import {wmsMobileQueryContainerSkuList} from "../../../api/receive/byContainer";
-import stringRandom from "string-random";
 import {wmsMobileExtInQueryAllocSkuLotList} from "../../../api/receive/bySku";
 
 export default {
@@ -389,7 +388,7 @@ export default {
     // 容器收货 - 增加容器
     addContainerReceive() {
       this.containerReceive.list.unshift({
-        id: stringRandom(10, {numbers: true}) + Date.now(),
+        id: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
         skuId: '',
         qty: '',
         qtyFocus: true

package/src/views/wms/page/receive/bySkuLpnSpec/action.vue

@@ -547,7 +547,9 @@ export default {
 
         // 回填收货库位
         if (!this.loc.value) {
-          this.loc.value = this.skuInfo.receiveLocationCode
+          const type = this.$lwWarehouseConfig.get('systemConfig.INBOUND_IGNORE_DEFAULT_RECEIVE_LOC_TYPE')
+          console.log(type, 999)
+          this.loc.value = /skuPalletSpec/.test(type) ? '' : this.skuInfo.receiveLocationCode
         }
       })
     },
@@ -581,6 +583,15 @@ export default {
         return
       }
 
+      // 去重
+      if (this.scanLpnList.some(item => item.lpn === lpn)) {
+        this.lpn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '当前托盘号已存在列表中，不允许重复添加')
+        )
+        return
+      }
+
       wmsMobileCheckLpnForPalletSpecReceive({lpn}).then(() => {
         this.addScanLpn(lpn)
         this.lpn.focus = true

package/src/views/wms/page/receive/console/components/orderInfo.vue

@@ -286,7 +286,8 @@ export default {
       this.$router.push({
         path,
         query: {
-          asnNo: this.item.asnNo
+          asnNo: this.item.asnNo,
+          asnId: this.item.id,
         }
       })
     }

package/src/views/wms/page/receive/mixture/action.vue

@@ -526,7 +526,7 @@ export default {
     }
   },
   mounted() {
-    this.asnIds = this.$route.query.lwAsnId.split(',')
+    this.asnIds = this.$route.query.asnId.split(',')
     this.getAsnAllData()
     this.checkLpnPrint()
   },
@@ -678,7 +678,6 @@ export default {
           this.normal.barcode.value = ''
           this.normal.qty.show = !needSn
           this.normal.qty.focus = !needSn
-          this.normal.qty.value = ''
           this.normal.loc.value = res.receiveLocationCode
         })
       })
@@ -729,7 +728,7 @@ export default {
       if (skuInfo.needSn) {
         qty = this.normal.snList.reduce((t, i) => t + Number(i.qty || 0), 0)
       } else {
-        qty = Number(this.normal.qty.value)
+        qty = Number(this.$refs.normalQty.getQty())
       }
 
       if (lpnNum === qty) return true

package/src/views/wms/page/receive/mixture/index.vue

@@ -90,9 +90,9 @@
 <script>
 import asnInfoList from "./components/asnInfoList.vue";
 import {
-  wmsMobileExtInGetAsnList,
-  wmsMobileExtInQueryAsnByCustom,
-} from "./../../../api/receive/mixture";
+  wmsMobileMixInGetAsnListV2,
+  wmsMobileMixInQueryAsnListV2,
+} from "../../../api/receive/mixture";
 
 export default {
   name: "lwReceiveMixtureIndex",
@@ -114,7 +114,7 @@ export default {
     // 根据路由上的 lwAsnObj 数据获取到货通知单数据
     const asnObj = JSON.parse(this.$route.query.lwAsnObj || '{}')
     const asnIds = Object.keys(asnObj)
-    asnIds.length && wmsMobileExtInGetAsnList({
+    asnIds.length && wmsMobileMixInGetAsnListV2({
       asnIds
     }).then(res => {
       this.asnList = res.map(item => {
@@ -135,7 +135,7 @@ export default {
         return
       }
 
-      wmsMobileExtInQueryAsnByCustom({no}).then(res => {
+      wmsMobileMixInQueryAsnListV2({no}).then(res => {
 
 
         if (!res || !res.length) {
@@ -220,10 +220,12 @@ export default {
         }
       })
 
+      const asnId = checked.join(',')
       this.$router.push({
         path,
         query: {
-          lwAsnId: checked.join(',')
+          asnId,
+          lwAsnId: asnId,
         }
       })
 

package/src/views/wms/page/receive/putaway/index/index.vue

@@ -192,7 +192,7 @@ import {
   wmsMobileGetPutawayTaskByTask,
   wmsMobileQueryHasPutawayTask,
   wmsMobilePutawayTaskCancelLine,
-  wmsMobileQueryPutawayTaskByLpns
+  wmsMobileQueryPutawayTaskByLpns, wmsMobileGetPutawayTaskList
 } from "../../../../api/receive/putaway";
 
 export default {
@@ -313,14 +313,14 @@ export default {
   },
   mounted() {
     const {lwTaskId, lpn} = this.$route.query
-    if (lwTaskId){
+    if (lwTaskId) {
       // 如果是任务进入的就不显示输入框
       this.fromTask = true
 
-      wmsMobileGetPutawayTaskByTask({
-        taskId: lwTaskId
+      wmsMobileGetPutawayTaskList({
+        taskIds: lwTaskId.split(',')
       }).then(res => {
-        this.taskList = [res]
+        this.taskList = res
 
         this.showLpnShelf = this.taskList.every(item => item.wholeLpnPutaway)
 

package/src/views/wms/page/receive/putawayBySku/action.vue

@@ -0,0 +1,249 @@
+<!--
+  按商品上架 - 执行页
+  @author: 张文
+  @date: 2024-09-23
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('', '按商品上架')"/>
+
+    <lw-page-body-module>
+
+      <div
+        class="lw-global-model-box"
+        v-for="(i,k) in skuList"
+        :key="k"
+      >
+
+        <div class="lw-global-row-start lw-global-flex-between">
+          <lw-title-value-cell
+            :title="i.titleLabel"
+            :value="i.title"
+            val-bold
+            :is-row="false"
+          />
+
+          <van-checkbox
+            v-model="i._checked"
+            :disabled="i._disabled"
+          />
+        </div>
+
+        <lw-label-value-group
+          :show-start-row-style="false"
+          :list="i.content"
+        />
+        <lw-label-value-group
+          v-if="i.groupContent?.length"
+          style="margin: 5px 0"
+          class="lw-global-group-base-color"
+          :show-row-style="false"
+          :list="i.groupContent"
+        />
+
+        <div
+          :class="[i._checked ? 'lw-global-row' : 'lw-global-row-end']"
+          class="lw-global-flex-between"
+        >
+          <lw-title-value-cell
+            :title="$lwLanguage.get('', '总量')"
+            :value="i.qtyLabel"
+            val-bold
+            val-red
+            :is-row="false"
+          />
+          <lw-title-value-cell
+            :title="$lwLanguage.get('', '可用')"
+            :value="i.canUseQtyLabel"
+            val-bold
+            val-red
+            :is-row="false"
+          />
+
+        </div>
+
+        <lw-get-qty-by-type
+          v-if="i._checked"
+          :title="$lwLanguage.get('', '数量')"
+          :ref="'qty'+k"
+          :sku-id="i.sku.id"
+          :owner-id="i.sku.ownerId"
+          :show-bottom-border="false"
+          :init-qty="i.canUseQty"
+        />
+
+      </div>
+
+      <lw-pagination
+        v-model="pageNum"
+        :page-size.sync="pageSize"
+        :page-total="pageTotal"
+        @change="getSkuList"
+      />
+
+    </lw-page-body-module>
+
+    <lw-bottom-bar height="auto">
+      <div style="flex: 1;padding: 5px 0 10px 0">
+        <lw-input
+          :title="$lwLanguage.get('', '目标库区')"
+          v-model="zone.value"
+          :get-focus.sync="zone.focus"
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('按商品上架-执行页-目标库区','LOCATION')"
+          @confirm="submit"
+        />
+
+        <div class="lw-global-row-end">
+          <lw-button
+            block
+            @click="submit"
+          >
+            {{ $lwLanguage.get('', '提交') }}
+          </lw-button>
+        </div>
+      </div>
+    </lw-bottom-bar>
+  </div>
+</template>
+
+<script>
+
+import {
+  wmsMobileInPutawayCreateTaskBySku,
+  wmsMobileInPutawayQuerySkuPagingList
+} from "../../../api/receive/putawayBySku";
+
+export default {
+  name: "lwReceivePutawayBySkuAction",
+  data() {
+    return {
+      skuList: [],
+      pageNum: 1,
+      pageSize: 10,
+      pageTotal: 0,
+      zone: {
+        value: '',
+        focus: false
+      },
+
+      printInfo: {}
+    }
+  },
+  mounted() {
+    this.getSkuList()
+  },
+  methods: {
+    // 校验打印机
+    checkPrint() {
+
+      if (this.printInfo.printId) return true
+
+      const {success, printData} = this.$lwPrint.test({
+        templateCode: 'PART_PUTAWAY_LABEL',
+        msg: this.$lwLanguage.get('', '入库上架标签'),
+      })
+
+
+      this.printInfo = printData
+      return success
+
+
+    },
+
+    // 获取商品数据
+    getSkuList() {
+      wmsMobileInPutawayQuerySkuPagingList({
+        ...this.$route.query,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+      }).then(res => {
+
+        if (res.total === 0) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '没有查询得到任何库存信息')
+          )
+          history.go(-1)
+          return
+        }
+
+        this.pageTotal = res.total
+        this.skuList = res.datas.map(item => {
+          return {
+            ...item,
+            _checked: false,
+            _disabled: !item.canUseQty,
+          }
+        })
+      })
+    },
+
+    // 提交
+    submit() {
+
+      const lines = []
+
+      for (let i = 0; i < this.skuList.length; i++) {
+        const item = this.skuList[i]
+        if (!item._checked) continue
+
+        const qty = this.$refs['qty' + i][0].getQty()
+
+        if (!qty) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '商品【{skuCode}】数量不能为空，且应当大于0', {skuCode: item.sku.code})
+          )
+          return
+        }
+
+        if (qty > item.canUseQty) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '商品【{skuCode}】数量大于可用量', {skuCode: item.sku.code})
+          )
+          return
+        }
+
+        lines.push({
+          skuId: item.sku.id,
+          locationId: item.locationId,
+          lpn: item.lpn,
+          caseNum: item.caseNum,
+          groupKey: item.groupKey,
+          qty
+        })
+
+      }
+
+      if (!lines.length) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '请选择上架商品')
+        )
+        return
+      }
+
+
+      wmsMobileInPutawayCreateTaskBySku({
+        printTemplate: this.printInfo.templateId,
+        printDeviceId: this.printInfo.printId,
+        zoneCode: this.zone.value,
+        lines,
+      }).then(res => {
+        res.printIdList?.forEach(id => this.$lwPrint.bluetoothPrint(id))
+
+        this.$router.replace({
+          path: '/receive/putaway/lwIndex',
+          query: {
+            lwTaskId: res.taskIdList.join(',')
+          }
+        })
+      })
+
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>