@logwire/logwire-wms-pda-ui 1.1.17 → 1.2.0

package/src/components/page/inner/disposeAbnormal/index/index.js

@@ -1,11 +1,11 @@
-/*
-* 异常处理 - 起始页
-* @author: 张文
-* @date  2022-0623
-* */
-
-import lwInnerDisposeAbnormalIndexPage from "./index.vue";
-
-lwInnerDisposeAbnormalIndexPage.install = Vue => Vue.component(lwInnerDisposeAbnormalIndexPage.name, lwInnerDisposeAbnormalIndexPage)
-
-export default lwInnerDisposeAbnormalIndexPage
+/*
+* 异常处理 - 起始页
+* @author: 张文
+* @date  2022-0623
+* */
+
+import lwInnerDisposeAbnormalIndexPage from "./index.vue";
+
+lwInnerDisposeAbnormalIndexPage.install = Vue => Vue.component(lwInnerDisposeAbnormalIndexPage.name, lwInnerDisposeAbnormalIndexPage)
+
+export default lwInnerDisposeAbnormalIndexPage

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

@@ -6,7 +6,7 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('','异常处理')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.index.wqyvhgxl','异常处理')"/>
 
     <div class="lw-global-page-box">
 
@@ -22,7 +22,7 @@
           <!-- 待确认 -->
           <van-tab
             name="waitConfirm"
-            :title="$lwLanguage.get('','待确认')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.index.bkllmgey','待确认')"
           >
 
             <search-bar @search="waitConfirmSearch"/>
@@ -49,7 +49,7 @@
           <!-- 待处理 -->
           <van-tab
             name="waitDispose"
-            :title="$lwLanguage.get('','待处理')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.index.lzeywoay','待处理')"
           >
 
             <search-bar
@@ -79,14 +79,25 @@
           <!-- 已处理 -->
           <van-tab
             name="dispose"
-            :title="$lwLanguage.get('','已处理')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inner.disposeAbnormal.index.sufcnbxb','已处理')"
           >
 
             <search-bar @search="disposeSearch"/>
 
             <template v-if="dispose.list.length">
+              <list-item
+                v-for="(i,k) in dispose.list"
+                :key="i.id"
+                :item="i"
+                :index="k"
+              />
 
-
+              <lw-pages
+                v-model="dispose.pageNum"
+                :page-total="dispose.total"
+                force-ellipses
+                @change="getDisposeData"
+              />
 
             </template>
             <lw-not-data v-else/>

package/src/components/page/inner/index.js

