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

package/src/views/wms/page/inbound/receive/receive-sku/LwInboundReceiveSkuDirectPage.vue

@@ -166,7 +166,18 @@
           :required="asn.requiredLpn"
           v-model="receiveLpn.value"
           :get-focus.sync="receiveLpn.focus"
-        />
+        >
+          <template #button>
+
+            <lw-button
+              mini
+              @click="createLpnFn"
+            >
+              {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.vmjriwdcic', '生成') }}
+            </lw-button>
+
+          </template>
+        </lw-input>
         <div class="lw-global-flex-start-start lw-global-row-end">
           <div class="lw-global-title" style="margin-right: 5px">
             {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.vmjriwdci', '收货照片') }}
@@ -265,7 +276,8 @@ import {
   getAsnSkuSnDetail,
   getInboundAsnByAsnNo, submitAsnAbnormalReceive,
   submitAsnFastReceiveForSku,
-  submitAsnFastReceiveForSkuSn
+  submitAsnFastReceiveForSkuSn,
+  wmsMobileInboundNewReceiveLpn
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 import AsnSkuInfo from '../../components/AsnSkuInfo.vue'
@@ -324,7 +336,10 @@ export default {
       printPopupShow: false,
       printData: {},
       containerPrintShow: false,
-      containerPrintData: {}
+      containerPrintData: {},
+
+      createLpn: '',
+      printLpnData: {}
     }
   },
   computed: {
@@ -347,6 +362,14 @@ export default {
       return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.uecsvjpd', '错误的到货通知单或商品'))
     }
     this.loadAsnAndSku(asnNo)
+
+    const {printData} = this.$lwPrint.test(
+      'PART_RECEIVE_LABEL',
+      this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.gdurijqqr', '收货托盘标签'),
+      false,
+      false
+    )
+    this.printLpnData = printData
   },
   methods: {
     loadAsnAndSku(asnNo) {
@@ -471,19 +494,31 @@ export default {
       this.showSubmit = true
     },
     async doSubmit() {
+
+      const qty = this.submitQty
+      if (qty <= 0) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.utgdeatd', '收货数量必须大于0'))
+      }
+
+      const lpn = this.receiveLpn.value
+
       const data = {
         warehouseId: this.asn.warehouseId,
         asnId: this.asn.id,
         skuId: this.asnSku.sku.id,
         locationCode: this.receiveLoc.value,
-        lpn: this.receiveLpn.value,
-        qty: this.submitQty,
+        lpn,
+        qty,
         lotAttributes: this.lotData,
         images: this.imgList.join('|')
       }
-      if (data.qty <= 0) {
-        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_sku.utgdeatd', '收货数量必须大于0'))
+
+      // 判断当前输入托盘号是否是生成的
+      if (lpn === this.createLpn && Object.keys(this.printLpnData).length) {
+        data.printReceiveDeviceId = this.printLpnData.printId
+        data.printReceiveTemplate = this.printLpnData.templateId
       }
+
       let api = ''
       if (this.asnSku.sku.needSn) {
         data.snList = this.sns
@@ -508,6 +543,13 @@ export default {
       this.sns = []
       this.tags = []
       this.showSubmit = false
+
+      // 打印托盘标签
+      if (res && Object.keys(this.printLpnData).length && Array.isArray(res.printList)) {
+        res.printList.forEach(item => {
+          this.$lwPrint.bluetoothPrint(item.id)
+        })
+      }
     },
     showAbnormalPop() {
       const lotData = this.$refs.lotEl.getData()
@@ -539,6 +581,14 @@ export default {
     },
 
 
+    // 生成收货托盘
+    createLpnFn() {
+      wmsMobileInboundNewReceiveLpn().then(res => {
+        this.createLpn = res
+        this.receiveLpn.value = res
+      })
+    },
+
     // 补码按钮点击
     printClick() {
       if (!Object.keys(this.printData).length) {

package/src/views/wms/page/inbound/unload/action/index.vue

@@ -8,7 +8,16 @@
 
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.dagbhasd','卸货')"/>
 
-    <div class="lw-global-page-box">
+    <lw-page-body-module>
+      <div class="lw-global-model-box">
+        <lw-user-checkbox-module
+          :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.srznmjcg', '卸货人')"
+          v-model="staff.list"
+          :focus.sync="staff.focus"
+          :is-row="false"
+          @change="staffSetLocalStorage"
+        />
+      </div>
 
       <div class="lw-global-model-box">
 
@@ -17,7 +26,7 @@
           <div class="lw-global-value-bold">{{ unloadData.unloadOrderNo }}</div>
 
           <div class="lw-global-title">
-            {{ $lwDate.format(unloadData.insertDate,'yyyy-MM-dd hh:mm') }}
+            {{ $lwDate.format(unloadData.insertDate, 'yyyy-MM-dd hh:mm') }}
           </div>
 
         </div>
@@ -36,7 +45,7 @@
 
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.rphbeioq','车牌号')"
-          :value="unloadData.carrierPlateNum"
+          :value="$lwCheckVal(unloadData.carrierPlateNum)"
         />
 
         <lw-title-value-cell
@@ -44,6 +53,7 @@
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fwcikzex','计划量')"
           :value="unloadData.plannedQuantity"
           val-bold
+          :is-row-end="unloadData.unloadQuantity"
         />
 
         <lw-title-value-cell
@@ -178,8 +188,7 @@
       </div>
 
 
-
-    </div>
+    </lw-page-body-module>
 
     <lw-bottom-bar>
 
@@ -323,36 +332,40 @@ import {
   wmsMobileScanEntryUnloadOrder,
   wmsMobileUnloadQueryInfo, wmsMobileUnloadQuerySku
 } from "../../../../api/inbound/unload";
+import {uploadMixin} from "./../uploadMixin";
 
 export default {
   name: "lwInboundUnloadActionPage",
+  mixins: [uploadMixin],
   data() {
     return {
+
+
       // 卸货单数据
-      unloadData:{},
+      unloadData: {},
 
-      tabActive:'lpn',
-      tabActiveOld:'lpn',
+      tabActive: 'lpn',
+      tabActiveOld: 'lpn',
 
-      dataInfo:{
-        skuCode:{
-          value:'',
+      dataInfo: {
+        skuCode: {
+          value: '',
           focus: false
         },
-        skuName:{
-          value:'',
+        skuName: {
+          value: '',
           focus: false
         },
-        lpn:{
-          value:'',
+        lpn: {
+          value: '',
           focus: false
         },
-        case:{
-          value:'',
+        case: {
+          value: '',
           focus: false
         },
-        qty:{
-          value:'',
+        qty: {
+          value: '',
           focus: false
         },
         list:[],
@@ -560,19 +573,29 @@ export default {
           this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.rhshoegd','托')
           break;
         case 'case':
-          this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gewkuvfg','箱')
+          this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gewkuvfg', '箱')
           break;
         default:
-          this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gwidwenz','商品')
+          this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gwidwenz', '商品')
       }
 
       this.confirmPopup.show = true
     },
     // 确认卸货提交
-    async confirmPopupSubmit(){
-      if (!Number(this.confirmPopup.qty.value || 0)){
+    async confirmPopupSubmit() {
+      if (!Number(this.confirmPopup.qty.value || 0)) {
+        this.confirmPopup.qty.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.nrjnyceo', '数量不能为空，且应当是大于0的正整数')
+        )
+        return
+      }
+
+      const staffList = this.staff.list.map(item => item.code)
+      if (!staffList.length) {
+        this.staff.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.nrjnyceo','数量不能为空，且应当是大于0的正整数')
+          this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.ihxngxxl', '卸货人不能为空')
         )
         return
       }
@@ -580,13 +603,14 @@ export default {
       await wmsMobileScanEntryUnloadOrder({
         unloadOrderId: this.unloadData.unloadOrderId,
         unloadSpecification: this.tabActive.toUpperCase(),
-        qty:this.confirmPopup.qty.value,
+        qty: this.confirmPopup.qty.value,
         unloadException: this.dataInfo.abnormal.value,
         remark: this.dataInfo.remark.value,
         skuId: this.selectSkuPopup.data.id,
         skuCode: this.dataInfo.skuCode.value,
         skuName: this.dataInfo.skuName.value,
-        scanLineList: this.dataInfo.list.map(item=>item.code)
+        scanLineList: this.dataInfo.list.map(item => item.code),
+        staffList
       })
 
       this.$lwToast.success(

package/src/views/wms/page/inbound/unload/add/index.vue

@@ -18,7 +18,6 @@
         <lw-car-plate
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.orgxnrjc','车牌号')"
           v-model="carPlate"
-          required
         />
 
         <lw-input
@@ -27,7 +26,6 @@
           :get-focus.sync="dock.focus"
           rule-key="unloadDock"
           :create-rule="$lwScanRule.create('卸货-新建卸货单-月台','DOCK')"
-          required
           @confirm="dockConfirm()"
         >
 
@@ -113,112 +111,26 @@
             round
             @click="delOrder(k)"
           >
-            {{$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.oeprmynk','删除')}}
+            {{ $lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.oeprmynk', '删除') }}
           </lw-button>
         </div>
 
-        <template v-else>
-
-          <div class="lw-global-model-top-radius">
-
-            <div class="lw-global-flex-between">
-              <lw-title-value-cell
-                :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.lojdmtfb','到货通知单')"
-                :value="i.asnNo"
-                :is-row="false"
-                val-bold
-              />
-
-              <lw-button
-                mini
-                round
-                @click="delOrder(k)"
-              >
-                {{$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.oeprmynk','删除')}}
-              </lw-button>
-            </div>
-
-            <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.bwuvynuf','外部单号')"
-              :value="i.extNo || '-'"
-              :is-row="false"
-              val-bold
-            />
-
-            <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.dilwxaau','订单类型')"
-              :value="i.typeLabel || '-'"
-              :is-row="false"
-            />
-
-            <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.nxsdjdaw','货主')"
-              :value="(i.ownerCode || '') + '-' + (i.ownerName || '')"
-              :is-row="false"
-            />
-
-            <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.vwsuchzf','承运商')"
-              :value="(i.carrierCode || '') + '-' + (i.carrierCode || '')"
-              :is-row="false"
-            />
-
-            <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.orgxnrjc','车牌号')"
-              :value="i.carrierPlateNum || '-'"
-              :is-row="false"
-            />
-
-            <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.kptmjpmq','计划时间')"
-              :value="$lwDate.format(i.planArrivalTime,'yyyy-MM-dd hh:mm')"
-              :is-row="false"
-            />
-
-            <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.rbvnevfh','预约时间')"
-              :value="$lwDate.format(i.estArrivalTime,'yyyy-MM-dd hh:mm')"
-              :is-row="false"
-            />
-
-            <lw-title-value-cell
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.zibtkidx','预约月台')"
-              :value="(i.dockCode || '') + '-' + (i.dockName || '')"
-              :is-row="false"
-            />
-
-          </div>
-          <lw-data-look-bg type="bottom">
-
-            <lw-data-look-item
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.bdzpvyrd','计划量')"
-              :value="i.qty || 0"
-            />
-
-            <lw-data-look-item
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.tzzqggjj','已收量')"
-              :value="i.receiveQty || 0"
-            />
-
-            <lw-data-look-item
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.ljrkioav','待收量')"
-              :value="i.unReceiveQty || 0"
-            />
-
-            <lw-data-look-item
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.coelqlvq','到货量')"
-              :value="i.arrivalQty || 0"
-            />
-
-            <lw-data-look-item
-              :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.sdqripfp','异常量')"
-              :value="i.qualityLossQty || 0"
-              color="#eeee20"
-            />
-
-          </lw-data-look-bg>
+        <asn-info
+          v-else
+          :item="i"
+        >
 
-        </template>
+          <template #asnNoEnd>
+            <lw-button
+              mini
+              round
+              @click="delOrder(k)"
+            >
+              {{ $lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.oeprmynk', '删除') }}
+            </lw-button>
+          </template>
+
+        </asn-info>
 
       </div>
 
@@ -237,15 +149,35 @@
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.zlfhsgsx','选择单号')"
       v-model="orderSearchPopup.show"
+      :show-keyboard-placeholder="false"
+      background="#f0f0f0"
+      @closed="clearOrderInp"
     >
 
-      <lw-cell
+      <asn-info
         v-for="(i,k) in orderSearchPopup.list"
         :key="k"
-        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.lojdmtfb','到货通知单')"
-        :value="i.asnNo"
-        @click="checkOrder(i)"
-      />
+        :item="i"
+        @click="i._checked = !i._checked"
+      >
+
+        <template #asnNoEnd>
+          <van-checkbox
+            v-model="i._checked"
+            @change="checkedChange(i)"
+          />
+        </template>
+
+      </asn-info>
+
+
+      <template #button>
+
+        <lw-button @click="orderSearchPopupConfirm">
+          {{ $lwLanguage.get('wms_project.pda.wms.page.inbound.unload.add.index.cvsiwtto', '确定') }}
+        </lw-button>
+
+      </template>
 
     </lw-popup>
 
@@ -253,6 +185,7 @@
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.pzsfjyex','选择月台')"
       v-model="dockInfo.show"
+      :show-keyboard-placeholder="false"
     >
 
       <lw-cell
@@ -275,33 +208,37 @@ import {
   wmsMobileUnloadQueryAsnInfo,
   wmsMobileUnloadQueryDock
 } from "../../../../api/inbound/unload";
+import asnInfo from "./../components/asnInfo.vue";
 
 export default {
   name: "lwInboundUnloadAddPage",
+  components: {
+    asnInfo
+  },
   data() {
     return {
       // 车牌号
-      carPlate:'',
+      carPlate: '',
       // 月台号
       dock: {
         value: '',
         focus: false
       },
       // 月台信息
-      dockInfo:{
-        data:{
-          dockName:'',
-          dockCode:''
+      dockInfo: {
+        data: {
+          dockName: '',
+          dockCode: ''
         },
-        from:'user',
-        list:[],
+        from: 'user',
+        list: [],
         show: false
       },
       // 承运商
       carrier: {
-        id:'',
-        list:[],
-        data:{}
+        id: '',
+        list: [],
+        data: {}
       },
       // 承运商司机
       carrierDriver:'',
@@ -338,13 +275,13 @@ export default {
   methods: {
 
     // 卸货月台确认
-    async dockConfirm(from='user'){
+    async dockConfirm(from = 'user') {
 
       if (!this.dock.value) {
         this.dock.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.vfxkjpwq','卸货月台编码不能为空')
-        )
+        //this.$lwShowErrorMsg(
+        //  this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.vfxkjpwq','卸货月台编码不能为空')
+        //)
         return
       }
 
@@ -400,17 +337,22 @@ export default {
         queryNo
       }).then(res=>{
         const list = res.unloadOrderQueryAsnInfoVoList
-        if (!list || !list.length){
+        if (!list || !list.length) {
           this.order.focus = true
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.joahlwvt','数据查询失败')
+            this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.joahlwvt', '数据查询失败')
           )
           this.order.value = ''
           return
         }
 
-        if (list.length > 1){
-          this.orderSearchPopup.list = list
+        if (list.length > 1) {
+          this.orderSearchPopup.list = list.map(item => {
+            return {
+              ...item,
+              _checked: false
+            }
+          })
           this.orderSearchPopup.show = true
           return
         }
@@ -420,27 +362,68 @@ export default {
       })
     },
 
-    // 检查单号是否复核要求
-    checkOrder(item){
-      if (item.external){
+    // 选择单号弹框 - 选中数据
+    checkedChange(item) {
+      if (!item._checked) return;
+
+      this.checkDock(item).catch(() => item._checked = !item._checked)
+
+    },
+    // 选择单号弹框 - 确认
+    orderSearchPopupConfirm() {
+      this.orderSearchPopup.list.forEach(item => {
+        if (item._checked) {
+          this.checkOrder(item)
+        }
+      })
+
+      this.orderSearchPopup.show = false
+    },
+
+
+    // 清空单号输入框并获取焦点
+    clearOrderInp() {
+      this.order.value = ''
+      this.order.focus = true
+    },
+    // 校验承运商是否一致
+    checkDock(item) {
+      return new Promise(resolve => {
+        if (item.dockId && this.dockInfo.data.dockId && item.dockId !== this.dockInfo.data.dockId) {
+          this.$lwDialog.confirm({
+            title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.yevmfidf', '提示'),
+            message: this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.add.index.yczsrieq', '通知单的月台信息与所录的月台信息不同，是否确认一致？')
+          }).then(() => resolve(true)).catch(false)
+        } else {
+          resolve(true)
+        }
+      })
+    },
+
+    // 检查单号是否符合要求
+    async checkOrder(item, checkDock) {
+
+      try {
+        // 校验外部单号
+        if (item.external) {
+
+          !this.orderList.some(i => i.extNo === item.extNo) && this.orderList.unshift(item)
+
+          throw Error()
+        }
+
+        if (checkDock && !await this.checkDock(item)) throw Error()
+
+        if (this.orderList.some(i => i.asnId === item.asnId)) throw Error()
+
         this.orderList.unshift(item)
-        return
-      }
 
-      if (this.dockInfo.data.dockId && item.dockId !== this.dockInfo.data.dockId){
-        this.$lwDialog.confirm({
-          title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.yevmfidf','提示'),
-          message: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.melqimll','通知单的承运商与所录入承运商不同，是否确认一致？')
-        }).then(()=>{
-          this.orderList.unshift(item)
-        }).catch(()=>{
-          this.order.value = ''
-          this.order.focus = true
-        })
-        return
+      } catch {
+        () => {
+        }
+      } finally {
+        this.clearOrderInp()
       }
-
-      this.orderList.unshift(item)
     },
 
     // 删除单号
@@ -461,12 +444,12 @@ export default {
     // 提交
     async submit(){
 
-      if (!this.carPlate){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.illimgad','车牌号不能为空')
-        )
-        return
-      }
+      //if (!this.carPlate){
+      //  this.$lwShowErrorMsg(
+      //    this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.add.index.illimgad','车牌号不能为空')
+      //  )
+      //  return
+      //}
 
       try {
         if (!this.dockInfo.data.dockId){