@logwire/logwire-wms-pda-ui 3.5.4 → 3.5.5-wat.2

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/lotTransfer.js

@@ -14,6 +14,13 @@ export function wmsMobileInnerLotTransferGetLotDetail(data) {
   })
 }
 
+export function wmsMobileInnerLotTransferGetWholeContainerDetail(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInnerLotTransferGetWholeContainerDetail',
+    data
+  })
+}
+
 
 // 按商品转移批次
 export function wmsMobileInnerLotTransferSubmitBySku(data) {

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/delivery/action.js

@@ -116,12 +116,12 @@ export function projectDeliveryCompleteLoad(data) {
 
 
 // 检查发运单是否装载完成
-export function projectDeliveryQueryLoadSoInfo(data) {
+/*export function projectDeliveryQueryLoadSoInfo(data) {
   return lwAxios.action({
     url: 'projectDeliveryQueryLoadSoInfo',
     data
   })
-}
+}*/
 
 
 // 继续装车
@@ -188,3 +188,59 @@ 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
+  })
+}

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

@@ -102,6 +102,13 @@ export function wmsProjectDeliveryHasNoPickCheck(data) {
   })
 }
 
+export function wmsProjectDeliveryLoadShipCheck(data) {
+  return lwAxios.action({
+    url: 'wmsProjectDeliveryLoadShipCheck',
+    data
+  })
+}
+
 
 // 强制装车
 export function projectDeliveryForceLoad(data) {
@@ -146,3 +153,12 @@ export function wmsProjectDeliveryForceCheck(data) {
     data
   })
 }
+
+
+// 批量装载拣选托盘号
+export function projectDeliveryAddLpns(data) {
+  return lwAxios.action({
+    url: 'projectDeliveryAddLpns',
+    data
+  })
+}

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

@@ -6,6 +6,14 @@
 import lwAxios from '../../../../utils/Axios'
 
 
+// 获取拣选规则列表
+export function listRulePickOrders(data) {
+  return lwAxios.action({
+    url: 'listRulePickOrders',
+    data
+  })
+}
+
 // 获取运单列表
 export function wmsProjectDeliveryPickQueryPage(data) {
   return lwAxios.action({

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

@@ -0,0 +1,15 @@
+/*
+* 拣选单拣选
+* @author: 张文
+* @date  2023-08-22
+* */
+import lwAxios from '../../../../utils/Axios'
+
+
+// 通过拣选单获取拣选数据
+export function projectWmsOutboundTaskDetails(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundTaskDetails',
+    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/module/AbnormalInput/index.vue

@@ -98,7 +98,7 @@
     />
 
     <!-- 图片 -->
-    <div class="lw-global-title" style="padding: 8px 0">
+    <div class="lw-global-title" style="padding: 8px 0" :class="mustUploadImg ? 'lw-global-title lw-global-required' : 'lw-global-title' ">
       {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.img','图片') }}
     </div>
     <lw-img-upload v-model="abnormal.abnImgArr"/>
@@ -149,7 +149,11 @@ export default {
     },
 
     // 当前库位的编码
-    currentLocCode: String
+    currentLocCode: String,
+    mustUploadImg: {
+      type: Boolean,
+      default: false,
+    }
 
   },
   data() {
@@ -197,6 +201,7 @@ export default {
     } else {
       this.abnTypeList = abnTypeList
     }
+    this.mustUploadImg = this.$lwWarehouseConfig.get('systemConfig.WAREHOUSE_SUBMIT_ABNORMAL_MUST_UPLOAD_IMAGE') === 'true'
 
     this.getAbnLocCode()
   },
@@ -319,6 +324,15 @@ export default {
 
       if (!this.abnLpnCheck()) return
 
+      if (this.mustUploadImg) {
+        if (!this.abnormal.abnImgArr || this.abnormal.abnImgArr.length <= 0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.module.inboundAbn.abnImgArrNull','异常图片不能为空')
+          )
+          return false
+        }
+      }
+
       return true
     },
     // 获取填写的异常数据

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/ReceiveAbnormal/index.vue

@@ -436,7 +436,7 @@
         />
 
         <!-- 图片 -->
-        <div class="lw-global-title" style="padding: 8px 0">
+        <div class="lw-global-title" style="padding: 8px 0" :class="mustUploadImg ? 'lw-global-title lw-global-required' : 'lw-global-title' ">
           {{ $lwLanguage.get('wms_project.pda.module.receiveAbn.img','图片') }}
         </div>
         <lw-img-upload v-model="skuInfo.imagesArr"/>
@@ -576,6 +576,10 @@ export default {
 
     // 商品的分组key
     groupKey: String,
+    mustUploadImg: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -711,6 +715,8 @@ export default {
     }
   },
   mounted() {
+    this.mustUploadImg = this.$lwWarehouseConfig.get('systemConfig.WAREHOUSE_SUBMIT_ABNORMAL_MUST_UPLOAD_IMAGE') === 'true'
+
     this.init()
   },
   methods: {
@@ -1049,6 +1055,15 @@ export default {
         return false
       }
 
+      if (this.mustUploadImg) {
+        if (!this.skuInfo.imagesArr || this.skuInfo.imagesArr.length <= 0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.module.inboundAbn.abnImgArrNull','异常图片不能为空')
+          )
+          return false
+        }
+      }
+
       return true
     },
 

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(() => {
       })

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/inner/check/action/action.vue

@@ -309,7 +309,10 @@
         :rows="4"
       />
 
-
+      <!-- 图片 -->
+      <div class="lw-global-title" style="padding: 8px 0" :class="mustUploadImg ? 'lw-global-title lw-global-required' : 'lw-global-title' ">
+        {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.img','图片') }}
+      </div>
       <lw-img-upload v-model="addAbnormalFrom.abnormalImage" />
 
       <template #button>
@@ -396,6 +399,10 @@ export default {
         remark: false,
       },
       requireLpn: false,
+      mustUploadImg: {
+        type: Boolean,
+        default: false,
+      }
     }
   },
   computed: {
@@ -405,6 +412,8 @@ export default {
     }
   },
   mounted() {
+    this.mustUploadImg = this.$lwWarehouseConfig.get('systemConfig.WAREHOUSE_SUBMIT_ABNORMAL_MUST_UPLOAD_IMAGE') === 'true'
+
     this.$lwApi.warehouse.getList().then(res => {
       this.warehouseList = res
     })
@@ -572,7 +581,14 @@ export default {
         }
       }
 
-
+      if (this.mustUploadImg) {
+        if (!this.addAbnormalFrom.abnormalImage || this.addAbnormalFrom.abnormalImage.length <= 0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.module.inboundAbn.abnImgArrNull','异常图片不能为空')
+          )
+          return false
+        }
+      }
 
       return true;
 

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