@@ -1,62 +1,119 @@
-/*
-* 在库组件导出入口
-* @author: 张文
-* @date  2022-04-29
-* */
-
-
-// 标准移动 - 任务入口
-import lwTaskMovePage from "./taskMove/index";
-// 异常移动 - 任务入口
-import lwInnerAbnormalMovePage from "./abnormalMove/index";
-
-// 随机移动
-import lwInnerRandomMoveIndexPage from './randomMove/index';
-
-// 移动上架
-import lwMovePutAwayPage from './movePutAway/index';
-
-// 整托盘移动 - 起始页
-import lwInnerLpnMovePage from './lpnMove/index';
-// 整托盘移动 - 执行页
-import lwInnerLpnMoveActionPage from './lpnMove/action';
-
-// 在库异常上报 - 起始页
-import lwInnerReportAbnormalPage from './reportAbnormal/index';
-// 在库异常上报 - 执行页
-import lwInnerReportAbnormalActionPage from './reportAbnormal/action';
-
-// 异常处理 - 起始页
-import lwInnerDisposeAbnormalIndexPage from "./disposeAbnormal/index";
-// 异常处理 - 执行页
-import lwInnerDisposeAbnormalActionPage from "./disposeAbnormal/action";
-
-// 包材领用 - 创建领用单
-import lwMaterialApplyCreatePage from "./materialApply/generate";
-// 包材领用 - 执行领用单
-import lwMaterialApplyActionPage from "./materialApply/action";
-
-
-
-
-
-export const inner = [
-  lwTaskMovePage,
-  lwInnerAbnormalMovePage,
-
-  lwInnerRandomMoveIndexPage,
-    lwMovePutAwayPage,
-
-  lwInnerLpnMovePage,
-  lwInnerLpnMoveActionPage,
-
-  lwInnerReportAbnormalPage,
-  lwInnerReportAbnormalActionPage,
-
-  lwInnerDisposeAbnormalIndexPage,
-  lwInnerDisposeAbnormalActionPage,
-
-  lwMaterialApplyCreatePage,
-  lwMaterialApplyActionPage,
-
-]
+/*
+* 在库组件导出入口
+* @author: 张文
+* @date  2022-04-29
+* */
+
+
+// 标准移动 - 任务入口
+import lwTaskMovePage from "./taskMove/index";
+// 异常移动 - 任务入口
+import lwInnerAbnormalMovePage from "./abnormalMove/index";
+
+// 随机移动
+import lwInnerRandomMoveIndexPage from './randomMove/index';
+
+// 移动上架
+import lwMovePutAwayPage from './movePutAway/index';
+
+// 整托盘移动 - 起始页
+import lwInnerLpnMovePage from './lpnMove/index';
+// 整托盘移动 - 执行页
+import lwInnerLpnMoveActionPage from './lpnMove/action';
+
+// 在库异常上报 - 起始页
+import lwInnerReportAbnormalPage from './reportAbnormal/index';
+// 在库异常上报 - 执行页
+import lwInnerReportAbnormalActionPage from './reportAbnormal/action';
+
+// 异常处理 - 起始页
+import lwInnerDisposeAbnormalIndexPage from "./disposeAbnormal/index";
+// 异常处理 - 执行页
+import lwInnerDisposeAbnormalActionPage from "./disposeAbnormal/action";
+
+// 包材领用 - 创建领用单
+import lwMaterialApplyCreatePage from "./materialApply/generate";
+// 包材领用 - 执行领用单
+import lwMaterialApplyActionPage from "./materialApply/action";
+// 借用 - 执行拣选
+import lwInnerBorrowActionPage from "./borrow/action";
+// 借用 - 拣选首页
+import lwInnerBorrowPage from "./borrow/index";
+
+// 主库位配置-起始页
+import lwInnerMasterLocationConfigIndex from "../config/masterLocation/masterLocationConfig/index";
+
+// 主库位配置-执行也
+import lwInnerMasterLocationConfigAction from "../config/masterLocation/masterLocationConfig/action";
+
+
+// 主库位查询-起始页
+import lwInnerMasterLocationQueryIndex from "../config/masterLocation/masterLocationQuery/index";
+
+
+// 主库位商品编码查询页
+import lwInnerMasterLocationQueryBySkuCodeAction from "../config/masterLocation/masterLocationQuery/action/queryBySkuCode.vue";
+
+// 主库位库位编码查询页
+import lwInnerMasterLocationQueryByLocationCodeAction from "../config/masterLocation/masterLocationQuery/action/queryByLocationCode.vue";
+
+// 呆滞品整理 - 入口页面
+import lwInnerDeadTaskEntrancePage from "./dead/taskEntrance";
+// 呆滞品上架 - 起始页
+import lwInnerDeadPutawatIndexPage from "./dead/putaway/index";
+// 呆滞品上架 - 执行页
+import lwInnerDeadPutawatActionPage from "./dead/putaway/action";
+// 呆滞品整理- 中大件 - 打托
+import lwInnerDeadLargeActionPage from "./dead/large";
+// 呆滞品整理- 小件 - 装箱
+import lwInnerDeadSmallActionPage from "./dead/small";
+
+// 质检 - 抽检
+import lwQualitySampleIndexPage from "./quality/sample";
+// 质检 - 执行
+import lwQualityActionPage from "./quality/action";
+
+
+
+
+
+
+
+
+export const inner = [
+  lwTaskMovePage,
+  lwInnerAbnormalMovePage,
+
+  lwInnerRandomMoveIndexPage,
+    lwMovePutAwayPage,
+
+  lwInnerLpnMovePage,
+  lwInnerLpnMoveActionPage,
+
+  lwInnerReportAbnormalPage,
+  lwInnerReportAbnormalActionPage,
+
+  lwInnerDisposeAbnormalIndexPage,
+  lwInnerDisposeAbnormalActionPage,
+
+  lwMaterialApplyCreatePage,
+  lwMaterialApplyActionPage,
+  lwInnerMasterLocationConfigIndex,
+  lwInnerMasterLocationConfigAction,
+  lwInnerMasterLocationQueryIndex,
+  lwInnerMasterLocationQueryBySkuCodeAction,
+  lwInnerMasterLocationQueryByLocationCodeAction,
+
+  lwInnerBorrowActionPage,
+  lwInnerBorrowPage,
+
+  lwInnerDeadTaskEntrancePage,
+  lwInnerDeadPutawatIndexPage,
+  lwInnerDeadPutawatActionPage,
+  lwInnerDeadLargeActionPage,
+  lwInnerDeadSmallActionPage,
+
+  lwQualitySampleIndexPage,
+  lwQualityActionPage,
+
+]

