@logwire/logwire-wms-pda-ui 3.1.3-zc-beta → 3.3.2

package/src/views/wms/page/outbound/pick/sow/index.vue

@@ -73,7 +73,7 @@
         <van-tabs
           type="card"
           animated
-          v-model="tabAction"
+          v-model="tabActive"
         >
 
           <van-tab
@@ -84,23 +84,23 @@
             <div class="lw-global-model-box">
 
               <sku-location-info
-                :item="pickLineData"
+                :item="nowPickData"
                 wait-pick
               />
 
               <!-- 托盘号 -->
               <lw-title-value-cell
-                v-if="pickLineData.fromLpn"
+                v-if="nowPickData.fromLpn"
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.icbazuab','托盘号')"
-                :value="pickLineData.fromLpn"
+                :value="nowPickData.fromLpn"
                 val-bold
               />
 
               <!-- 箱 -->
               <lw-title-value-cell
-                v-if="pickLineData.fromCase"
+                v-if="nowPickData.fromCase"
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.icbazuaxb','箱号')"
-                :value="pickLineData.fromCase"
+                :value="nowPickData.fromCase"
                 val-bold
               />
 
@@ -129,7 +129,7 @@
 
               <!-- 箱号 -->
               <lw-input
-                v-if="pickLineData.fromCase"
+                v-if="nowPickData.fromCase"
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.icbazuaxb','箱号')"
                 v-model="box.value"
                 :get-focus.sync="box.focus"
@@ -293,7 +293,7 @@
 
 
     <!-- 拣选的底部操作按钮 -->
-    <lw-bottom-bar v-if="showBottomBar && tabAction==='ing'">
+    <lw-bottom-bar v-if="showBottomBar && tabActive==='ing'">
 
       <lw-button
         type="last"
@@ -316,7 +316,7 @@
 
     </lw-bottom-bar>
 
-    <lw-bottom-bar v-if="showBottomBar && tabAction==='sow'">
+    <lw-bottom-bar v-if="showBottomBar && tabActive==='sow'">
 
       <lw-button
         type="last"
@@ -405,8 +405,8 @@
     >
 
       <lw-sku-info-module
-        :sku-name="pickLineData.skuName"
-        :sku-code="pickLineData.skuCode"
+        :sku-name="nowPickData.skuName"
+        :sku-code="nowPickData.skuCode"
         :qty="qty.value"
         :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.bcvasnej','当前拣选量')"
         is-row-first
@@ -479,9 +479,9 @@
       <lw-inner-abnormal-module
         v-if="abnPopup.comShow"
         ref="abnormal"
-        :sku-code="pickLineData.skuCode"
-        :sku-name="pickLineData.skuName"
-        :location="pickLineData.fromLocationCode"
+        :sku-code="nowPickData.skuCode"
+        :sku-name="nowPickData.skuName"
+        :location="nowPickData.fromLocationCode"
         :qty="waitPickQty"
         :type="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.nmwudjru','在库')"
         :ab-type="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.nzhpvyuv','拣选')"
@@ -502,14 +502,14 @@
     >
 
       <lw-sku-info-module
-        :sku-code="pickLineData.skuCode"
-        :sku-name="pickLineData.skuName"
+        :sku-code="nowPickData.skuCode"
+        :sku-name="nowPickData.skuName"
       >
         <lw-tag
-          v-if="pickLineData.skuSizeLabel"
+          v-if="nowPickData.skuSizeLabel"
           plain
           round
-        >{{ pickLineData.skuSizeLabel }}
+        >{{ nowPickData.skuSizeLabel }}
         </lw-tag>
       </lw-sku-info-module>
 
@@ -517,7 +517,7 @@
 
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.rriutzfg','拣选库位')"
-          :value="pickLineData.fromLocationCode"
+          :value="nowPickData.fromLocationCode"
           val-bold
           :is-row="false"
         />
@@ -527,7 +527,7 @@
               {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.mqmhprin', '最小销售量') }}
             </span>
           <span class="lw-global-value-bold-red">
-              {{ pickLineData.uomQty }}
+              {{ nowPickData.uomQty }}
             </span>
         </div>
 
@@ -699,10 +699,6 @@ export default {
         }
       },
 
-
-      // 拣选tab激活项
-      tabAction: '',
-
       // 正在拣选的任务索引
       taskIndex: 0,
       // 拣选库位
