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

package/src/utils/StringRandom.js

@@ -0,0 +1,46 @@
+/*
+* 随机字符串
+* @author: 张文
+* @date  2024-09-05
+* */
+
+
+const numbers = '0123456789';
+const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+const specials = '~!@#$%^*()_+-=[]{}|;:,./<>?';
+
+/**
+ * 获取随机字符串
+ * @param {Number} length 字符串的长度
+ * @param {Object} options - 配置项{number:是否允许数字，letters:是否允许字母，specials:是否需要符号，}
+ * @return {String}
+ */
+function random(length = 8, options) {
+
+  let chars = '';
+  let result = '';
+
+  if (!options || !Object.keys(options).length) {
+    chars = numbers + letters + specials;
+  } else {
+    if (options.numbers) {
+      chars += numbers;
+    }
+
+    if (options.letters) {
+      chars += letters;
+    }
+
+    if (options.specials) {
+      chars += specials;
+    }
+  }
+
+  while (length > 0) {
+    length--;
+    result += chars[Math.floor(Math.random() * chars.length)];
+  }
+  return result;
+}
+
+export default random;

package/src/utils/index.js

@@ -41,6 +41,7 @@ import {LocalStaff} from "./LocalStaff";
 import {SystemConfig} from "./SystemConfig";
 import {ProjectCustomRender} from "./ProjectCustomRender";
 import ProjectCustomHandler from "./ProjectCustomHandler";
+import random from "./StringRandom";
 
 
 export const utils = (Vue) => {
@@ -84,4 +85,5 @@ export const utils = (Vue) => {
   Vue.prototype.$lwSystemConfig = SystemConfig
   Vue.prototype.$lwProjectCustomRender = ProjectCustomRender
   Vue.prototype.$lwProjectCustomHandler = new ProjectCustomHandler()
+  Vue.prototype.$lwStringRandom = random
 }

package/src/views/common/module/SearchSelectPopup/index.vue

@@ -164,7 +164,9 @@ export default {
     // 初始化时回填的值，当isInitEchoData=true时无效
     initDefault: String,
     // 初始化时回填数据的索引，当 isInitEchoData=true 或 initDefault 有值时无效
-    initSelectedIndex: Number
+    initSelectedIndex: Number,
+    // 初始化时当数据只有一条时默认选中，当 isInitEchoData=true 或 initDefault、initSelectedIndex 有值时无效
+    initListOnlyOneSelected: Boolean,
 
   },
   computed: {
@@ -210,11 +212,16 @@ export default {
     } else if (this.initDefault) {
       this.formatDataAndDisabled({}, this.initDefault)
     } else if (this.initSelectedIndex !== undefined) {
-
       this.getData().then(({datas}) => {
-        const item = datas[0]
-        this.formatDataAndDisabled(item)
-        this.selectedVal = item[this.valueKey]
+        this.formatDataAndDisabled(datas[0])
+        this.selectedVal = datas[0][this.valueKey]
+      })
+    } else if (this.initListOnlyOneSelected) {
+      this.getData().then(({datas}) => {
+        if (datas.length === 1) {
+          this.formatDataAndDisabled(datas[0])
+          this.selectedVal = datas[0][this.valueKey]
+        }
       })
     }
   },

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

@@ -0,0 +1,43 @@
+/*
+* 商品批量打托
+* @author: 张文
+* @date  2024-09-19
+* */
+
+import lwAxios from "../../../../utils/Axios";
+
+
+// 获取列表
+export function wmsMobileSkuPalletQueryInventoryPageList(data) {
+  return lwAxios.action({
+    url: 'wmsMobileSkuPalletQueryInventoryPageList',
+    data
+  })
+}
+
+
+// 获取打托信息
+export function wmsMobileSkuPalletGetInventory(data) {
+  return lwAxios.action({
+    url: 'wmsMobileSkuPalletGetInventory',
+    data
+  })
+}
+
+
+// 批量打托
+export function wmsMobileSkuPalletSubmitBySkuBatch(data) {
+  return lwAxios.action({
+    url: 'wmsMobileSkuPalletSubmitBySkuBatch',
+    data
+  })
+}
+
+
+// 补打
+export function wmsMobileSkuPalletSubmitByInventory(data) {
+  return lwAxios.action({
+    url: 'wmsMobileSkuPalletSubmitByInventory',
+    data
+  })
+}

package/src/views/wms/api/outbound/blockV2.js

@@ -0,0 +1,88 @@
+/*
+* 订单拦截
+* @author: 张文
+* @date  2024-09-05
+* */
+
+import lwAxios from '../../../../utils/Axios'
+
+
+// 生成收货托盘
+export function wmsMobileInboundNewReceiveLpn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInboundNewReceiveLpn',
+    data
+  })
+}
+
+
+// 查询分页数据
+export function projectWmsOutboundLoadSoBlockPage(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundLoadSoBlockPage',
+    data
+  })
+}
+
+
+// 通过出库单id - 加载出库单详情
+export function projectWmsOutboundLoadSoBlockDetail(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundLoadSoBlockDetail',
+    data
+  })
+}
+
+
+// 通过出库单id - 获取拦截容器
+export function projectWmsOutboundQuerySoContainerBlock(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundQuerySoContainerBlock',
+    data
+  })
+}
+
+
+// 通过运单id - 加载出库单详情
+export function projectWmsOutboundLoadDeliveryBlockDetail(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundLoadDeliveryBlockDetail',
+    data
+  })
+}
+
+
+// 通过运单id - 获取拦截容器
+export function projectWmsOutboundLoadDeliveryContainerBlock(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundLoadDeliveryContainerBlock',
+    data
+  })
+}
+
+
+// 获取拦截项数据
+export function projectWmsOutboundQuerySoBlockContainerHandleInfo(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundQuerySoBlockContainerHandleInfo',
+    data
+  })
+}
+
+
+// 确认拦截
+export function projectWmsOutboundSoBlockHandle(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundSoBlockHandle',
+    data
+  })
+}
+
+
+// 根据容器号获取拦截数据
+export function projectWmsOutboundQueryContainerBlock(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundQueryContainerBlock',
+    data
+  })
+}