package/src/components/page/inner/lpnMove/action/index.js

@@ -1,11 +1,11 @@
-/*
-* 整托盘移动
-* @author: 张文
-* @date  2022-04-29
-* */
-
-import lwInnerLpnMoveActionPage from "./index.vue";
-
-lwInnerLpnMoveActionPage.install = Vue => Vue.component(lwInnerLpnMoveActionPage.name, lwInnerLpnMoveActionPage)
-
-export default lwInnerLpnMoveActionPage
+/*
+* 整托盘移动
+* @author: 张文
+* @date  2022-04-29
+* */
+
+import lwInnerLpnMoveActionPage from "./index.vue";
+
+lwInnerLpnMoveActionPage.install = Vue => Vue.component(lwInnerLpnMoveActionPage.name, lwInnerLpnMoveActionPage)
+
+export default lwInnerLpnMoveActionPage

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

@@ -36,7 +36,7 @@
       <!-- 信息展示栏 -->
       <div class="lw-global-model-box">
 
-        <!-- 零件信息 -->
+        <!-- 商品信息 -->
         <div
           class="lw-global-flex-between lw-global-bottom-border lw-lpn-move-row"
           style="align-items: flex-start"
@@ -108,6 +108,15 @@
 
 
       <div class="lw-global-model-box">
+        <!-- 目标托盘 -->
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.toLpn','目标托盘')"
+          v-model="actionLpn.value"
+          :get-focus.sync="actionLpn.focus"
+          rule-key="lpn"
+          @confirm="lpnConfirm"
+        />
+
         <!-- 目标库位 -->
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.toLocal','目标库位')"
@@ -150,11 +159,17 @@ export default {
       // 当前操作的数据索引
       actionIndex: 0,
 
+      // 目标托盘
+      actionLpn:{
+        value:'',
+        focus: true
+      },
+
       // 目标库位
       actionLocal:{
         value:'',
         focus: true
-      }
+      },
     }
   },
   mounted() {
@@ -170,10 +185,15 @@ export default {
         lpn: this.lpn,
         locationCode: this.local
       }).then(res=>{
+        this.actionIndex = this.$lwUtils.cutCardIndexCount(this.actionIndex, res[0].taskLines.length)
         this.actionData = res[0]
       })
     },
 