@@ -766,14 +762,14 @@ export default {
   },
   computed: {
     // 当前拣选行数据
-    pickLineData() {
+    nowPickData() {
       const list = this.pickData.pendingPickLineList
       return list && list.length ? list[this.taskIndex] : {}
     },
 
     // 当前拣选行是否需要校验LPN
     hasLpn() {
-      return !this.pickLineData.fromCase && this.pickLineData.fromLpn
+      return !this.nowPickData.fromCase && this.nowPickData.fromLpn
     },
 
     // 拣选播种调整后的拣选总量
@@ -787,7 +783,7 @@ export default {
 
     // 待拣选量
     waitPickQty() {
-      return Number(this.pickLineData.totalQty || 0) - Number(this.pickLineData.pickQty || 0)
+      return Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
     },
 
     // 绑定弹框 - 当前绑定的播种位
@@ -805,13 +801,13 @@ export default {
         pickId: this.pickData.pickId,
         pickNo: this.pickData.pickNo,
         pickSowToolCode: this.pickData.pickSowToolCode,
-        fromLocationId: this.pickLineData.fromLocationId,
-        fromLpn: this.pickLineData.fromLpn,
-        ownerId: this.pickLineData.ownerId,
-        skuId: this.pickLineData.skuId,
-        uom: this.pickLineData.uom,
-        uomQty: this.pickLineData.uomQty,
-        lineGroupKey: this.pickLineData.lineGroupKey,
+        fromLocationId: this.nowPickData.fromLocationId,
+        fromLpn: this.nowPickData.fromLpn,
+        ownerId: this.nowPickData.ownerId,
+        skuId: this.nowPickData.skuId,
+        uom: this.nowPickData.uom,
+        uomQty: this.nowPickData.uomQty,
+        lineGroupKey: this.nowPickData.lineGroupKey,
       }
     },
 
@@ -1007,7 +1003,7 @@ export default {
       if (this.locationCodeCheck()) {
         if (this.hasLpn) {
           this.lpn.focus = true
-        } else if (this.pickLineData.fromCase) {
+        } else if (this.nowPickData.fromCase) {
           this.box.focus = true
         } else {
           this.sku.focus = true
@@ -1018,7 +1014,7 @@ export default {
     locationCodeCheck() {
       return this.inputCheck({
         key: 'locationCode',
-        checkVal: this.pickLineData.fromLocationCode,
+        checkVal: this.nowPickData.fromLocationCode,
       })
     },
 
@@ -1044,7 +1040,7 @@ export default {
     // 箱号校验
     boxCheck() {
 
-      if (!this.pickLineData.fromCase) return true
+      if (!this.nowPickData.fromCase) return true
 
       return this.inputCheck({
         key: 'box',
@@ -1058,14 +1054,14 @@ export default {
       if (!this.skuCheck()) return
 
       // 有可能是sn
-      if (this.pickLineData.skuCode !== this.sku.value) {
+      if (this.nowPickData.skuCode !== this.sku.value) {
         const res = await projectWmsGetSkuBySn({
           sn: this.sku.value,
-          skuId: this.pickLineData.skuId,
-          ownerId: this.pickLineData.ownerId
+          skuId: this.nowPickData.skuId,
+          ownerId: this.nowPickData.ownerId
         })
 
-        if (res !== this.pickLineData.skuCode) {
+        if (res !== this.nowPickData.skuCode) {
           this.sku.focus = true
           this.$lwShowErrorMsg(
             this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.sow.index.lyrwpbcg', '当前商品与拣选商品不一致')
@@ -1079,7 +1075,7 @@ export default {
 
       this.nowSkuCode = this.sku.value
 
-      let newQty = Number(this.pickLineData.uomQty)
+      let newQty = Number(this.nowPickData.uomQty)
       // 如果条码解析成功，并且能解析出数量就加法运算
       if (data.qty) {
         newQty = data.qty
@@ -1087,7 +1083,7 @@ export default {
 
       this.qty.value = Number(this.qty.value || 0) + newQty
 
-      const waitQty = Number(this.pickLineData.totalQty || 0) - Number(this.pickLineData.pickQty || 0)
+      const waitQty = Number(this.nowPickData.totalQty || 0) - Number(this.nowPickData.pickQty || 0)
       if (this.qty.value === waitQty) {
         this.pickConfirm()
         return;
@@ -1119,7 +1115,7 @@ export default {
         return false
       }
 
-      const item = this.pickLineData
+      const item = this.nowPickData
       const uomQty = Number(item.uomQty || 0)
 
       if (uomQty === 0) {
@@ -1158,11 +1154,13 @@ export default {
     },
     // 任务行切换后
     cutEnd() {
+
       const {focus} = this.clearInputVal(
-        ['locationCode', 'lpn', 'box'],
+        this.getCheckInputKeyArr(this.nowPickData.fromCase),
         ['sku', 'qty']
       )
       this.nowSkuCode = ''
+      
       this.tabActive === 'ing' ? this[focus].focus = true : ''
     },
 
@@ -1236,7 +1234,6 @@ export default {
         )
         this.sowLocPopup.clearData = true
         this.sowLocPopup.show = false
-        this.locationCode.focus = true
       })
     },
     // 确认播种拣选弹框关闭

package/src/views/wms/page/outbound/pickConsole/components/waitOverTaskItem.vue

@@ -15,13 +15,13 @@
     <template v-if="item.pickType==='300'">
       <wait-over-title
         :loc="item.fromLocationCode"
-        :qty="item.skuList[0].qty"
+        :qty="item.totalQty"
         :name="item.pickName"
         :time="item.pickTime"
         :type="type"
         :pick-type="item.pickType"
-        :sku-code="item.skuList[0].skuCode"
-        :sku-name="item.skuList[0].skuName"
+        :sku-code="item.skuCode"
+        :sku-name="item.skuName"
         :show-back="showBack"
         @back="$emit('back')"
         @itemClick="$emit('itemClick')"

package/src/views/wms/page/outbound/pickConsole/createOrder/index.vue

@@ -24,6 +24,7 @@
           label-key="code,name"
           :disabled="inputDisabled"
           :init-val="owner.initVal"
+          input-align="right"
           @confirm="item=>ownerCustomerPopupConfirm('owner',item)"
           @clear="ownerCustomerPopupClear('owner')"
         />
@@ -37,6 +38,7 @@
           :api-fn="k=>ownerCustomerApi('customer',k)"
           label-key="code,name"
           :init-val="customer.initVal"
+          input-align="right"
           @confirm="item=>ownerCustomerPopupConfirm('customer',item)"
           @clear="ownerCustomerPopupClear('customer')"
         />
@@ -60,10 +62,25 @@
           v-model="extSoNo"
           :create-rule="$lwScanRule.create('出库拣选控制台-创建出库单-外部单号','ASN')"
           rule-key="extSoNo"
-          :show-bottom-border="false"
           required
           input-align="right"
-          @confirm="addSku"
+          @confirm="extSoNoConfirm"
+        />
+
+        <lw-cell-popup-radio
+          v-if="showBackCell"
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.createOrder.index.rjczjkhm','退货方式')"
+          v-model="back.value"
+          dict-key="OutboundReturnMethod"
+        />
+
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.wzcbykehc','备注')"
+          v-model="remark"
+          :show-bottom-border="false"
+          input-align="right"
+          type="textarea"
+          :rows="4"
         />
 
       </div>
@@ -104,6 +121,11 @@
           @confirm="item=>selectPopupConfirm(item,k)"
           @clear="selectPopupClear(k)"
         />
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.createOrder.index.vjsebyga','可用库存数')"
+          :value="$lwCheckVal(i.abQty)"
+          val-bold
+        />
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.itonmutj','出库数量')"
           v-model="i.skuQty"
@@ -122,7 +144,7 @@
         <van-icon
           size="30px"
           name="add"
-          color="#1989fa"
+          color="#D50000"
           @click="addSku"
         />
       </div>
@@ -133,7 +155,7 @@
     <lw-bottom-bar>
 
       <lw-button @click="confirmCreate">
-        {{ navTitle }}
+        {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.ozvhjkcgv', '保存') }}
       </lw-button>
 
     </lw-bottom-bar>
@@ -145,7 +167,10 @@
 <script>
 
 import {
-  projectWmsOutboundPDASoCreate, projectWmsOutboundPDASoQueryUpdateInfo, projectWmsOutboundPDASoSubmitUpdateInfo,
+  projectWmsOutboundPDAGetReturnTypes, projectWmsOutboundPDAQuerySkuInvAbQty,
+  projectWmsOutboundPDASoCreate,
+  projectWmsOutboundPDASoQueryUpdateInfo,
+  projectWmsOutboundPDASoSubmitUpdateInfo,
   wmsMobileGetOwnerSku,
   wmsMobileGetWarehouseCustomer,
   wmsMobileGetWarehouseOwner
@@ -180,6 +205,12 @@ export default {
       type: '',
       planTime: '',
       extSoNo: '',
+      remark: '',
+      // 退货
+      back: {
+        value: '',
+        list: []
+      },
 
       skuList: [],
       // 编辑时使用
@@ -198,6 +229,10 @@ export default {
     inputDisabled() {
       return this.skuList.some(item => item.skuCode)
     },
+    // 是否显示退货方式
+    showBackCell() {
+      return this.back.list.includes(this.type)
+    }
   },
   created() {
     this.init()
@@ -205,6 +240,8 @@ export default {
   methods: {
     // 初始化
     async init() {
+      projectWmsOutboundPDAGetReturnTypes().then(res => this.back.list = res || [])
+
       if (this.$route.query.soId) {
         await this.getEditData()
       } else {
@@ -248,6 +285,8 @@ export default {
         this.type = res.type
         this.planTime = res.planShipTime
         this.extSoNo = res.extSoNo
+        this.remark = res.remark
+        this.back.value = res.returnMethod
 
         this.skuList = res.skuList.map(item => {
           return {
@@ -329,6 +368,18 @@ export default {
 
     },
 
+    // 外部单号输入确认
+    extSoNoConfirm() {
+      if (this.skuList.length) {
+        const firstSku = this.skuList[0]
+        if (firstSku.skuCode) {
+          firstSku.qtyFocus = true
+        } else {
+          firstSku.skuFocus = true
+        }
+      }
+    },
+
 
     // 增加商品
     async addSku() {
@@ -346,6 +397,7 @@ export default {
         skuFocus: true,
         skuName: '',
         skuQty: '',
+        abQty: '',
         qtyFocus: false,
         skuId: '',
         txCode: 'I'
@@ -368,12 +420,21 @@ export default {
     // 商品选择弹框 - 确认选择
     selectPopupConfirm(item, index) {
 
-      const {code, name, id} = item
-      this.skuList[index].skuCode = code
+      // const {code, name, id} = item
+      /*this.skuList[index].skuCode = code
       this.skuList[index].skuName = name
-      this.skuList[index].skuId = id
+      this.skuList[index].skuId = id*/
 
-      this.skuList[index].qtyFocus = true
+      projectWmsOutboundPDAQuerySkuInvAbQty({
+        ownerId: this.owner.id,
+        skuId: item.id
+      }).then(res => {
+        this.skuList[index].skuCode = res.skuCode
+        this.skuList[index].skuName = res.skuName
+        this.skuList[index].skuId = res.skuId
+        this.skuList[index].abQty = res.abQty
+        this.skuList[index].qtyFocus = true
+      })
 
     },
     // 商品选择弹框 - 清除商品
@@ -382,6 +443,7 @@ export default {
       this.skuList[index].skuName = ''
       this.skuList[index].skuId = ''
       this.skuList[index].skuQty = ''
+      this.skuList[index].abQty = ''
     },
 
     // 创建出库订单
@@ -399,13 +461,13 @@ export default {
       for (let i = 0; i < this.skuList.length; i++) {
         if (!this.skuList[i].skuCode) {
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.glldehuz', '商品{num}，商品信息不能为空', {num: i})
+            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.glldehuz', '商品{num}，商品信息不能为空', {num: i + 1})
           )
           return
         }
         if (!Number(this.skuList[i].skuQty || 0)) {
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.rrxnqysp', '商品{num}，出库数量不能为空且应当是大于0的整数', {num: i})
+            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.createOrder.index.rrxnqysp', '商品{num}，出库数量不能为空且应当是大于0的整数', {num: i + 1})
           )
           return
         }
@@ -435,7 +497,9 @@ export default {
         type: this.type,
         planShipTime: this.planTime,
         extSoNo: this.extSoNo,
-        skuList
+        remark: this.remark,
+        skuList,
+        returnMethod: this.back.value
       })
 
       const msg = soId ?
@@ -452,7 +516,8 @@ export default {
       this.$router.push({
         path: '/outbound/pickConsole/lwOrderAction',
         query: {
-          lwOrderId: res.id
+          lwOrderId: res.id,
+          lwBackStep: '2'
         }
       })
     },