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

package/src/views/vin/page/receive/scanCar/action.vue

@@ -486,12 +486,7 @@ export default {
     this.routeData = this.$route.query
     this.dock = this.routeData.lanePortCode || ''
 
-    const {printData} = this.$lwPrint.test(
-      'VIN_RECEIVE_LABEL',
-      this.$lwLanguage.get('wms_project.pda.vin.page.receive.scanCar.action.ludkueqr','收车入位'),
-      false
-    )
-    this.printData = printData
+    this.printCheck()
 
     wmsVinMobileInboundQueryReceivedByStaff({
       staffNum: this.routeData.receiveStaffNum,
@@ -503,6 +498,19 @@ export default {
     this.getLocNum()
   },
   methods: {
+    // 打印机校验
+    printCheck(needCheck) {
+      if (this.printData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test(
+        'VIN_RECEIVE_LABEL',
+        this.$lwLanguage.get('wms_project.pda.vin.page.receive.scanCar.action.ludkueqr', '收车入位'),
+        needCheck
+      )
+      this.printData = printData
+      return success
+    },
+
     // 获取库区可用量
     getLocNum() {
       this.routeData.lockNo && wmsVinMobileInboundDetailReceiveZone({
@@ -563,6 +571,9 @@ export default {
     },
     // 确认收车
     async confirmReceive(ignoreWarn = false) {
+
+      if (!this.printCheck(true)) return
+
       const api = this.routeData._scanType === 'notOrder' ?
         wmsVinMobileInboundSubmitReceiveVinByNoOrder :
         wmsVinMobileInboundSubmitReceiveVin
@@ -721,12 +732,7 @@ export default {
     // 补打标签弹框 - 确认打印
     async confirmPrint() {
 
-      if (!Object.keys(this.printData).length) {
-        this.$lwToast.fail(
-          this.$lwLanguage.get('wms_project.pda.vin.page.receive.scanCar.action.fjgipwhw','打印模板未配置')
-        )
-        return
-      }
+      if (!this.printCheck(true)) return
 
       const print = await wmsVinMobileInboundPrintReceive({
         vin: this.printLabelPopup.data.vin,

package/src/views/wms/api/components.js

@@ -0,0 +1,25 @@
+/*
+* 组件方法
+* @author: 张文
+* @date  2023-08-28
+* */
+
+import lwAxios from "./../../../utils/Axios";
+
+
+// 校验出库单是否被拦截
+export function projectWmsMobileOutboundSoCheckBlock(data) {
+  return lwAxios.action({
+    url: 'projectWmsMobileOutboundSoCheckBlock',
+    data
+  })
+}
+
+
+// 通过单号查询订单信息
+export function projectWmsMobileOutboundSoWholeBlock(data) {
+  return lwAxios.action({
+    url: 'projectWmsMobileOutboundSoWholeBlock',
+    data
+  })
+}

package/src/views/wms/api/config/masterLocation/masterLocationConfig/action.js

@@ -9,20 +9,26 @@
 import lwAxios from "../../../../../../utils/Axios";
 
 
-
-
 // 查找主库位配置详情
-export function WmsProjectMobileQuerySkuLocationConfigInfo(data){
+export function WmsProjectMobileQuerySkuLocationConfigInfo(data) {
+    return lwAxios.action({
+        url: 'wmsProjectMobileQuerySkuLocationConfigInfo',
+        data
+    })
+}
+
+// 获取商品列表
+export function wmsProjectMobileLocationAllocateSku(data) {
     return lwAxios.action({
-        url:'wmsProjectMobileQuerySkuLocationConfigInfo',
+        url: 'wmsProjectMobileLocationAllocateSku',
         data
     })
 }
 
 // 计算主库位
-export function WmsProjectMobileCalculateSkuMasterLocation(data){
+export function WmsProjectMobileCalculateSkuMasterLocation(data) {
     return lwAxios.action({
-        url:'wmsProjectMobileCalculateSkuMasterLocation',
+        url: 'wmsProjectMobileCalculateSkuMasterLocation',
         data
     })
 }

package/src/views/wms/api/config/masterLocation/masterLocationQuery/action.js

@@ -20,9 +20,25 @@ export function WmsProjectMobileQuerySkuLocationConfigBySkuCode(data){
 }
 
 // 库位编码查询主库位
-export function WmsProjectMobileQuerySkuLocationConfigByLocationCode(data){
+export function WmsProjectMobileQuerySkuLocationConfigByLocationCode(data) {
     return lwAxios.action({
-        url:'wmsProjectMobileQuerySkuLocationConfigByLocationCode',
+        url: 'wmsProjectMobileQuerySkuLocationConfigByLocationCode',
+        data
+    })
+}
+
+// 获取商品信息
+export function wmsProjectMobileMasterLocationQueryByLoc(data) {
+    return lwAxios.action({
+        url: 'wmsProjectMobileMasterLocationQueryByLoc',
+        data
+    })
+}
+
+// 获取库位信息
+export function wmsProjectMobileLocationQuery(data) {
+    return lwAxios.action({
+        url: 'wmsProjectMobileLocationQuery',
         data
     })
 }

package/src/views/wms/api/config/newProject/action.js

@@ -69,16 +69,6 @@ export function WmsProjectMobileSaveSkuQualityCardInfo(data) {
 }
 
 
-// 查询供应商信息
-export function WmsProjectMobileQuerySupplier(data){
-    return lwAxios.action({
-        url:'wmsProjectMobileQuerySupplier',
-        data
-    })
-}
-
-
-
 // 完成配置
 export function WmsProjectMobileSkuNewProjectComplete(data){
     return lwAxios.action({

package/src/views/wms/api/container/repairRegister.js

@@ -26,18 +26,27 @@ export function projectWmsPDAContainerRepairOrderSave(data){
 
 
 // 查询维修单明细
-export function projectWmsPDAContainerRepairOrderQueryDetail(data){
+export function projectWmsPDAContainerRepairOrderQueryDetail(data) {
   return lwAxios.action({
-    url:'projectWmsPDAContainerRepairOrderQueryDetail',
+    url: 'projectWmsPDAContainerRepairOrderQueryDetail',
+    data
+  })
+}
+
+
+// 获取分页容器信息
+export function projectWmsPDAContainerRepairOrderQueryLinePage(data) {
+  return lwAxios.action({
+    url: 'projectWmsPDAContainerRepairOrderQueryLinePage',
     data
   })
 }
 
 
 // 添加容器到维修单
-export function projectWmsPDAContainerRepairOrderAddLine(data){
+export function projectWmsPDAContainerRepairOrderAddLine(data) {
   return lwAxios.action({
-    url:'projectWmsPDAContainerRepairOrderAddLine',
+    url: 'projectWmsPDAContainerRepairOrderAddLine',
     data
   })
 }

package/src/views/wms/api/dataAnalysis/index.js

@@ -0,0 +1,16 @@
+/*
+* 数据分析
+* @author: 张文
+* @date  2023-11-28
+* */
+
+import lwAxios from '../../../../utils/Axios'
+
+
+// 获取设备分组数据
+export function dmMobileQueryPreviewKanbanList(data) {
+  return lwAxios.action({
+    url: 'dmMobileQueryPreviewKanbanList',
+    data
+  })
+}

package/src/views/wms/api/inbound/printLabel.js

@@ -8,18 +8,18 @@ import lwAxios from '../../../../utils/Axios'
 
 
 // 查询对应收货单的商品
-export function wmsMobileInboundGetAsnSkuLinePage(data){
+export function wmsMobileInPrintQueryAsnSkuPageListV2(data) {
   return lwAxios.action({
-    url: 'wmsMobileInboundGetAsnSkuLinePage',
+    url: 'wmsMobileInPrintQueryAsnSkuPageListV2',
     data
   })
 }
 
 
 // 查询对应商品的数据
-export function wmsMobileInboundGetAsnSkuPrintData(data){
+export function wmsMobileInPrintGetAsnSkuV2(data) {
   return lwAxios.action({
-    url: 'wmsMobileInboundGetAsnSkuPrintData',
+    url: 'wmsMobileInPrintGetAsnSkuV2',
     data
   })
 }

package/src/views/wms/api/inbound/quality.js

@@ -6,15 +6,14 @@
 
 import lwAxios from '../../../../utils/Axios'
 
-/**
- * 根据 LPN 查询品检任务
- * @param lpn 托盘号
- * @returns {Promise<Object[]>} 品检任务列表
- */
-export const getInboundQueryQualityByLpn = lpn => lwAxios.action({
-  url: 'wmsMobileInboundQueryQualityByLpn',
-  data: { lpn }
-})
+
+//根据 LPN 查询品检任务
+export function wmsMobileInQualityQueryByLpnV2(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInQualityQueryByLpnV2',
+    data
+  })
+}
 
 /**
  * 获取品检任务详情
@@ -23,7 +22,7 @@ export const getInboundQueryQualityByLpn = lpn => lwAxios.action({
  */
 export const getInboundGetQualityDetail = taskId => lwAxios.action({
   url: 'wmsMobileInboundGetQualityDetail',
-  data: { taskId }
+  data: {taskId}
 })
 
 /**

package/src/views/wms/api/inbound/receive.js

@@ -13,26 +13,44 @@ import lwAxios from '../../../../utils/Axios'
  */
 export const getInboundAsnByTaskId = taskId => lwAxios.action({url: 'wmsMobileInboundGetAsnByTask', data: {taskId}})
 
-/**
- * 获取到货通知单数据
- * @param no 单号
- * @returns {Promise<any>}
- */
-export const getInboundAsnByNo = no => lwAxios.action({url: 'wmsMobileInboundQueryAsn', data: {no}})
+
+// 获取asn单数据
+export function wmsMobileMultiInQueryAsnListV2(data) {
+  return lwAxios.action({
+    url: 'wmsMobileMultiInQueryAsnListV2',
+    data
+  })
+}
 
 /**
  * 获取到货通知单数据
- * @param id 到货通知单Id
+ * @param asnId 到货通知单Id
  * @returns {Promise<any>}
  */
-export const getInboundAsn = id => lwAxios.action({url: 'wmsMobileInboundGetAsn', data: {id}})
+export const getInboundAsn = asnId => lwAxios.action({url: 'wmsMobileExtInGetAsnV2', data: {asnId}})
 
 /**
  * 获取到货通知单数据
  * @param asnNo 到货通知单号
  * @returns {Promise<any>}
  */
-export const getInboundAsnByAsnNo = asnNo => lwAxios.action({url: 'wmsMobileInboundGetAsn', data: {asnNo}})
+export const getInboundAsnByAsnNo = asnNo => lwAxios.action({url: 'wmsMobileExtInGetAsnV2', data: {asnNo}})
+
+// 获取指定组的商品信息
+export function wmsMobileExtInGetAsnSkuGroupV3(data) {
+  return lwAxios.action({
+    url: 'wmsMobileExtInGetAsnSkuGroupV3',
+    data
+  })
+}
+
+// 获取asn单数据
+export function wmsMobileExtInGetAsnV2(data) {
+  return lwAxios.action({
+    url: 'wmsMobileExtInGetAsnV2',
+    data
+  })
+}
 
 /**
  * 查询到货通知单的商品信息
@@ -45,16 +63,6 @@ export const getAsnSkuDetailBySkuCode = (asnId, skuCode) => lwAxios.action({
   data: {asnId, skuCode}
 })
 
-/**
- * 查询到货通知单的商品信息
- * @param asnId 到货通知单Id
- * @param sn 序列号
- * @returns {Promise<any>} 到货通知单的商品汇总信息
- */
-export const getAsnSkuDetailBySn = (asnId, sn) => lwAxios.action({
-  url: 'wmsMobileInboundFoundAsnSkuDetailBySn',
-  data: {asnId, sn}
-})
 
 /**
  * 获取到货通知单商品的序列号信息
@@ -231,9 +239,9 @@ export const getInboundAllocAsnScanListBySn = (asnId) => lwAxios.action({
  * @param sn 唯一码
  * @returns {Promise<any>} 调拨收货 商品信息列表
  */
-export const submitInboundAllocAsnScanBySn = (asnId, sn) => lwAxios.action({
+export const submitInboundAllocAsnScanBySn = (asnId, sn, data = {}) => lwAxios.action({
   url: 'wmsMobileInboundSubmitAllocScanBySn',
-  data: {asnId, sn}
+  data: {asnId, sn, ...data}
 })
 
 /**
@@ -278,9 +286,9 @@ export const deleteInboundAllocAsnScanSkuAllSn = (asnId, skuId) => lwAxios.actio
  * @param printTemplate 打印模板
  * @returns {Promise<any>} asn + 上架打印信息
  */
-export const receiveInboundAllocAsnScanBySn = (asnId, locationCode, lpn = null, printDeviceId = null, printTemplate = null) => lwAxios.action({
+export const receiveInboundAllocAsnScanBySn = data => lwAxios.action({
   url: 'wmsMobileInboundConfirmAllocScanBySn',
-  data: {asnId, locationCode, lpn, printDeviceId, printTemplate}
+  data
 })
 
 /**
@@ -311,9 +319,14 @@ export const getInboundAllocAsnSku = (asnId, skuCode) => lwAxios.action({
  * @param sn 唯一码
  * @returns {Promise<any>} 调拨收货 商品信息列表
  */
-export const submitInboundAllocAsnScanBySkuSn = (asnId, skuId, sn) => lwAxios.action({
+export const submitInboundAllocAsnScanBySkuSn = (asnId, skuId, sn, data = {}) => lwAxios.action({
   url: 'wmsMobileInboundSubmitAllocScanBySkuSn',
-  data: {asnId, skuId, sn}
+  data: {
+    asnId,
+    skuId,
+    sn,
+    ...data
+  }
 })
 
 /**
@@ -323,9 +336,9 @@ export const submitInboundAllocAsnScanBySkuSn = (asnId, skuId, sn) => lwAxios.ac
  * @param qty 数量
  * @returns {Promise<any>} 调拨收货 商品信息列表
  */
-export const submitInboundAllocAsnScanBySku = (asnId, skuId, qty) => lwAxios.action({
+export const submitInboundAllocAsnScanBySku = (asnId, skuId, qty, data = {}) => lwAxios.action({
   url: 'wmsMobileInboundSubmitAllocScanBySku',
-  data: {asnId, skuId, qty}
+  data: {asnId, skuId, qty, ...data}
 })
 
 /**
@@ -370,9 +383,9 @@ export const deleteInboundAllocAsnScanSku = (asnId, skuId) => lwAxios.action({
  * @param printTemplate 打印模板
  * @returns {Promise<any>} asn + 上架打印信息
  */
-export const receiveInboundAllocAsnScanBySku = (asnId, locationCode, lpn = null, printDeviceId = null, printTemplate = null) => lwAxios.action({
+export const receiveInboundAllocAsnScanBySku = data => lwAxios.action({
   url: 'wmsMobileInboundConfirmAllocScan',
-  data: {asnId, locationCode, lpn, printDeviceId, printTemplate}
+  data
 })
 
 /**
@@ -385,16 +398,6 @@ export const submitInboundAllocAsnAbnormal =data => lwAxios.action({
   data
 })
 
-/**
- * 无单收货 查询商品
- * @param skuCode 商品编码
- * @returns {Promise<any>} 商品收货信息（列表-多货主）
- */
-export const queryInboundSkuReceive = ( skuCode ) => lwAxios.action({
-  url: 'wmsMobileInboundQuerySkuReceive',
-  data: {skuCode}
-})
-
 /**
  * 无单收货 查询商品
  * @param skuCode 商品编码
@@ -457,10 +460,10 @@ export const getInboundSkuQualityCard = (skuId, skuCode) => lwAxios.action({
   data: {skuId, skuCode}
 })
 
-// 获取asn单数据
-export function wmsMobileInboundGetAsnDetail(data) {
+// 获取商品分组数据
+export function wmsMobileExtInGetAsnSkuV3(data) {
   return lwAxios.action({
-    url: 'wmsMobileInboundGetAsnDetail',
+    url: 'wmsMobileExtInGetAsnSkuV3',
     data
   })
 }
@@ -473,3 +476,19 @@ export function wmsMobileInboundNewReceiveLpn(data) {
   })
 }
 
+// 获取指定单的商品数据
+export function wmsMobileExtInQueryAsnSkuPageListV2(data) {
+  return lwAxios.action({
+    url: 'wmsMobileExtInQueryAsnSkuPageListV2',
+    data
+  })
+}
+
+// 无单收货历史记录
+export function wmsMobileExtInQueryReceiveLogPageListByNoOrder(data) {
+  return lwAxios.action({
+    url: 'wmsMobileExtInQueryReceiveLogPageListByNoOrder',
+    data
+  })
+}
+

package/src/views/wms/api/inbound/unload.js

@@ -16,24 +16,6 @@ export function wmsMobileUnloadQueryInfo(data){
 }
 
 
-// 查询卸货月台
-export function wmsMobileUnloadQueryDock(data){
-  return lwAxios.action({
-    url:'wmsMobileUnloadQueryDock',
-    data
-  })
-}
-
-
-// 查询承运商信息
-export function projectGetWarehouseCarrier(data){
-  return lwAxios.action({
-    url:'projectGetWarehouseCarrier',
-    data
-  })
-}
-
-
 // 查询到货通知单
 export function wmsMobileUnloadQueryAsnInfo(data){
   return lwAxios.action({
@@ -70,10 +52,37 @@ export function wmsMobileCompleteUnloadOrder(data){
 }
 
 
-// 查询卸货商品信息
-export function wmsMobileUnloadQuerySku(data){
+// 通过asn单创建卸货单
+export function wmsMobileCreateUnloadOrderByAsn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileCreateUnloadOrderByAsn',
+    data
+  })
+}
+
+
+// 确认卸货 - 多条
+export function wmsMobileAddEntryLinesUnloadOrder(data) {
+  return lwAxios.action({
+    url: 'wmsMobileAddEntryLinesUnloadOrder',
+    data
+  })
+}
+
+
+// 查询ans单 - 多条
+export function wmsMobileExtUnloadQueryAsn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileExtUnloadQueryAsn',
+    data
+  })
+}
+
+
+// 查询卸货单 - 多条
+export function wmsMobileExtUnloadQueryOrder(data) {
   return lwAxios.action({
-    url:'wmsMobileUnloadQuerySku',
+    url: 'wmsMobileExtUnloadQueryOrder',
     data
   })
 }

package/src/views/wms/api/inner/borrow/index.js

@@ -7,9 +7,9 @@
 import lwAxios from "../../../../../utils/Axios";
 
 //获取最近借件单
-export function wmsGetRecentlyBorrow(data){
+export function wmsProjectGetRecentlyBorrow(data) {
   return lwAxios.action({
-    url:'wmsProjectGetRecentlyBorrow',
+    url: 'wmsProjectGetRecentlyBorrow',
     data
   })
 }

package/src/views/wms/api/inner/count/console.js

@@ -34,15 +34,6 @@ export function wmsInnerRandomQueryLocSkuInv(data){
 }
 
 
-// 单内增加盘点明细
-export function wmsInnerRandomCountAppendInOrder(data){
-  return lwAxios.action({
-    url:'wmsInnerRandomCountAppendInOrder',
-    data
-  })
-}
-
-
 // 结束盘点
 export function wmsInnerCountHandle(data){
   return lwAxios.action({

package/src/views/wms/api/inner/count/index.js

@@ -87,11 +87,36 @@ export const locCountLineSubmit = data => lwAxios.action({ url: 'locCountLineSub
  * @param data 盘点行数据，结构：{skuCode, ownerId?, taskNo, locationCode, lpn?, caseNum?}
  * @returns {Promise<any>}
  */
-export const invCountLineCustom = data => lwAxios.action({ url: 'invCountLineCustom', data })
+export const invCountLineCustom = data => lwAxios.action({url: 'invCountLineCustom', data})
 
 /**
  * 提交库存盘点行数据
  * @param data 盘点数据，结构：{countLineId, qty, groups?:{key, qty}}
  * @returns {Promise<any>}
  */
-export const invCountLineSubmit = data => lwAxios.action({ url: 'invCountLineSubmit', data })
+export const invCountLineSubmit = data => lwAxios.action({url: 'invCountLineSubmit', data})
+
+
+// 获取当前盘点行的数据
+export function projectCountGetCountLineInfo(data) {
+  return lwAxios.action({
+    url: 'projectCountGetCountLineInfo',
+    data
+  })
+}
+
+// 获取当行提交的商品信息
+export function projectCountGetCountLineRecords(data) {
+  return lwAxios.action({
+    url: 'projectCountGetCountLineRecords',
+    data
+  })
+}
+
+// 获取商品清单
+export function projectCountGetCountLineSku(data) {
+  return lwAxios.action({
+    url: 'projectCountGetCountLineSku',
+    data
+  })
+}

package/src/views/wms/api/inner/dead/query.js

@@ -6,12 +6,30 @@
 import lwAxios from "../../../../../utils/Axios";
 
 
-// 查询呆滞品打包信息
-  export function wmsDullSkuQueryInfo(data) {
-    return lwAxios.action({
-      url: 'wmsDullSkuQueryInfo',
-      data
-    })
-  }
+// 查询袋信息
+export function wmsDullSkuQueryPagedBagInfo(data) {
+  return lwAxios.action({
+    url: 'wmsDullSkuQueryPagedBagInfo',
+    data
+  })
+}
+
+
+// 查询箱信息
+export function wmsDullSkuQueryPagedBoxInfo(data) {
+  return lwAxios.action({
+    url: 'wmsDullSkuQueryPagedBoxInfo',
+    data
+  })
+}
+
+
+// 查询托信息
+export function wmsDullSkuQueryPagedLpnInfo(data) {
+  return lwAxios.action({
+    url: 'wmsDullSkuQueryPagedLpnInfo',
+    data
+  })
+}
 
 

package/src/views/wms/api/inner/lotTransfer.js

@@ -0,0 +1,52 @@
+/*
+* 库存批次转移
+* @author: 张文
+* @date  2023-08-25
+* */
+
+import lwAxios from "../../../../utils/Axios";
+
+
+// 获取移动任务数据
+export function wmsMobileInnerLotTransferQueryInventory(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInnerLotTransferQueryInventory',
+    data
+  })
+}
+
+
+// 获取批次详情
+export function wmsMobileInnerLotTransferGetLotDetail(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInnerLotTransferGetLotDetail',
+    data
+  })
+}
+
+
+// 按商品转移批次
+export function wmsMobileInnerLotTransferSubmitBySku(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInnerLotTransferSubmitBySku',
+    data
+  })
+}
+
+
+// 按唯一码转移批次
+export function wmsMobileInnerLotTransferSubmitBySn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInnerLotTransferSubmitBySn',
+    data
+  })
+}
+
+
+// 查询唯一码
+export function wmsMobileInnerLotTransferQuerySn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInnerLotTransferQuerySn',
+    data
+  })
+}