+    lpnConfirm(){
+      this.actionLocal.focus = true
+    },
+
     // 执行托盘移动
     actionLpnMove(){
 
@@ -188,7 +208,8 @@ export default {
       wmsRandomMoveLpn({
         fromLocationCode: this.actionData.locationCode,
         fromLpn: this.actionData.lpn,
-        toLocationCode: this.actionLocal.value
+        toLocationCode: this.actionLocal.value,
+        toLpn: this.actionLpn.value
       }).then(()=>{
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.success','操作成功')

package/src/components/page/inner/lpnMove/index/index.js

@@ -1,11 +1,11 @@
-/*
-* 整托盘移动
-* @author: 张文
-* @date  2022-04-29
-* */
-
-import lwInnerLpnMovePage from "./index.vue";
-
-lwInnerLpnMovePage.install = Vue => Vue.component(lwInnerLpnMovePage.name, lwInnerLpnMovePage)
-
-export default lwInnerLpnMovePage
+/*
+* 整托盘移动
+* @author: 张文
+* @date  2022-04-29
+* */
+
+import lwInnerLpnMovePage from "./index.vue";
+
+lwInnerLpnMovePage.install = Vue => Vue.component(lwInnerLpnMovePage.name, lwInnerLpnMovePage)
+
+export default lwInnerLpnMovePage

package/src/components/page/inner/materialApply/action/index.js

@@ -1,11 +1,11 @@
-/*
-* 包材领用单 - 执行领用单
-* @author: 王强
-* @date  2022-06-29
-* */
-
-import lwMaterialApplyActionPage from "./index.vue"
-
-lwMaterialApplyActionPage.install = Vue => Vue.component(lwMaterialApplyActionPage.name, lwMaterialApplyActionPage)
-
+/*
+* 包材领用单 - 执行领用单
+* @author: 王强
+* @date  2022-06-29
+* */
+
+import lwMaterialApplyActionPage from "./index.vue"
+
+lwMaterialApplyActionPage.install = Vue => Vue.component(lwMaterialApplyActionPage.name, lwMaterialApplyActionPage)
+
 export default lwMaterialApplyActionPage

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

@@ -11,10 +11,7 @@
     <!--    中间内容-->
     <div v-if="taskLine.length" class="lw-global-page-box">
 
-      <div
-        class="lw-global-model-box"
-        style="border-radius: 10px 10px 0 0"
-      >
+      <div class="lw-global-model-top-radius">
 
        <div class="lw-global-flex-between">
          <div style="font-size: 12px;font-weight: bold;">{{ taskNo }}</div>
@@ -35,34 +32,31 @@
         <!-- 计划量 -->
         <div>
           <div>{{ planQty || 0 }}</div>
-          <div class="lw-data-look-bg-title">{{ $lwLanguage.get('wms_project.pda.inner.materialApply.planQty','计划量') }}</div>
+          <div>{{ $lwLanguage.get('wms_project.pda.inner.materialApply.planQty','计划量') }}</div>
         </div>
 
         <!-- 已领取 -->
         <div>
           <div>{{ appliedQty || 0 }}</div>
-          <div class="lw-data-look-bg-title">{{ $lwLanguage.get('wms_project.pda.inner.materialApply.appliedQty','已领取') }}</div>
+          <div>{{ $lwLanguage.get('wms_project.pda.inner.materialApply.appliedQty','已领取') }}</div>
         </div>
 
         <!-- 待领取 -->
         <div>
           <div>{{ unAppliedQty || 0 }}</div>
-          <div class="lw-data-look-bg-title">{{ $lwLanguage.get('wms_project.pda.inner.materialApply.unApplyQty','待领取') }}</div>
+          <div>{{ $lwLanguage.get('wms_project.pda.inner.materialApply.unApplyQty','待领取') }}</div>
         </div>
 
         <!-- 异常量 -->
-        <div class="lw-data-last-item">
+        <div>
           <div>{{ abnQty || 0 }}</div>
-          <div class="lw-data-look-bg-title">{{ $lwLanguage.get('wms_project.pda.inner.materialApply.abnQty','异常量') }}</div>
+          <div>{{ $lwLanguage.get('wms_project.pda.inner.materialApply.abnQty','异常量') }}</div>
         </div>
 
       </lw-data-look-bg>
 
       <!-- 领用单信息 -->
-      <div
-          class="lw-global-model-box"
-        style="border-radius: 0 0 10px 10px"
-      >
+      <div class="lw-global-model-bottom-radius">
         <!-- 领用单号 -->
         <div class="lw-global-row">
                 <span class="lw-global-title">
@@ -346,10 +340,8 @@ export default {
         this.startTime = res.startTime
         this.taskNo = res.taskNo
 
+        this.task.index = this.$lwUtils.cutCardIndexCount(this.task.index, res.taskLine.length)
         this.taskLine = res.taskLine
-        if ((this.task.index + 1) > this.taskLine.length) {
-          this.task.index > 0 ? this.task.index-- : this.task.index = 0
-        }
       }).catch(e => {
         console.log(e)
       })
@@ -469,13 +461,13 @@ export default {
       return true
     },
 
-    // 下架托盘确认
+    // 托盘确认
     taskLpnConfirm() {
       if (this.taskLpnCheck()){
         this.task.input.sku.focus = true
       }
     },
-    // 下架托盘校验
+    // 托盘校验
     taskLpnCheck(){
       if (!this.hasLpn()) {
         return true

package/src/components/page/inner/materialApply/generate/index.js

@@ -1,11 +1,11 @@
-/*
-* 包材领用单 - 创建领用单
-* @author: 王强
-* @date  2022-06-29
-* */
-
-import lwMaterialApplyCreatePage from "./index.vue"
-
-lwMaterialApplyCreatePage.install = Vue => Vue.component(lwMaterialApplyCreatePage.name, lwMaterialApplyCreatePage)
-
+/*
+* 包材领用单 - 创建领用单
+* @author: 王强
+* @date  2022-06-29
+* */
+
+import lwMaterialApplyCreatePage from "./index.vue"
+
+lwMaterialApplyCreatePage.install = Vue => Vue.component(lwMaterialApplyCreatePage.name, lwMaterialApplyCreatePage)
+
 export default lwMaterialApplyCreatePage

package/src/components/page/inner/materialApply/generate/index.vue

@@ -175,6 +175,7 @@
         <lw-input
             :title="$lwLanguage.get('wms_project.pda.inner.materialApply.appliedQty','领取量')"
             type="digit"
+            @input="(val) => checkInvQty(val, i)"
             v-model="i.applyQty"
         />
 
@@ -351,7 +352,7 @@ export default {
     // 删除选中的包材明细
     del(index){
 
-      this.$dialog.confirm({
+      this.$lwDialog.confirm({
         title: this.$lwLanguage.get('wms_project.pda.inner.materialApply.warning','警告'),
         message: this.$lwLanguage.get('wms_project.pda.inner.materialApply.confirmDel','确认删除') ,
       }).then(()=>{
@@ -362,6 +363,14 @@ export default {
         this.showBottomBar = this.submitLine.length
       }).catch(()=>{})
     },
+    //检查输入库存数
+    checkInvQty(val, obj){
+      if (Number(val || 0) > Number(obj.availableQty || 0)) {
+        this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.inner.materialApply.invQtyMore','输入数量大于库存数量,请重新输入'));
+        obj.applyQty = ''
+      }
+
+    }
 
   },
 

package/src/components/page/inner/movePutAway/index/index.js

@@ -1,11 +1,11 @@
-/*
-* 移动上架
-* @author: 鲍珺
-* @date  2022-06-28
-* */
-
-import lwMovePutAwayPage from "./index.vue";
-
-lwMovePutAwayPage.install = Vue => Vue.component(lwMovePutAwayPage.name, lwMovePutAwayPage)
-
-export default lwMovePutAwayPage
+/*
+* 移动上架
+* @author: 鲍珺
+* @date  2022-06-28
+* */
+
+import lwMovePutAwayPage from "./index.vue";
+
+lwMovePutAwayPage.install = Vue => Vue.component(lwMovePutAwayPage.name, lwMovePutAwayPage)
+
+export default lwMovePutAwayPage

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

@@ -32,11 +32,11 @@
       <template v-if="taskList.length > 0">
         <!-- 数据 -->
         <div
-            class="lw-global-model-box lw-global-click-style lw-global-animation-out"
-            v-for="(i, k) in taskList"
-            :key="i.taskId"
-            :style="{animationDelay: k * 50 + 'ms'}"
-            @click="taskItemClick(i)"
+          class="lw-global-model-box lw-global-click-style lw-global-animation-out"
+          v-for="(i, k) in taskList"
+          :key="i.taskId"
+          :style="{animationDelay: k * 50 + 'ms'}"
+          @click="taskItemClick(i)"
         >
 
           <!-- 头部 -->

package/src/components/page/inner/quality/action/index.js

@@ -0,0 +1,11 @@
+/*
+* 质检 - 执行
+* @author: 张文
+* @date: 2022-08-18
+* */
+
+import lwQualityActionPage from "./index.vue";
+
+lwQualityActionPage.install = Vue => Vue.component(lwQualityActionPage.name, lwQualityActionPage)
+
+export default lwQualityActionPage