package/src/views/wms/api/outbound/delivery/action.js

@@ -115,15 +115,6 @@ export function projectDeliveryCompleteLoad(data) {
 }
 
 
-// 检查发运单是否装载完成
-export function projectDeliveryQueryLoadSoInfo(data) {
-  return lwAxios.action({
-    url: 'projectDeliveryQueryLoadSoInfo',
-    data
-  })
-}
-
-
 // 继续装车
 export function projectDeliveryContinueLoad(data) {
   return lwAxios.action({
@@ -188,3 +179,67 @@ export function projectDeliveryRelatedOrder(data) {
     data
   })
 }
+
+// 修改装车方式
+export function projectDeliveryUpdateLoadMethods(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryUpdateLoadMethods',
+    data
+  })
+}
+
+// 获取关联的出库单
+export function projectDeliveryFindWaitLoadSoList(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryFindWaitLoadSoList',
+    data
+  })
+}
+
+// 获取出库单信息
+export function projectDeliveryFindWaitLoadSoDetail(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryFindWaitLoadSoDetail',
+    data
+  })
+}
+
+// 获取捆包箱信息
+export function projectDeliveryFindSoWaitLoadOnlyPacked(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryFindSoWaitLoadOnlyPacked',
+    data
+  })
+}
+
+// 获取容器信息
+export function projectDeliveryFindSoWaitLoad(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryFindSoWaitLoad',
+    data
+  })
+}
+
+// 获取商品信息
+export function projectWmsOutboundPDASoPickSkuPageV2(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoPickSkuPageV2',
+    data
+  })
+}
+
+// 完成装车并发运
+export function projectDeliveryCompleteLoadAndShip(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryCompleteLoadAndShip',
+    data
+  })
+}
+
+// 检查拦截
+export function projectWmsOutboundBlockCheck(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundBlockCheck',
+    data
+  })
+}

package/src/views/wms/api/outbound/orderDeliveryShip.js

@@ -146,3 +146,12 @@ export function wmsProjectDeliveryForceCheck(data) {
     data
   })
 }
+
+
+// 批量装载拣选托盘号
+export function projectDeliveryAddLpns(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryAddLpns',
+    data
+  })
+}

package/src/views/wms/api/outbound/pick/common.js

@@ -22,3 +22,11 @@ export function projectWmsOutboundPickGeneratePickContainerNo(data) {
     data
   })
 }
+
+// 拣选路径
+export function projectWmsOutboundPickQueryPath(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPickQueryPath',
+    data
+  })
+}

package/src/views/wms/api/outbound/pick/notAlone.js

@@ -40,3 +40,12 @@ export function projectWmsOutboundPickPrint(data) {
     data
   })
 }
+
+
+// 获取托盘的拣选任务
+export function projectDeliveryListLpnPickTask(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryListLpnPickTask',
+    data
+  })
+}

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

@@ -8,9 +8,9 @@ import lwAxios from "../../../../utils/Axios";
 
 
 // 按单查询收货单信息
