@logwire/logwire-wms-pda-ui 3.1.0 → 3.1.2

package/src/components/page/inbound/unload/add/index.vue

@@ -23,26 +23,43 @@
 
         <lw-input
           :title="$lwLanguage.get('','卸货月台编码')"
-          v-model="dock"
+          v-model="dock.value"
+          :get-focus.sync="dock.focus"
           rule-key="unloadDock"
           :create-rule="$lwScanRule.create('卸货-新建卸货单-月台','DOCK')"
           required
-          @confirm="dockConfirm"
-        />
+          @confirm="dockConfirm()"
+        >
+
+          <template #button>
+
+            <lw-button
+              mini
+              round
+              @click="dockConfirm()"
+            >{{ $lwLanguage.get('','搜索') }}</lw-button>
+
+          </template>
+
+        </lw-input>
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','卸货月台名称')"
-          :value="dockInfo.name"
+          :title="$lwLanguage.get('','已选卸货月台')"
+          :value="dockInfo.data.dockCode+' - '+dockInfo.data.dockName"
         />
 
         <lw-cell-popup-radio
           :title="$lwLanguage.get('','承运商')"
-          v-model="user"
+          v-model="carrier.id"
+          :columns="carrier.list"
+          value-key="carrierId"
+          @confirm="carrierConfirm"
+          @clear="carrier.data={}"
         />
 
         <lw-input
           :title="$lwLanguage.get('','承运商司机')"
-          v-model="user"
+          v-model="carrierDriver"
           @confirm="order.focus=true"
         />
 
@@ -56,7 +73,19 @@
           :create-rule="$lwScanRule.create('卸货-新建卸货单-单号','ASN')"
           required
           @confirm="orderConfirm"
-        />
+        >
+
+          <template #button>
+            <lw-button
+              mini
+              round
+              @click="orderConfirm"
+            >
+              {{ $lwLanguage.get('','查询') }}
+            </lw-button>
+          </template>
+
+        </lw-input>
 
       </div>
 
@@ -68,14 +97,34 @@
         :key="k"
       >
 
-        <template v-if="i.order">
+        <div
+          v-if="i.external"
+          class="lw-global-model-box lw-global-flex-between"
+        >
+          <lw-title-value-cell
+            :title="$lwLanguage.get('','外部单号')"
+            :value="i.extNo || '-'"
+            :is-row="false"
+            val-bold
+          />
+
+          <lw-button
+            mini
+            round
+            @click="delOrder(k)"
+          >
+            {{$lwLanguage.get('','删除')}}
+          </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('','到货通知单')"
-                value="A20221109-0001"
+                :value="i.asnNo"
                 :is-row="false"
                 val-bold
               />
@@ -91,50 +140,50 @@
 
             <lw-title-value-cell
               :title="$lwLanguage.get('','外部单号')"
-              value="DH-001"
+              :value="i.extNo || '-'"
               :is-row="false"
               val-bold
             />
 
             <lw-title-value-cell
               :title="$lwLanguage.get('','订单类型')"
-              value="采购入库"
+              :value="i.typeLabel || '-'"
               :is-row="false"
             />
 
             <lw-title-value-cell
               :title="$lwLanguage.get('','货主')"
-              value="货主001"
+              :value="(i.ownerCode || '') + '-' + (i.ownerName || '')"
               :is-row="false"
             />
 
             <lw-title-value-cell
               :title="$lwLanguage.get('','承运商')"
-              value="承运商001"
+              :value="(i.carrierCode || '') + '-' + (i.carrierCode || '')"
               :is-row="false"
             />
 
             <lw-title-value-cell
               :title="$lwLanguage.get('','车牌号')"
-              value="川A B12346"
+              :value="i.carrierPlateNum || '-'"
               :is-row="false"
             />
 
             <lw-title-value-cell
               :title="$lwLanguage.get('','计划时间')"
-              :value="$lwDate.format('2022-12-02T04:00:00Z','yyyy-MM-dd hh:mm')"
+              :value="$lwDate.format(i.planArrivalTime,'yyyy-MM-dd hh:mm')"
               :is-row="false"
             />
 
             <lw-title-value-cell
               :title="$lwLanguage.get('','预约时间')"
-              :value="$lwDate.format('2022-12-02T04:00:00.000Z','yyyy-MM-dd hh:mm')"
+              :value="$lwDate.format(i.estArrivalTime,'yyyy-MM-dd hh:mm')"
               :is-row="false"
             />
 
             <lw-title-value-cell
               :title="$lwLanguage.get('','预约月台')"
