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

package/src/views/wms/page/inner/skuToLpn/index.vue

@@ -117,7 +117,7 @@
           :get-focus.sync="selectSkuPopup.sku.focus"
           :title="$lwLanguage.get('','商品')"
           rule-key="selectLpnPopupSku"
-          :create-rule="$lwScanRule.create('计划移动-创建移动加护-选择托盘-商品','SKU')"
+          :create-rule="$lwScanRule.create('商品打托-起始页-选择库存-商品','SKU')"
           type="sku"
           @confirm="selectSkuPopup.loc.focus=true"
         />
@@ -127,7 +127,7 @@
           v-model="selectSkuPopup.loc.value"
           :get-focus.sync="selectSkuPopup.loc.focus"
           rule-key="selectLpnPopupLoc"
-          :create-rule="$lwScanRule.create('计划移动-创建移动计划-选择托盘-库位','LOCATION')"
+          :create-rule="$lwScanRule.create('商品打托-起始页-选择库存-库位','LOCATION')"
           @confirm="selectSkuPopup.lpn.focus=true"
         />
 
@@ -136,7 +136,7 @@
           v-model="selectSkuPopup.lpn.value"
           :get-focus.sync="selectSkuPopup.lpn.focus"
           rule-key="selectLpnPopupLpn"
-          :create-rule="$lwScanRule.create('计划移动-创建移动计划-选择托盘-托盘号','LPN')"
+          :create-rule="$lwScanRule.create('商品打托-起始页-选择库存-托盘号','LPN')"
           @confirm="selectSkuPopupSearch"
         />
 
@@ -366,9 +366,10 @@ export default {
       this.selectSkuPopup.sku.focus = true
     },
     // 选择库存弹框 - 获取商品信息