-export function wmsMobileExtInQueryAsnByCustom(data) {
+export function wmsMobileMixInQueryAsnListV2(data) {
   return lwAxios.action({
-    url: 'wmsMobileExtInQueryAsnByCustom',
+    url: 'wmsMobileMixInQueryAsnListV2',
     data
   })
 }
@@ -26,9 +26,9 @@ export function wmsMobileMixInGetOrders(data) {
 
 
 // 通过id查询到货单数据 - 起始页用 - 多单
-export function wmsMobileExtInGetAsnList(data) {
+export function wmsMobileMixInGetAsnListV2(data) {
   return lwAxios.action({
-    url: 'wmsMobileExtInGetAsnList',
+    url: 'wmsMobileMixInGetAsnListV2',
     data
   })
 }

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

@@ -188,9 +188,17 @@ export function wmsMobileSecondAllocatePutawayByWholeLpnBatch(data){
   })
 }
 
-export function wmsMobilePutawayTaskCancelLine(data){
+export function wmsMobilePutawayTaskCancelLine(data) {
   return lwAxios.action({
-    url:'wmsMobilePutawayTaskCancelLine',
+    url: 'wmsMobilePutawayTaskCancelLine',
+    data
+  })
+}
+
+// 批量获取任务
+export function wmsMobileGetPutawayTaskList(data) {
+  return lwAxios.action({
+    url: 'wmsMobileGetPutawayTaskList',
     data
   })
 }

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

@@ -0,0 +1,34 @@
+/*
+* 按商品上架
+* @author: 张文
+* @date  2024-09-23
+* */
+
+import lwAxios from "../../../../utils/Axios";
+
+
+// 获取商品库存
+export function wmsMobileInPutawayGetSkuInventory(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInPutawayGetSkuInventory',
+    data
+  })
+}
+
+
+// 查询数据
+export function wmsMobileInPutawayQuerySkuPagingList(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInPutawayQuerySkuPagingList',
+    data
+  })
+}
+
+
+// 生成任务
+export function wmsMobileInPutawayCreateTaskBySku(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInPutawayCreateTaskBySku',
+    data
+  })
+}

package/src/views/wms/module/GetQtyByType/index.vue

@@ -349,7 +349,7 @@ export default {
      * @param {Number} qty 需要回显的EA数
      * */
     setQty(qty) {
-      let numQty = qty || this.qty
+      let numQty = qty === undefined ? this.qty : qty
 
       // 判断当前包装信息是否加载完成
       if (!this.packDataRendered) {

package/src/views/wms/module/ScanDataList/index.vue

@@ -295,7 +295,10 @@ export default {
         message: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.msnpyznm', '确认删除:') + sn,
       }).then(() => {
         const item = this.scanList.splice(index, 1)
-        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.olgsxjea', '删除成功'))
+        this.$lwToast.success({
+          message: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.olgsxjea', '删除成功'),
+          forbidClick: false
+        })
         this.$emit('del', item[0])
       }).catch(() => {
       })
@@ -360,7 +363,7 @@ export default {
 }
 
 .lw-scan-data-list-bright {
-  background: rgb(233, 255, 79);
+  background: #E9FF4F;
 }
 
 </style>

package/src/views/wms/page/count/inv/action/index.vue

@@ -494,7 +494,6 @@ import {
 import CountBoard from '../../components/CountBoard.vue'
 import RandomCount from '../../components/RandomCount.vue'
 import waitSubmitSkuItemCollapse from './../components/waitSubmitSkuItemCollapse.vue'
-import stringRandom from "string-random";
 
 export default {
   name: 'lwCountInvActionPage',
@@ -1036,7 +1035,7 @@ export default {
           return {
             ...item,
             countQty: getCountQty(item.systemQty, item.countQty),
-            _time: stringRandom(10, {numbers: true}) + Date.now(),
+            _time: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
           }
         })
 

package/src/views/wms/page/inbound/components/QualityTaskInfo.vue

@@ -59,7 +59,7 @@
       <lw-data-look-item
         :value="data.qualityLossQtyLabel"
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.dstmavxr', '异常量')"
-        color="yellow"
+        subject-color
       />
 
       <lw-data-look-item

package/src/views/wms/page/inner/fragQuickMove/action/index.vue

@@ -306,11 +306,6 @@ export default {
       return this.inv.invList[this.inv.invIndex]
     },
   },
-  watch: {
-    printOldLabelSwitchDisabled(n) {
-      if (n) this.printOldLabelSwitch = false
-    }
-  },
   mounted() {
     this.getInvData()
     this.checkLpnPrint()
@@ -495,7 +490,7 @@ export default {
 
     // 执行移动
     move() {
-      this.locCheck()
+      if (!this.locCheck()) return;
       if (this.nowTaskLine.collectSn) {
         if (!this.sn.snList.length) {
           this.$lwShowErrorMsg(

package/src/views/wms/page/inner/lpnCount/action.vue

@@ -546,7 +546,7 @@
     >
 
       <div
-        style="text-align: center;font-size: 16px;padding: 20px 0"
+        style="text-align: center;font-size: 1.14rem;padding: 20px 0"
         class="lw-global-value-bold-red"
       >
         {{