-              :value="123"
+              :value="(i.dockCode || '') + '-' + (i.dockName || '')"
               :is-row="false"
             />
 
@@ -142,27 +191,27 @@
           <lw-data-look-bg type="bottom">
 
             <div>
-              <div>11</div>
+              <div>{{ i.qty || 0 }}</div>
               <div>{{$lwLanguage.get('','计划量')}}</div>
             </div>
 
             <div>
-              <div>11</div>
+              <div>{{ i.receiveQty || 0 }}</div>
               <div>{{$lwLanguage.get('','已收量')}}</div>
             </div>
 
             <div>
-              <div>11</div>
+              <div>{{ i.unReceiveQty || 0 }}</div>
               <div>{{$lwLanguage.get('','待收量')}}</div>
             </div>
 
             <div>
-              <div>11</div>
+              <div>{{ i.arrivalQty || 0 }}</div>
               <div>{{$lwLanguage.get('','到货量')}}</div>
             </div>
 
             <div style="color: #eeee20">
-              <div>11</div>
+              <div>{{ i.qualityLossQty || 0 }}</div>
               <div>{{$lwLanguage.get('','异常量')}}</div>
             </div>
 
@@ -170,28 +219,6 @@
 
         </template>
 
-        <div
-          v-else
-          class="lw-global-model-box lw-global-flex-between"
-        >
-          <lw-title-value-cell
-            :title="$lwLanguage.get('','外部单号')"
-            value="WB-001"
-            :is-row="false"
-            val-bold
-          />
-
-          <lw-button
-            mini
-            round
-            @click="delOrder(k)"
-          >
-            {{$lwLanguage.get('','删除')}}
-          </lw-button>
-        </div>
-
-
-
       </div>
 
     </div>
@@ -205,11 +232,49 @@
     </lw-bottom-bar>
 
 
+    <!-- 多条订单数据时选择订单 -->
+    <lw-popup
+      :title="$lwLanguage.get('','选择单号')"
+      v-model="orderSearchPopup.show"
+    >
+
+      <lw-cell
+        v-for="(i,k) in orderSearchPopup.list"
+        :key="k"
+        :title="$lwLanguage.get('','到货通知单')"
+        :value="i.asnNo"
+        @click="checkOrder(i)"
+      />
+
+    </lw-popup>
+
+    <!-- 选择月台 -->
+    <lw-popup
+      :title="$lwLanguage.get('','选择月台')"
+      v-model="dockInfo.show"
+    >
+
+      <lw-cell
+        v-for="(i,k) in dockInfo.list"
+        :key="k"
+        :value="`${i.dockCode} - ${i.dockName}`"
+        @click="dockSelectConfirm(i)"
+      />
+
+    </lw-popup>
+
+
   </div>
 </template>
 
 <script>
 
