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

package/src/views/wms/page/outbound/pickConsoleV2/index.vue

@@ -10,28 +10,67 @@
 
     <lw-page-body-module>
 
-      <div class="lw-global-model-box lw-global-model-box-3px">
+      <div
+        style="padding-top: 3px"
+        class="lw-global-model-box"
+      >
         <lw-input
           ref="so"
           :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.ihavrluo', '单号')"
           :placeholder="$lwLanguage.get('', '请扫描或输入订单号/外部单号查询')"
-          v-model="keyword"
+          v-model="search.keyword"
           rule-key="order"
           :create-rule="$lwScanRule.create('按单拣选控制台v2-起始页-单号搜索','SO')"
-          :show-bottom-border="false"
-          @confirm="searchConfirm()"
-          @clear="searchConfirm()"
-        >
-          <template #button>
-            <lw-button
-              mini
-              round
-              @click="searchConfirm()"
-            >
-              {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.xrftvnyk', '查询') }}
-            </lw-button>
-          </template>
-        </lw-input>
+          input-align="right"
+        />
+
+        <lw-cell-popup-radio
+          :title="$lwLanguage.get('', '订单类型')"
+          v-model="search.orderType"
+          dict-key="OutboundPlanOrderType"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','订单开始时间')"
+          v-model="search.orderTimeStart"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','订单结束时间')"
+          v-model="search.orderTimeEnd"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','计划开始处理时间')"
+          v-model="search.planHandleTimeStart"
+          type="datetime"
+        />
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('','计划结束处理时间')"
+          v-model="search.planHandleTimeEnd"
+          type="datetime"
+        />
+
+        <div class="lw-global-flex-between lw-global-row-end">
+          <lw-button
+            type="last"
+            small
+            plain
+            block
+            @click="reset"
+          >
+            {{ $lwLanguage.get('', '重置') }}
+          </lw-button>
+
+          <lw-button
+            style="margin-left: 10px"
+            small
+            block
+            @click="searchConfirm()"
+          >
+            {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsoleV2.index.xrftvnyk', '查询') }}
+          </lw-button>
+
+        </div>
       </div>
 
       <lw-tab-box style="margin-top: 10px">
@@ -163,8 +202,14 @@ export default {
   },
   data() {
     return {
-      keyword: '',
-      keywordConfirm: '',
+      search: {
+        keyword: '',
+        orderType: '',
+        orderTimeStart: '',
+        orderTimeEnd: '',
+        planHandleTimeStart: '',
+        planHandleTimeEnd: '',
+      },
       tabActive: '',
       all: {
         pageNum: 1,
@@ -194,9 +239,8 @@ export default {
   },
   mounted() {
 
-    const keyword = this.$route.query.keyword
-    this.keywordConfirm = keyword
-    this.keyword = keyword
+    const search = JSON.parse(this.$route.query.search || '{}')
+    Object.keys(search).length ? this.search = search : ''
 
     this.searchConfirm(true)
   },
@@ -212,7 +256,7 @@ export default {
       }
 
       const res = await projectWmsOutboundPDASoPickQueryPageV2({
-        keyword: this.keywordConfirm,
+        ...this.search,
         pageNum: this[key].pageNum,
         pageSize: this[key].pageSize,
         queryType: queryType[key]
@@ -221,8 +265,8 @@ export default {
       this[key].pageTotal = res.total || 0
     },
 
+    // 搜索
     searchConfirm(first) {
-      this.keywordConfirm = this.keyword
       this.all.pageNum = 1
       this.ing.pageNum = 1
       this.abnormal.pageNum = 1
@@ -251,13 +295,20 @@ export default {
       })
 
     },
+    // 重置
+    reset() {
+      for (const k in this.search) {
+        this.search[k] = ''
+      }
+      this.searchConfirm()
+    },
 
     soClick(item) {
 
       this.$router.replace({
         path: '/outbound/pickConsoleV2/lwIndex',
         query: {
-          keyword: this.keywordConfirm,
+          search: JSON.stringify(this.search),
           tabActive: this.tabActive,
           _t: Date.now()
         }

package/src/views/wms/page/receive/byLpnLabel/index.vue

@@ -439,7 +439,6 @@ import {
   wmsMobileInboundSubmitAsnLabelReceive
 } from "../../../api/receive/byLpnLabel";
 import {wmsMobileQueryContainerSkuList} from "../../../api/receive/byContainer";
-import stringRandom from "string-random";
 
 export default {
   name: "lwReceiveByLpnLabelIndex",
@@ -515,7 +514,8 @@ export default {
         list: this.receive.list.map(item => {
           return {
             lpn: item.lpn,
-            skuId: item.sku.id
+            skuId: item.sku.id,
+            lotAttributes: item.lotAttributes
           }
         }),
         asnId: this.$route.query.asnId
@@ -746,7 +746,7 @@ export default {
     // 容器收货 - 增加容器
     addContainerReceive() {
       this.containerReceive.list.unshift({
-        id: stringRandom(10, {numbers: true}) + Date.now(),
+        id: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
         skuId: '',
         qty: '',
         qtyFocus: true

package/src/views/wms/page/receive/bySku/action.vue

@@ -396,13 +396,12 @@ import {
   wmsMobileInboundSubmitAsnAdvanceReceiveForSku,
   wmsMobileExtInQueryAllocSkuLotList,
   wmsMobileExtInGetAsnSkuV3,
-} from "./../../../api/receive/bySku";
+} from '../../../api/receive/bySku';
 import printLabelPopup from "./../../inbound/components/printLabelPopup.vue";
 import containerPrintPopup from "./../../inbound/components/containerPrintPopup.vue";
 import QualityCard from "./../../inbound/components/QualityCard.vue";
 import receiveSkuGroupPopup from "../../../components/receiveSkuGroup/popup.vue";
 import {wmsMobileQueryContainerSkuList} from "../../../api/receive/byContainer";
-import stringRandom from "string-random";
 
 export default {
   name: "lwReceiveBySkuAction",
@@ -916,7 +915,7 @@ export default {
     // 容器收货 - 增加容器
     addContainerReceive() {
       this.containerReceive.list.unshift({
-        id: stringRandom(10, {numbers: true}) + Date.now(),
+        id: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
         skuId: '',
         qty: '',
         qtyFocus: true

package/src/views/wms/page/receive/bySkuBatch/action.vue

@@ -225,7 +225,6 @@ import {
   wmsMobileExtInGetAsnV2
 } from "../../../api/receive/bySkuBatch";
 import {wmsMobileQueryContainerSkuList} from "../../../api/receive/byContainer";
-import stringRandom from "string-random";
 import {wmsMobileExtInQueryAllocSkuLotList} from "../../../api/receive/bySku";
 
 export default {
@@ -389,7 +388,7 @@ export default {
     // 容器收货 - 增加容器
     addContainerReceive() {
       this.containerReceive.list.unshift({
-        id: stringRandom(10, {numbers: true}) + Date.now(),
+        id: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
         skuId: '',
         qty: '',
         qtyFocus: true

package/src/views/wms/page/receive/bySkuLpnSpec/action.vue

@@ -547,7 +547,9 @@ export default {
 
         // 回填收货库位
         if (!this.loc.value) {
-          this.loc.value = this.skuInfo.receiveLocationCode
+          const type = this.$lwWarehouseConfig.get('systemConfig.INBOUND_IGNORE_DEFAULT_RECEIVE_LOC_TYPE')
+          console.log(type, 999)
+          this.loc.value = /skuPalletSpec/.test(type) ? '' : this.skuInfo.receiveLocationCode
         }
       })
     },
@@ -581,6 +583,15 @@ export default {
         return
       }
 
+      // 去重
+      if (this.scanLpnList.some(item => item.lpn === lpn)) {
+        this.lpn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '当前托盘号已存在列表中，不允许重复添加')
+        )
+        return
+      }
+
       wmsMobileCheckLpnForPalletSpecReceive({lpn}).then(() => {
         this.addScanLpn(lpn)
         this.lpn.focus = true

package/src/views/wms/views/inner/menu.js

@@ -49,6 +49,8 @@ import planMoveMaster from "./../../../../assets/img/wms/menu/inner/planMove/mas
 import planMoveSecond from "./../../../../assets/img/wms/menu/inner/planMove/second.png";
 import skuToLpnMaster from "./../../../../assets/img/wms/menu/inner/skuToLpn/master.png";
 import skuToLpnSecond from "./../../../../assets/img/wms/menu/inner/skuToLpn/second.png";
+import skuBatchToLpnMaster from "./../../../../assets/img/wms/menu/inner/skuBatchToLpn/master.png";
+import skuBatchToLpnSecond from "./../../../../assets/img/wms/menu/inner/skuBatchToLpn/second.png";
 
 export const innerMenu = {
   src: innerImg,
@@ -353,7 +355,7 @@ export const innerMenu = {
       path: '/inner/planMove/lwIndex',
     },
 
-    //   整托盘移动上架
+    //   商品打托
     skuToLpn: {
       childSrc: {
         master: skuToLpnMaster,
@@ -367,6 +369,20 @@ export const innerMenu = {
       path: '/inner/skuToLpn/lwIndex',
     },
 
+    //   商品批量打托
+    skuBatchToLpn: {
+      childSrc: {
+        master: skuBatchToLpnMaster,
+        second: skuBatchToLpnSecond
+      },
+      title: '商品批量打托',
+      titleKey: 'wms_project.pda.menu.inner.skuBatchToLpn',
+      tip: 0,
+      hidden: false,
+      permissions: ['/wms/pda/inner/skuBatchToLpn/lwIndex'],
+      path: '/inner/skuBatchToLpn/index',
+    },
+
 
   }
 }

package/src/views/wms/views/inner/router.js

@@ -328,4 +328,17 @@ export const innerRouter = [
     name: "lwInnerSkuToLpnIndex",
     component: () => import('../../page/inner/skuToLpn/index.vue')
   },
+
+  // 商品批量打托 - 起始页
+  {
+    path: "/inner/skuBatchToLpn/index",
+    name: "lwInnerSkuBatchToLpnIndex",
+    component: () => import('../../page/inner/skuBatchToLpn/index.vue')
+  },
+  // 商品批量打托 - 执行
+  {
+    path: "/inner/skuBatchToLpn/action",
+    name: "lwInnerSkuBatchToLpnAction",
+    component: () => import('../../page/inner/skuBatchToLpn/action.vue')
+  },
 ]

package/src/views/wms/views/outbound/menu.js

@@ -323,6 +323,20 @@ export const outboundMenu = {
       path: '/outbound/block/box-list',
     },
 
+    // 订单拦截V2
+    blockV2: {
+      childSrc: {
+        master: outboundBlockImgMaster,
+        second: outboundBlockImgSecond
+      },
+      title: '订单拦截V2',
+      titleKey: 'wms_project.pda.menu.blockV2',
+      tip: 0,
+      hidden: false,
+      permissions: ['/wms/pda/outbound/blockV2/index'],
+      path: '/outbound/blockV2/index',
+    },
+
     // 出库确认缺货列表
     stockoutList: {
       childSrc: {

package/src/views/wms/views/outbound/router.js

@@ -4,6 +4,8 @@
 * @date  2023-11-24
 * */
 
+import lwOrderTaskDetails from '../../page/outbound/orderTaskDetails/orderTaskDetails.vue'
+
 export const outboundRouter = [
   // 出库拦截箱列表
   {
@@ -98,6 +100,11 @@ export const outboundRouter = [
     name: "LwOutboundPickNotAloneAction",
     component: () => import('./pick/notAloneAction.vue')
   },
+  {// 出库 - 拣选 - 零散拣选 - 选择拣选任务
+    path: "/outbound/pick/selectPickTask",
+    name: "LwOutboundPickSelectPickTask",
+    component: () => import('./../../page/outbound/pick/notAlone/selectPickTask.vue')
+  },
   {
     path: "/outbound/pick/lwSowAction",
     name: "LwOutboundPickSowAction",
@@ -528,4 +535,24 @@ export const outboundRouter = [
     name: "lwOutboundDockConvergeIndex",
     component: () => import('./../../page/outbound/dockConverge/index.vue')
   },
+
+
+  // 订单拦截V2 - 起始页
+  {
+    path: "/outbound/blockV2/index",
+    name: "lwOutboundBlockV2Index",
+    component: () => import('./../../page/outbound/blockV2/index.vue')
+  },
+  // 订单拦截V2 - 执行页
+  {
+    path: "/outbound/blockV2/action",
+    name: "lwOutboundBlockV2Action",
+    component: () => import('./../../page/outbound/blockV2/action.vue')
+  },
+  // 出库业务单任务详情 展示页面
+  {
+    path: "/outbound/orderTask/details",
+    name: "lwOrderTaskDetails",
+    component: () => import('./../../page/outbound/orderTaskDetails/orderTaskDetails.vue')
+  },
 ]

package/dist/InboundQualityExecuteView-CxjwfTVR.mjs

@@ -1,21 +0,0 @@
-import { n as t } from "./index-DtbXZCdB.mjs";
-const a = {
-  name: "InboundQualityExecuteView"
-};
-var l = function() {
-  var n = this, e = n._self._c;
-  return e("lw-inbound-quality-execute-page");
-}, r = [], u = /* @__PURE__ */ t(
-  a,
-  l,
-  r,
-  !1,
-  null,
-  null,
-  null,
-  null
-);
-const c = u.exports;
-export {
-  c as default
-};

package/dist/InboundReceiveSkuScanView-XU7MnNSE.mjs

@@ -1,21 +0,0 @@
-import { n as r } from "./index-DtbXZCdB.mjs";
-const a = {
-  name: "InboundReceiveSkuScanView"
-};
-var c = function() {
-  var n = this, e = n._self._c;
-  return e("lw-inbound-receive-sku-scan-page");
-}, o = [], s = /* @__PURE__ */ r(
-  a,
-  c,
-  o,
-  !1,
-  null,
-  null,
-  null,
-  null
-);
-const t = s.exports;
-export {
-  t as default
-};

package/dist/action-0RkS-Kv3.mjs

@@ -1,25 +0,0 @@
-import { n as r } from "./index-DtbXZCdB.mjs";
-const a = {
-  name: "index",
-  data() {
-    return {};
-  },
-  methods: {}
-};
-var t = function() {
-  var n = this, e = n._self._c;
-  return e("lw-inner-dull-adjust-query-page");
-}, s = [], o = /* @__PURE__ */ r(
-  a,
-  t,
-  s,
-  !1,
-  null,
-  "3e060fa6",
-  null,
-  null
-);
-const c = o.exports;
-export {
-  c as default
-};

package/dist/action-CB6kpOv5.mjs

@@ -1,25 +0,0 @@
-import { n as a } from "./index-DtbXZCdB.mjs";
-const r = {
-  name: "action",
-  data() {
-    return {};
-  },
-  methods: {}
-};
-var t = function() {
-  var n = this, e = n._self._c;
-  return e("lw-receive-abnormal-action-page");
-}, o = [], c = /* @__PURE__ */ a(
-  r,
-  t,
-  o,
-  !1,
-  null,
-  "eaf8a3b3",
-  null,
-  null
-);
-const l = c.exports;
-export {
-  l as default
-};

package/dist/action-CeP-UWcA.mjs

@@ -1,25 +0,0 @@
-import { n as r } from "./index-DtbXZCdB.mjs";
-const a = {
-  name: "action",
-  data() {
-    return {};
-  },
-  methods: {}
-};
-var t = function() {
-  var n = this, e = n._self._c;
-  return e("lw-receive-lpn-repeal-action");
-}, o = [], c = /* @__PURE__ */ r(
-  a,
-  t,
-  o,
-  !1,
-  null,
-  "00059a8f",
-  null,
-  null
-);
-const l = c.exports;
-export {
-  l as default
-};

package/dist/action-CrBfdPk2.mjs

@@ -1,25 +0,0 @@
-import { n as t } from "./index-DtbXZCdB.mjs";
-const a = {
-  name: "action",
-  data() {
-    return {};
-  },
-  methods: {}
-};
-var r = function() {
-  var n = this, e = n._self._c;
-  return e("lw-receive-by-sku-batch-action");
-}, c = [], o = /* @__PURE__ */ t(
-  a,
-  r,
-  c,
-  !1,
-  null,
-  "c6eea605",
-  null,
-  null
-);
-const l = o.exports;
-export {
-  l as default
-};

package/dist/action-CtTzk-G8.mjs

@@ -1,25 +0,0 @@
-import { n as r } from "./index-DtbXZCdB.mjs";
-const t = {
-  name: "index",
-  data() {
-    return {};
-  },
-  methods: {}
-};
-var a = function() {
-  var n = this, e = n._self._c;
-  return e("lw-inner-check-order-page");
-}, o = [], s = /* @__PURE__ */ r(
-  t,
-  a,
-  o,
-  !1,
-  null,
-  "140bd3d4",
-  null,
-  null
-);
-const l = s.exports;
-export {
-  l as default
-};

package/dist/action-fx7Doppc.mjs

@@ -1,71 +0,0 @@
-import { b as n, c as s } from "./dockConvergeReady-CVm9kL_p.mjs";
-import { n as r, f as u } from "./index-DtbXZCdB.mjs";
-const i = {
-  name: "lwOutboundDockPreparationConvergeDeliveryAction",
-  components: {
-    pickBlockPopup: u
-  },
-  data() {
-    return {
-      deliveryInfo: {},
-      lpn: {
-        value: "",
-        focus: !0,
-        data: {}
-      }
-    };
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    // 获取数据
-    init() {
-      n(this.$route.query).then((a) => {
-        this.deliveryInfo = a || {};
-      });
-    },
-    // 托盘确认
-    async lpnConfirm(a, { data: e }) {
-      const l = e.lpn || e.key;
-      if (!l) {
-        this.lpn.focus = !0, this.$lwShowErrorMsg(
-          this.$lwLanguage.get("", "托盘不能为空")
-        );
-        return;
-      }
-      await this.$refs.pickBlockPopup.checkLpnBlock(l) || (this.lpn.data = {}, s({
-        lpn: l,
-        prepickCollectCodes: this.deliveryInfo.prepickCollectCodes,
-        ...this.$route.query
-      }).then((t) => {
-        this.lpn.data = t, this.init();
-      }));
-    }
-  }
-};
-var c = function() {
-  var e = this, l = e._self._c;
-  return l("div", [l("lw-nav-bar", { attrs: { title: e.$lwLanguage.get("", "月台集货准备") } }), l("lw-page-body-module", [l("lw-label-value-group", { attrs: { list: e.deliveryInfo.headers, "show-model-style": "" } }), l("div", { staticClass: "lw-global-model-box-3px lw-global-model-box" }, [l("lw-input", { attrs: { title: e.$lwLanguage.get("", "集货托盘号"), "get-focus": e.lpn.focus, "rule-key": "lpn", "create-rule": e.$lwScanRule.create("月台集货准备-运单集货准备-集货托盘号", "LPN"), "show-bottom-border": !1, required: "", "auto-clear-val": "" }, on: { "update:getFocus": function(t) {
-    return e.$set(e.lpn, "focus", t);
-  }, "update:get-focus": function(t) {
-    return e.$set(e.lpn, "focus", t);
-  }, confirm: e.lpnConfirm }, model: { value: e.lpn.value, callback: function(t) {
-    e.$set(e.lpn, "value", t);
-  }, expression: "lpn.value" } })], 1), Object.keys(e.lpn.data).length ? l("div", { staticClass: "lw-global-model-box lw-global-animation-rotate" }, [l("div", { staticClass: "lw-global-row-start lw-global-value-bold", staticStyle: { "text-align": "center" }, style: { color: "#07c160" } }, [e._v(" " + e._s(e.$lwLanguage.get("", "扫描成功，请送到月台进行集货")) + " ")]), l("lw-title-value-cell", { attrs: { title: e.$lwLanguage.get("", "托盘号"), value: e.lpn.data.lpn, "val-bold": "" } }), l("div", { staticClass: "lw-global-row lw-global-flex-between" }, [l("lw-title-value-cell", { attrs: { title: e.$lwLanguage.get("", "品种数"), value: e.lpn.data.skuTypeCount, "val-bold": "", "val-red": "", "is-row": !1 } }), l("lw-title-value-cell", { attrs: { title: e.$lwLanguage.get("", "商品数"), value: e.lpn.data.qtyLabel, "val-bold": "", "val-red": "", "is-row": !1 } })], 1), e._l(e.lpn.data.skuList, function(t, o) {
-    return l("lw-sku-info-module", { key: o, attrs: { "sku-code": t.skuCode, "sku-name": t.skuName, qty: t.qtyLabel, "is-row": "", "is-row-last": o + 1 === e.lpn.data.skuList.length } });
-  })], 2) : e._e()], 1), l("pick-block-popup", { ref: "pickBlockPopup" })], 1);
-}, p = [], d = /* @__PURE__ */ r(
-  i,
-  c,
-  p,
-  !1,
-  null,
-  "558a6b32",
-  null,
-  null
-);
-const f = d.exports;
-export {
-  f as default
-};

package/dist/addEdit-BYg48qYf.mjs

@@ -1,25 +0,0 @@
-import { n as t } from "./index-DtbXZCdB.mjs";
-const r = {
-  name: "addEdit",
-  data() {
-    return {};
-  },
-  methods: {}
-};
-var a = function() {
-  var n = this, e = n._self._c;
-  return e("lw-vin-quality-register-add-edit");
-}, d = [], s = /* @__PURE__ */ t(
-  r,
-  a,
-  d,
-  !1,
-  null,
-  "fd784111",
-  null,
-  null
-);
-const i = s.exports;
-export {
-  i as default
-};

package/dist/allCheck-DjImul8k.mjs

@@ -1,25 +0,0 @@
-import { n as a } from "./index-DtbXZCdB.mjs";
-const l = {
-  name: "allCheck",
-  data() {
-    return {};
-  },
-  methods: {}
-};
-var r = function() {
-  var e = this, n = e._self._c;
-  return n("lw-outbound-bale-all-check-page");
-}, t = [], c = /* @__PURE__ */ a(
-  l,
-  r,
-  t,
-  !1,
-  null,
-  "4c85a886",
-  null,
-  null
-);
-const _ = c.exports;
-export {
-  _ as default
-};