@@ -66,7 +66,7 @@
                 <lw-button
                   mini
                   :disabled="!i.canTransferQty || i.canTransferQty !== i.qty"
-                  @click="transferBtnClick('lpn',i)"
+                  @click="transferWholeBtnClick('lpn',i)"
                 >
                   {{ $lwLanguage.get('wms_project.pda.wms.page.inner.lotTransfer.action.snoiaxrn', '转移') }}
                 </lw-button>
@@ -144,7 +144,7 @@
                 <lw-button
                   mini
                   :disabled="!i.canTransferQty || i.canTransferQty !== i.qty"
-                  @click="transferBtnClick('box',i)"
+                  @click="transferWholeBtnClick('box',i)"
                 >
                   {{ $lwLanguage.get('wms_project.pda.wms.page.inner.lotTransfer.action.snoiaxrn', '转移') }}
                 </lw-button>
@@ -297,11 +297,18 @@
 
       <template v-if="lotPopup.showModel">
 
-        <lot-item
-          class="lw-global-model-box"
-          :item="lotPopup.data"
-        />
-
+        <template v-if="lotPopup.type==='sku'">
+          <lot-item
+            class="lw-global-model-box"
+            :item="lotPopup.data"
+          />
+        </template>
+        <template v-else>
+          <wholeLotItem
+            class="lw-global-model-box"
+            :item="lotPopup.data"
+          />
+        </template>
         <div class="lw-global-model-box lw-global-model-box-3px">
           <!-- 零散转移 -->
           <template v-if="lotPopup.type==='sku'">
@@ -419,6 +426,7 @@
 <script>
 
 import lotItem from "./components/lotItem.vue";
+import wholeLotItem from "./components/wholeLotItem.vue";
 import {
   projectWmsInnerLotTransferSubmit,
   wmsInnerLotTransferQueryCase,
@@ -427,6 +435,7 @@ import {
   wmsInnerQueryInventoryList,
   wmsMobileInboundNewReceiveLpn,
   wmsMobileInnerLotTransferGetLotDetail,
+  wmsMobileInnerLotTransferGetWholeContainerDetail,
   wmsMobileInnerLotTransferQuerySn,
   wmsMobileInnerLotTransferSubmitBySku,
   wmsMobileInnerLotTransferSubmitBySn
@@ -435,7 +444,8 @@ import {
 export default {
   name: "lwInnerLotTransferAction",
   components: {
-    lotItem
+    lotItem,
+    wholeLotItem
   },
   data() {
     return {
@@ -680,6 +690,24 @@ export default {
       })
     },
 
+    transferWholeBtnClick(type, item) {
+      const {lpn, caseNum} = item
+      let queryType = type==='lpn'?'lpn':'case_num';
+      this.lotPopup.param = {
+        skuId: this.$route.query.skuId,
+        locationId: this.$route.query.locationId,
+        ownerId: this.skuInfo.ownerId,
+        lpn,
+        caseNum,
+        queryType
+      }
+      this.lotPopup.type = type
+      wmsMobileInnerLotTransferGetWholeContainerDetail(this.lotPopup.param).then(res => {
+        this.lotPopup.data = res
+        this.lotPopup.show = true
+      })
+    },
+
     // 转移弹框 - 打开
     lotPopupOpen() {
       this.lotPopup.moveLoc = this.$lwWarehouseConfig.get('systemConfig.WMS_INNER_INVENTORY_TRANSFER_SUPPORT_MOVE') === 'true'

package/src/views/wms/page/inner/lotTransfer/components/wholeLotItem.vue

@@ -0,0 +1,67 @@
+<!--
+  批次项
+  @author: 张文
+  @date: 2023-08-25
+-->
+<template>
+  <div>
+    <lw-label-value-group
+      :list="item.contentList"
+      :show-end-row-style="false"
+    />
+
+    <div
+      v-if="nowShowLotInfo.displayLot.items && nowShowLotInfo.displayLot.items.length"
+      class="lw-global-row-end"
+    >
+      <lw-title-value-cell
+        title="批次"
+        :value="nowShowLotInfo.lotNo"
+        val-bold
+        val-red
+      />
+      <lw-lot-look-module
+        :columns="nowShowLotInfo.displayLot.items"
+        :show-row="false"
+      />
+    </div>
+
+    <!-- 切换按钮 -->
+    <lw-cut-card
+      v-model="actionIndex"
+      :length="item.lotLines.length"
+    />
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "wholeLotItem",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {
+      // 当前操作的数据索引
+      actionIndex: 0,
+    }
+  },
+  computed: {
+    nowShowLotInfo() {
+      console.log(this.item)
+      return this.item.lotLines[this.actionIndex] || {}
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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"
       >
         {{