+import {
+  projectGetWarehouseCarrier, wmsMobileCreateUnloadOrder,
+  wmsMobileUnloadQueryAsnInfo,
+  wmsMobileUnloadQueryDock
+} from "../../../../../api/inbound/unload";
+
 export default {
   name: "lwInboundUnloadAddPage",
   data() {
@@ -217,40 +282,169 @@ export default {
       // 车牌号
       carPlate:'',
       // 月台号
-      dock:'',
+      dock: {
+        value: '',
+        focus: false
+      },
       // 月台信息
       dockInfo:{
-        code:'',
-        name:'月台001'
+        data:{
+          dockName:'',
+          dockCode:''
+        },
+        from:'user',
+        list:[],
+        show: false
       },
       // 承运商
-      user:'',
+      carrier: {
+        id:'',
+        list:[],
+        data:{}
+      },
+      // 承运商司机
+      carrierDriver:'',
       // 单号
       order:{
         value:'',
         focus:false,
       },
+      // 当查询到多个单号时的选择弹框
+      orderSearchPopup:{
+        show: false,
+        list: []
+      },
 
       // 单号数据
-      orderList:[
-        {order:1},
-        {order:0}
-      ]
+      orderList:[]
     }
   },
+  mounted() {
+    projectGetWarehouseCarrier().then(res=>{
+      if (!res || !res.length){
+        this.$lwShowNoticeBar({
+          type:'warning',
+          message: this.$lwLanguage.get('','获取承运商信息失败')
+        })
+      }
+
+      this.carrier.list = res.map(item=>{
+        item.label = item.carrierCode + '-' +item.carrierName
+        return item
+      })
+    })
+  },
   methods: {
+
     // 卸货月台确认
-    dockConfirm(){
+    async dockConfirm(from='user'){
 
+      if (!this.dock.value) {
+        this.dock.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','卸货月台编码不能为空')
+        )
+        return
+      }
+
+      const res = await wmsMobileUnloadQueryDock({
+        dockCode: this.dock.value
+      })
+
+      const list = res.unloadOrderQueryDockInfoVoList
+
+      if (!list || !list.length){
+        this.dock.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','获取月台信息失败，请确认月台编码是否正确')
+        )
+        this.dock.value = ''
+        return
+      }
+
+      if (list.length > 2){
+        this.dockInfo.list = list
+        this.dockInfo.show = true
+        this.dockInfo.from = from
+        throw Error('月台数据存在多条')
+      }
+
+      this.dockInfo.data = list[0]
+
+    },
+    // 月台确认
+    dockSelectConfirm(item){
+      this.dockInfo.data = item
+      this.dockInfo.show = false
+      if (this.dockInfo.from === 'submit') this.submit()
     },
+
+    // 承运商选择确认
+    carrierConfirm(item){
+      this.carrier.data = item
+    },
+
     // 单号确认
     orderConfirm(){
+      const queryNo = this.order.value
+      if (!queryNo){
+        this.order.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('','单号不能为空')
+        )
+        return
+      }
+
+      wmsMobileUnloadQueryAsnInfo({
+        queryNo
+      }).then(res=>{
+        const list = res.unloadOrderQueryAsnInfoVoList
+        if (!list || !list.length){
+          this.order.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','数据查询失败')
+          )
+          this.order.value = ''
+          return
+        }
+
+        if (list.length > 1){
+          this.orderSearchPopup.list = list
+          this.orderSearchPopup.show = true
+          return
+        }
+
+        this.checkOrder(list[0])
+
+      })
+    },
+
+    // 检查单号是否复核要求
+    checkOrder(item){
+      if (item.external){
+        this.orderList.unshift(item)
+        return
+      }
 
+      if (this.dockInfo.data.dockId && item.dockId !== this.dockInfo.data.dockId){
+        this.$lwDialog.confirm({
+          title: this.$lwLanguage.get('','提示'),
+          message: this.$lwLanguage.get('','通知单的承运商与所录入承运商不同，是否确认一致？')
+        }).then(()=>{
+          this.orderList.unshift(item)
+        }).catch(()=>{
+          this.order.value = ''
+          this.order.focus = true
+        })
+        return
+      }
+
+      this.orderList.unshift(item)
     },
 
     // 删除单号
     delOrder(index){
-      console.log(index)
+
       this.$lwDialog.confirm({
         title: this.$lwLanguage.get('','提示'),
         message: this.$lwLanguage.get('','确认删除？')
@@ -264,7 +458,7 @@ export default {
     },
 
     // 提交
-    submit(){
+    async submit(){
 
       if (!this.carPlate){
         this.$lwShowErrorMsg(
@@ -273,21 +467,37 @@ export default {
         return
       }
 
-      if (!this.dockInfo.code){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','卸货月台不能为空')
-        )
-        return
+      try {
+        if (!this.dockInfo.data.dockId){
+          await this.dockConfirm('submit')
+        }
+
+        if(!this.orderList.length){
+          this.order.focus = true
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','卸货单数据不能为空！请输入单号并点击查询按钮获取卸货单数据！')
+          )
+          return
+        }
+
+        await wmsMobileCreateUnloadOrder({
+          carrierPlateNum: this.carPlate,
+          ...this.dockInfo.data,
+          ...this.carrier.data,
+          asnParamList: this.orderList.map(item=>{
+            return {
+              asnId: item.asnId,
+              asnNo: item.asnNo,
+              extNo: item.extNo,
+            }
+          })
+        })
+
+        this.$lwToast.success(this.$lwLanguage.get('','卸货单新增成功'))
+        history.go(-1)
+      }catch (e) {
+        console.log('提交卸货单出错：', + e)
       }
-
-      if(!this.orderList.length){
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','卸货单数据不能为空')
-        )
-        return
-      }
-
-      console.log(this.orderList)
     }
   }
 }

package/src/components/page/inbound/unload/index/index.vue

@@ -40,49 +40,53 @@
           class="lw-global-model-box lw-global-click-style"
           v-for="(i,k) in orderList"
           :key="k"
-          @click="orderItemClick(i)"
+          @click="orderItemClick(i.unloadOrderNo)"
         >
 
           <div class="lw-global-flex-between lw-global-row-start">
 
-            <div class="lw-global-value-bold">{{i.code}}</div>
+            <div class="lw-global-value-bold">{{i.unloadOrderNo}}</div>
 
             <lw-tag
               round
               plain
-              :type="getTagType(i)"
-            >{{i.code}}</lw-tag>
+              :type="getTagType(i.billStatus)"
+            >{{i.billStatusLabel}}</lw-tag>
 
           </div>
 
           <lw-title-value-cell
             :title="$lwLanguage.get('','月台')"
-            :value="i.code"
+            :value="i.dockInfo"
           />
 
           <lw-title-value-cell
             :title="$lwLanguage.get('','车牌号')"
-            :value="i.code"
+            :value="i.carrierPlateNum"
           />
 
           <lw-title-value-cell
+            v-if="i.extNoInfo"
             :title="$lwLanguage.get('','外部单号')"
-            :value="i.code"
+            :value="i.extNoInfo"
           />
 
           <lw-title-value-cell
+            v-if="i.asnNoInfo"
             :title="$lwLanguage.get('','到货通知单')"
-            :value="i.code"
+            :value="i.asnNoInfo"
           />
 
           <lw-title-value-cell
+            v-if="i.plannedQuantity"
             :title="$lwLanguage.get('','计划')"
-            :value="i.code"
+            :value="i.plannedQuantity"
           />
 
           <lw-title-value-cell
+            v-if="i.unloadQuantity"
             :title="$lwLanguage.get('','实际')"
-            :value="i.code"
+            :value="i.unloadQuantity"
             is-row-end
           />
 
@@ -108,6 +112,8 @@
 
 <script>
 
+import {wmsMobileUnloadQueryInfo} from "../../../../../api/inbound/unload";
+
 export default {
   name: "lwInboundUnloadIndexPage",
   data() {
@@ -118,30 +124,41 @@ export default {
       },
 
       // 卸货单数据
-      orderList:[
-        {
-          code:'123456'
-        }
-      ]
+      orderList:[]
     }
   },
+  mounted() {
+    this.searchConfirm()
+  },
   methods: {
     // 确认搜索
     searchConfirm(){
-
+      wmsMobileUnloadQueryInfo({
+        queryInfo: this.search.value
+      }).then(res=>{
+        this.orderList = res.unloadQueryOrderVoList || []
+      })
     },
 
     // 获取tag的类型
-    getTagType(item){
-      console.log(item)
-      return 'success'
+    getTagType(status){
+      switch (status) {
+        case '300':
+          return 'warning'
+        case '400':
+          return 'success'
+        default:
+          return 'primary'
+      }
     },
 
     // 卸货单数据被点击
-    orderItemClick(item){
-      console.log(item)
+    orderItemClick(unloadOrderNo){
       this.$router.push({
-        path:'/inbound/unload/lwAction'
+        path:'/inbound/unload/lwAction',
+        query:{
+          unloadOrderNo
+        }
       })
     },
 

package/src/components/page/index.js

@@ -28,6 +28,9 @@ import inbound from './inbound'
 // 加工
 import {process} from './process'
 
+// 容器管理
+import {container} from "./container";
+
 
 export const page = [
     ...common,
@@ -38,4 +41,5 @@ export const page = [
     ...inbound,
     ...inventory,
     ...process,
+    ...container,
 ]

package/src/components/page/inner/borrow/action/index.vue

@@ -62,7 +62,7 @@
 
 
     <!--     tab页-->
-      <div class="lw-global-tab-box" style="margin-top: 10px">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs
           type="card"
           animated
@@ -271,7 +271,7 @@
             </div>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 
@@ -609,7 +609,7 @@ export default {
         fromLpn: pickingLine.lpn,
         fromLocationId: pickingLine.locationId
       }).then(res => {
-        console.log(res)
+        this.$refs.abnormal.printLabel()
         this.clearInput()
         if (res.taskFinished) {
           this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.inner.borrow.taskFinish','借用拣选任务已完成'))

package/src/components/page/inner/borrow/index/index.vue

@@ -22,7 +22,7 @@
 
 
       <!--     tab页-->
-      <div class="lw-global-tab-box "  style="margin-top: 10px" >
+      <lw-tab-box style="margin-top: 10px" >
         <van-tabs
           type="card"
           animated
@@ -176,7 +176,7 @@
           </van-tab>
 
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
 
   </div>