-    selectSkuPopupGetSkuInfo() {
+    selectSkuPopupGetSkuInfo(data) {
       return this.$lwApi.common.searchSku({
-        onlyContainer: true
+        ...data,
+        onlyContainer: this.$lwWarehouseConfig.get('systemConfig.SKU_PALLET_ONLY_QUERY_CONTAINER_SKU') === 'true'
       })
     },
     // 选择库存弹框 - 确认搜索

package/src/views/wms/page/outbound/blockV2/action.vue

@@ -0,0 +1,318 @@
+<!--
+  订单拦截V2 - 执行页
+  @author: 张文
+  @date: 2024-09-04
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('', '拦截处理')"/>
+
+    <lw-page-body-module>
+      <lw-label-value-group
+        class="lw-global-row-start"
+        :list="soInfo.contentList"
+        :show-row-style="false"
+        show-model-style
+      />
+
+      <div class="lw-global-model-box lw-global-model-box-3px">
+        <lw-input
+          ref="keyword"
+          v-model="keyword"
+          :title="$lwLanguage.get('', '条件')"
+          :placeholder="$lwLanguage.get('', '请扫描或输入组托号/拣选容器/箱号/商品编码过滤')"
+          :create-rule="$lwScanRule.create('订单拦截V2-执行-条件','CASE')"
+          rule-key="case"
+          :show-bottom-border="false"
+          @confirm="searchConfirm"
+        >
+          <template #button>
+            <lw-button
+              style="margin-left: 10px"
+              mini
+              @click="$refs.keyword.confirm()"
+            >
+              {{ $lwLanguage.get('', '查询') }}
+            </lw-button>
+          </template>
+        </lw-input>
+      </div>
+
+    </lw-page-body-module>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+  name: "lwOutboundBlockV2Action",
+  data() {
+    return {
+      soInfo: {
+        contentList: [
+          [
+            {
+              "type": "LV",
+              "label": "到货通知单",
+              "value": "A20240807-0002",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            },
+            {
+              "type": "TAG",
+              "label": null,
+              "value": null,
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": [
+                {
+                  "tag": "待收货",
+                  "type": null,
+                  "plain": null,
+                  "round": null
+                }
+              ],
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "订单类型",
+              "value": "虚拟入库",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "货主",
+              "value": "lyALL/lyALL贸易伙伴",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "承运商",
+              "value": "lyALL/lyALL贸易伙伴",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "运输",
+              "value": "CHUANT4646",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "订单时间",
+              "value": "2024-08-07 15:12:11",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "预约时间",
+              "value": "2024-08-09 15:12:35",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "预约月台",
+              "value": "TRtest/TRtest",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "已收箱数",
+              "value": "0/3罐",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ],
+          [
+            {
+              "type": "LV",
+              "label": "创建时间",
+              "value": "2024-08-07 15:12:11",
+              "valueType": null,
+              "formatMethod": null,
+              "labelStyle": null,
+              "valueStyle": null,
+              "valBold": true,
+              "valRed": null,
+              "tagList": null,
+              "child": null,
+              "join": null
+            }
+          ]
+        ]
+      },
+      keyword: '',
+
+      datas: [
+        {
+          container: 'LPN-001',
+          type: 'LPN',
+          caseList: [
+            {
+              case: 'CASE-001',
+              skuList: [
+                {
+                  skuCode: 'goods-001',
+                  skuName: '商品-001',
+                  qty: 1
+                }
+              ]
+            }
+          ],
+          skuList: []
+        },
+        {
+          container: 'BOX-001',
+          type: 'CASE',
+          caseList: [],
+          skuList: [
+            {
+              skuCode: 'goods-001',
+              skuName: '商品-001',
+              qty: 1
+            }
+          ]
+        },
+        {
+          container: 'PICK-001',
+          type: 'PICK',
+          caseList: [],
+          skuList: [
+            {
+              skuCode: 'goods-001',
+              skuName: '商品-001',
+              qty: 1
+            }
+          ]
+
+        },
+        {
+          container: '',
+          type: 'NULL',
+          caseList: [],
+          skuList: [
+            {
+              skuCode: 'goods-001',
+              skuName: '商品-001',
+              qty: 1
+            }
+          ]
+        },
+      ]
+    }
+  },
+  mounted() {
+    const search = JSON.parse(this.$route.query.search || '{}')
+    this.keyword = search.case || search.lpn || ''
+    this.searchConfirm()
+    console.log(this.$lwStringRandom(10, {numbers: true, letters: true}))
+  },
+  methods: {
+    // 确认搜索
+    searchConfirm() {
+      this.pageNum = 1
+      this.getBlockListData()
+    },
+    // 获取拦截列表数据
+    getBlockListData() {
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -0,0 +1,351 @@
+<!--
+  订单拦截V2 - 起始页
+  @author: 张文
+  @date: 2024-09-04
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('', '订单拦截')"/>
+
+    <lw-page-body-module>
+      <div
+        style="padding-top: 3px"
+        class="lw-global-model-box"
+      >
+        <lw-input
+          v-model="search.so"
+          :title="$lwLanguage.get('', '单号')"
+          :placeholder="$lwLanguage.get('', '出库单号/外部单号/计划单号/客户单号/运输单号等单号查询')"
+          :create-rule="$lwScanRule.create('订单拦截V2-起始页-单号','SO')"
+          rule-key="so"
+        />
+        <lw-search-select-popup-module
+          ref="customer"
+          :api="$lwApi.common.searchCustomer"
+          :title="$lwLanguage.get('','客户')"
+          v-model="search.customerId"
+          :create-rule="$lwScanRule.create('订单拦截V2-起始页-客户','CUSTOMER')"
+          rule-key="customer"
+        />
+        <lw-input
+          v-model="search.lpn"
+          :title="$lwLanguage.get('', '托号')"
+          :create-rule="$lwScanRule.create('订单拦截V2-起始页-托号','LPN')"
+          rule-key="lpn"
+        />
+        <lw-input
+          v-model="search.case"
+          :title="$lwLanguage.get('', '捆包箱')"
+          :create-rule="$lwScanRule.create('订单拦截V2-起始页-捆包箱','CASE')"
+          rule-key="case"
+        />
+
+        <div class="lw-global-flex-between lw-global-row-end">
+          <lw-button
+            small
+            type="last"
+            plain
+            block
+            @click="reset"
+          >
+            {{ $lwLanguage.get('', '重置') }}
+          </lw-button>
+          <lw-button
+            style="margin-left: 10px"
+            small
+            block
+            @click="searchConfirm"
+          >
+            {{ $lwLanguage.get('', '查询') }}
+          </lw-button>
+        </div>
+      </div>
+
+      <div
+        class="lw-global-model-box"
+        v-for="(i,k) in datas"
+        :key="k"
+      >
+        <lw-label-value-group
+          class="lw-global-row-start"
+          :list="i.contentList"
+          :show-row-style="false"
+        />
+
+        <div
+          class="lw-global-row-end"
+          style="text-align: right"
+        >
+          <lw-button
+            mini
+            @click="blockDispose(i)"
+          >
+            {{ $lwLanguage.get('', '拦截处理') }}
+          </lw-button>
+        </div>
+      </div>
+
+
+      <lw-pagination
+        v-model="pageNum"
+        :page-size.sync="pageSize"
+        :page-total="pageTotal"
+        @change="pageChange"
+      />
+      <lw-not-data v-if="!pageTotal"/>
+
+    </lw-page-body-module>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwOutboundBlockV2Index",
+  data() {
+    return {
+      search: {
+        so: '',
+        customerId: '',
+        lpn: '',
+        case: '',
+      },
+
+      datas: [
+        {
+          contentList: [
+            [
+              {
+                "type": "LV",
+                "label": "到货通知单",
+                "value": "A20240807-0002",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              },
+              {
+                "type": "TAG",
+                "label": null,
+                "value": null,
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": [
+                  {
+                    "tag": "待收货",
+                    "type": null,
+                    "plain": null,
+                    "round": null
+                  }
+                ],
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "订单类型",
+                "value": "虚拟入库",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "货主",
+                "value": "lyALL/lyALL贸易伙伴",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "承运商",
+                "value": "lyALL/lyALL贸易伙伴",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "运输",
+                "value": "CHUANT4646",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "订单时间",
+                "value": "2024-08-07 15:12:11",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "预约时间",
+                "value": "2024-08-09 15:12:35",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "预约月台",
+                "value": "TRtest/TRtest",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "已收箱数",
+                "value": "0/3罐",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ],
+            [
+              {
+                "type": "LV",
+                "label": "创建时间",
+                "value": "2024-08-07 15:12:11",
+                "valueType": null,
+                "formatMethod": null,
+                "labelStyle": null,
+                "valueStyle": null,
+                "valBold": true,
+                "valRed": null,
+                "tagList": null,
+                "child": null,
+                "join": null
+              }
+            ]
+          ]
+        }
+      ],
+      pageNum: 1,
+      pageSize: 10,
+      pageTotal: 0
+    }
+  },
+  methods: {
+    // 重置
+    reset() {
+      for (const k in this.search) {
+        this.search[k] = ''
+      }
+      this.searchConfirm()
+    },
+    // 确认搜索
+    searchConfirm() {
+      this.pageNum = 1
+      this.pageChange()
+    },
+
+    // 分页变化
+    pageChange() {
+    },
+
+    // 拦截处理
+    blockDispose(item) {
+
+      const search = JSON.stringify(this.search)
+
+      this.$router.replace({
+        path: '/outbound/blockV2/index',
+        query: {
+          search,
+          pageNum: this.pageNum,
+          _t: Date.now()
+        }
+      })
+      this.$router.push({
+        path: '/outbound/blockV2/action',
+        query: {
+          id: item.id,
+          search
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>