@logwire/logwire-wms-pda-ui 3.3.4 → 3.5.0

package/src/views/wms/page/outbound/stockout/LwOutboundStockoutExecutePage.vue

@@ -2,25 +2,57 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.ulyatfhh', '确认缺货')"/>
     <div class="lw-global-page-box">
-      <stockout-info :data="stock"/>
-      <div class="lw-global-model-box" style="margin-bottom: 10px; text-align: center;">{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.trpseafv', '缺货商品')}}</div>
-      <div v-if="stock">
-        <div v-for="item in stock.soSkuList" :key="item.skuId" class="lw-global-model-box lw-global-flex-between" style="align-items: flex-start;">
-          <div class="stock-sku">
-            <div>{{ item.skuCode }}</div>
-            <div>{{ item.skuName }}</div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.miawrafq', '出库单号 ')}}<span>{{ item.soNo}}</span></div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.dhoirdil', '外部单号 ')}}<span>{{ item.extSoNo || '-'}}</span></div>
-          </div>
-          <div class="stock-opt">
-            <div>{{ item.stockoutQty }}</div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.bslshagd', '缺货数量')}}</div>
-            <div>
-              <lw-button @click="confirmStock(item)">{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.gmxlkxym', '确认缺货')}}</lw-button>
-            </div>
-          </div>
+
+      <stockout-info :data="stockInfo"/>
+
+      <div class="lw-global-title" style="margin: 10px 0;">
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.stockout.trpseafv', '缺货商品') }}
+      </div>
+
+      <div
+        v-for="item in stock.data"
+        :key="item.skuId"
+        class="lw-global-model-box"
+        style="padding-top: 3px"
+      >
+        <lw-sku-info-module
+          :sku-code="item.skuCode"
+          :sku-name="item.skuName"
+          :qty="item.stockoutQtyLabel"
+          :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.bslshagd', '缺货数量')"
+          is-row
+        />
+        <lw-title-value-cell
+          style="margin-top: 6px"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.miawrafq', '出库单号')"
+          :value="$lwCheckVal(item.soNo)"
+          :is-row="false"
+        />
+
+        <div class="lw-global-flex-between">
+          <lw-title-value-cell
+            style="flex: 1"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.dhoirdil', '外部单号')"
+            :value="$lwCheckVal(item.extSoNo)"
+            :is-row="false"
+          />
+          <lw-button
+            style="flex-shrink: 0"
+            mini
+            @click="confirmStock(item)"
+          >
+            {{ $lwLanguage.get('wms_project.pda.components.page.outbound.stockout.gmxlkxym', '确认缺货') }}
+          </lw-button>
         </div>
       </div>
+
+
+      <lw-pagination
+        v-model="stock.pageNum"
+        :page-size.sync="stock.pageSize"
+        :page-total="stock.pageTotal"
+        @change="changePage"
+      />
     </div>
     <lw-bottom-bar>
       <lw-button plain @click="$router.back()">{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.ssgqagqz', '返回')}}</lw-button>
@@ -31,44 +63,108 @@
 
 <script>
 import StockoutInfo from './components/StockoutInfo.vue'
-import { outboundConfirmStockOut, outboundQueryStockoutOrderDetail } from '../../../api/outbound/stockout'
+import {
+  projectWmsOutboundConfirmCustomerAllStockOut,
+  projectWmsOutboundConfirmStockOut,
+  projectWmsOutboundQueryStockoutCustomerInfo,
+  projectWmsOutboundQueryStockoutCustomerOrderSkuPage
+} from '../../../api/outbound/stockout'
 export default {
   name: 'LwOutboundStockoutExecutePage',
   components: { StockoutInfo },
   data () {
     return {
-      stock: null,
+      stockInfo: {},
+      stock: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        data: []
+      },
+
+
     }
   },
   created () {
-    const { planTime, customerCode } = this.$route.query
+    const {planTime, customerCode} = this.$route.query
     if (!planTime) {
       return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.hgqfmxkd', '计划日期参数错误'))
     }
     if (!customerCode) {
       return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.munxfxan', '货主编码参数错误'))
     }
-    this.loadData(planTime, customerCode)
+
+    this.getCustomerData()
+    this.changePage()
   },
   methods: {
-    loadData (planTime, customerCode) {
-      outboundQueryStockoutOrderDetail(planTime, customerCode).then(res => this.stock = res)
+    // 获取客户信息
+    getCustomerData() {
+      projectWmsOutboundQueryStockoutCustomerInfo(this.$route.query).then(res => {
+        this.stockInfo = res
+      })
     },
-    confirmStock (item) {
-      this.doConfirmStock([item])
+    // 页码改变
+    changePage() {
+      projectWmsOutboundQueryStockoutCustomerOrderSkuPage({
+        pageSize: this.stock.pageSize,
+        pageNum: this.stock.pageNum,
+        ...this.$route.query
+      }).then(res => {
+        this.stock.pageTotal = res.total
+        this.stock.data = res.datas || []
+      })
+    },
+
+
+    // 提示弹框
+    dialogFn(callback) {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.munxfxanq', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.munxfxanqs', '确认缺货?')
+      }).then(callback).catch(() => {
+      })
     },
-    confirmAllStock () {
-      this.doConfirmStock(this.stock.soSkuList)
+
+    // 提交完成后的数据校验
+    resultFormat(res) {
+      if (res.customerStockoutFinish) {
+        this.$lwToast.success({
+          message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.jmmzxdxs', '已全部完成'),
+          onClose: () => {
+            history.go(-1)
+          }
+        })
+      } else {
+        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.ywfudonp', '操作成功'))
+        this.changePage()
+      }
     },
-    doConfirmStock (list) {
-      outboundConfirmStockOut(this.stock.planTime, this.stock.customerCode, list).then(res => {
-        if (res.customerStockoutFinish) {
-          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.jmmzxdxs', '已全部完成'))
-          setTimeout(() => this.$router.back(), 1000)
-        } else {
-          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.ywfudonp', '操作成功'))
-          this.loadData(this.stock.planTime, this.stock.customerCode)
-        }
+
+    // 确认缺货
+    confirmStock(item) {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.munxfxanq', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.munxfxanqs', '确认缺货?')
+      }).then(() => {
+        projectWmsOutboundConfirmStockOut({
+          ...this.$route.query,
+          soSkuList: [item]
+        }).then(this.resultFormat)
+      }).catch(() => {
+      })
+    },
+
+    // 全部确认缺货
+    confirmAllStock() {
+      this.$lwDialog.confirm({
+        type: 'warning',
+        title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.munxfxanq', '提示'),
+        message: this.$lwLanguage.get('', '确认全部缺货?')
+      }).then(() => {
+        projectWmsOutboundConfirmCustomerAllStockOut(this.$route.query).then(this.resultFormat)
       })
     },
   }

package/src/views/wms/page/outbound/stockout/LwOutboundStockoutListPage.vue

@@ -2,24 +2,55 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.dvnzidln', '确认缺货')"/>
     <div class="lw-global-page-box">
-      <div class="lw-global-model-box">
-        <lw-cell-popup-date :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.evmnjeuy', '计划日期')" v-model="param.planTime" @confirm="param.roadLine.focus = true" required/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.gwzoziot', '线路编码')" v-model="param.roadLine.value" :get-focus.sync="param.roadLine.focus"
+      <div class="lw-global-model-box" style="padding-top: 3px">
+        <lw-cell-popup-date
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.evmnjeuy', '计划日期')"
+          v-model="param.planTime" @confirm="param.roadLine.focus = true" required/>
+        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.gwzoziot', '线路编码')"
+                  v-model="param.roadLine.value" :get-focus.sync="param.roadLine.focus"
                   @confirm="param.customerCode.focus = true"/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.gxrqcbup', '客户编码')" v-model="param.customerCode.value" :get-focus.sync="param.customerCode.focus"
+        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.gxrqcbup', '客户编码')"
+                  v-model="param.customerCode.value" :get-focus.sync="param.customerCode.focus"
                   @confirm="param.soNo.focus = true"/>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.wtqpmcwj', '出库单号')" v-model="param.soNo.value" :get-focus.sync="param.soNo.focus" @confirm="queryData"/>
-        <lw-button block @click="queryData">{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.pwjfkfgt', '查询')}}</lw-button>
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.wtqpmcwj', '出库单号')"
+          v-model="param.soNo.value"
+          :get-focus.sync="param.soNo.focus"
+          rule-key="so"
+          :create-rule="$lwScanRule.create('缺货-执行页-出库单号','SO')"
+          @confirm="queryData"
+        />
+        <lw-button
+          style="margin-top: 10px"
+          block
+          @click="queryData"
+        >
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.stockout.pwjfkfgt', '查询') }}
+        </lw-button>
       </div>
 
-      <div v-if="showTitle" class="lw-global-model-box" style="margin-bottom: 10px; text-align: center;">{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.wgevfeql', '存在缺货的客户列表')}}</div>
-      <div v-if="showEmpty">
-        <lw-not-data/>
-      </div>
-      <div v-else>
-        <stockout-info v-for="item in stocks" :key="item.customerCode" :data="item" @click="toExecute(item)"/>
-        <lw-pages v-model="query.pageNum" :page-size="query.pageSize" :page-total="query.total" @change="loadPage"/>
-      </div>
+      <template v-if="showTitle">
+        <div
+          class="lw-global-title"
+          style="margin: 10px 0;"
+        >
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.stockout.wgevfeql', '存在缺货的客户列表') }}
+        </div>
+        <stockout-info
+          v-for="item in stocks"
+          :key="item.customerCode"
+          :data="item"
+          @click="toExecute(item)"
+        />
+        <lw-pagination
+          v-model="query.pageNum"
+          :page-size.sync="query.pageSize"
+          :page-total="query.total"
+          @change="loadPage"
+        />
+        <lw-not-data v-if="!query.total"/>
+      </template>
+
     </div>
   </div>
 </template>
@@ -59,7 +90,6 @@ export default {
       },
       stocks: [],
       showTitle: false,
-      showEmpty: false,
     }
   },
   methods: {
@@ -68,30 +98,24 @@ export default {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.ydatntnr', '计划时间不能为空'))
       }
       this.showTitle = true
-      this.showEmpty = false
       this.stocks = []
       this.query.planTime = this.param.planTime
       this.query.roadLine = this.param.roadLine.value
       this.query.customerCode = this.param.customerCode.value
       this.query.soNo = this.param.soNo.value
-      this.loadPage(1)
+      this.query.pageNum = 1
+      this.loadPage()
     },
-    loadPage (page) {
-      const param = { ...this.query, pageNum: page || 1 }
-      outboundQueryStockoutOrder(param).then(res => {
+    loadPage() {
+      outboundQueryStockoutOrder(this.query).then(res => {
         this.query.total = res.total
-        this.query.pageNum = res.pageNum
-        this.query.pageSize = res.pageSize
-        this.stocks = res.datas
-        if (res.total === 0) {
-          this.showEmpty = true
-        }
+        this.stocks = res.datas || []
       })
     },
-    toExecute (item) {
+    toExecute(item) {
       this.$router.push({
         path: '/outbound/stockout/execute',
-        query: { planTime: item.planTime, customerCode: item.customerCode }
+        query: {planTime: item.planTime, customerCode: item.customerCode}
       })
     }
   }

package/src/views/wms/page/outbound/stockout/components/StockoutInfo.vue

@@ -1,10 +1,25 @@
 <template>
-  <div v-if="data" class="lw-global-model-box stock-info" @click="$emit('click', data)">
-    <div>{{ data.customerCode }}</div>
-    <div class="lw-global-sh"></div>
-    <div>{{ data.customerName }}</div>
-    <div>{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.components.yagqbwbf', '集货位 ')}}<span>{{ data.shipLocationCode }}</span></div>
-    <div>{{$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.components.zezdeluu', '缺货数量 ')}}<span style="color: red;">{{ data.stockoutQty }}</span></div>
+  <div
+    class="lw-global-model-box lw-global-row-box"
+    @click="$emit('click', data)"
+  >
+    <div class="lw-global-value-bold lw-global-row-start">{{ data.customerCode }}</div>
+
+    <div class="lw-global-value">{{ data.customerName }}</div>
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.components.yagqbwbf', '集货位 ')"
+      :value="$lwCheckVal(data.shipLocationCode)"
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.stockout.components.zezdeluu', '缺货数量 ')"
+      :value="data.stockoutQtyLabel"
+      :is-row="false"
+      val-red
+      val-bold
+    />
   </div>
 </template>
 
@@ -18,25 +33,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.stock-info {
-  line-height: 1.5em;
-
-  & > div {
-    margin: 3px 0;
 
-    span {
-      font-weight: bold;
-      color: black;
-    }
-  }
-
-  & > div:not(:first-child) {
-    color: gray;
-    font-size: 0.9em;
-  }
-
-  & > div:nth-child(1) {
-    font-weight: bold;
-  }
-}
 </style>

package/src/views/wms/page/outbound/stockout/index.js

@@ -2,12 +2,13 @@ import LwOutboundStockoutListPage from './LwOutboundStockoutListPage.vue'
 import LwOutboundStockoutExecutePage from './LwOutboundStockoutExecutePage.vue'
 
 
-LwOutboundStockoutListPage.install = Vue => Vue.component(LwOutboundStockoutListPage.name, LwOutboundStockoutListPage)
-LwOutboundStockoutExecutePage.install = Vue => Vue.component(LwOutboundStockoutExecutePage.name, LwOutboundStockoutExecutePage)
-
-
-export default [
+const page = [
   LwOutboundStockoutListPage,
   LwOutboundStockoutExecutePage,
 ]
 
+export default page.map(item => {
+  item.install = Vue => Vue.component(item.name, item)
+  return item
+})
+

package/src/views/wms/page/outbound/summary/box/index/index.vue

@@ -23,6 +23,7 @@
           :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.summary.box.index.rejxhfmn','装箱号/原箱号/箱唛/面单')"
           required
           rule-key="box"
+          :create-rule="$lwScanRule.create('集货-箱-箱号','CASE')"
           @confirm="boxNoConfirm"
         />
 
@@ -237,6 +238,8 @@
           v-model="summaryPopup.input.local.value"
           :get-focus.sync="summaryPopup.input.local.focus"
           required
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('集货-箱-集货库位','LOCATION')"
           @confirm="summaryPopupLocalConfirm"
         />
 
@@ -245,6 +248,7 @@
           v-model="summaryPopup.input.lpn.value"
           :get-focus.sync="summaryPopup.input.lpn.focus"
           rule-key="lpn"
+          :create-rule="$lwScanRule.create('集货-箱-组托号','LPN')"
           @confirm="summaryPopupLpnConfirm"
         />
       </template>

package/src/views/wms/page/outbound/summary/lpn/action/index.vue

@@ -55,6 +55,7 @@
           :get-focus.sync="summaryLocal.focus"
           required
           rule-key="location"
+          :create-rule="$lwScanRule.create('集货-托盘-集货库位','LOCATION')"
           @confirm="summaryLocalConfirm"
         />
 
@@ -63,6 +64,7 @@
           v-model="lpn.value"
           :get-focus.sync="lpn.focus"
           rule-key="lpn"
+          :create-rule="$lwScanRule.create('集货-托盘-码托号','LPN')"
           @confirm="lpnConfirm"
         />
 
@@ -91,7 +93,7 @@
               style="color: #D50000"
               class="lw-global-value-bold lw-summary-action-row-num"
             >
-              {{ i.qty }}
+              {{ i.qtyLabel }}
             </div>
 
           </div>
@@ -235,17 +237,17 @@ export default {
 .lw-summary-action-row{
   padding: 5px;
 
-  &+.lw-summary-action-row{
+  & + .lw-summary-action-row {
     border-top: solid 1px #f0f0f0;
   }
 
-  &:last-child{
+  &:last-child {
     padding-bottom: 0;
   }
 
-  .lw-summary-action-row-num{
-    width: 35px;
-    text-align: center;
+  .lw-summary-action-row-num {
+    width: 30%;
+    text-align: right;
   }
 }
 

package/src/views/wms/page/outbound/summary/lpn/index/index.vue

@@ -19,6 +19,7 @@
           v-model="lpn"
           :get-focus.sync="lpnFocus"
           rule-key="lpn"
+          :create-rule="$lwScanRule.create('集货-托盘-托盘号','LPN')"
           @confirm="lpnConfirm"
         />
 

package/src/views/wms/page/process/prepare/index.vue

@@ -97,6 +97,9 @@
                 v-model="down.loc.value"
                 :get-focus.sync="down.loc.focus"
                 rule-key="downLoc"
+                :create-rule="$lwScanRule.create('加工备料-备料下架-库位','LOCATION')"
+                :owner-id="downData.ownerId"
+                :rule-serve-query="downData"
                 required
                 @confirm="downLocConfirm"/>
 
@@ -106,7 +109,10 @@
                 :title="$lwLanguage.get('wms_project.pda.components.page.process.prepare.index.dubseqbl','确认托盘号')"
                 v-model="down.lpn.value"
                 :get-focus.sync="down.lpn.focus"
-                rule-key="lpn"
+                rule-key="downLpn"
+                :create-rule="$lwScanRule.create('加工备料-备料下架-托盘号','LPN')"
+                :owner-id="downData.ownerId"
+                :rule-serve-query="downData"
                 required
                 @confirm="downLpnConfirm"/>
 
@@ -115,7 +121,10 @@
                 :title="$lwLanguage.get('wms_project.pda.components.page.process.prepare.index.yjkplhck','原料编码')"
                 v-model="down.sku.value"
                 :get-focus.sync="down.sku.focus"
-                rule-key="sku"
+                rule-key="downSku"
+                :create-rule="$lwScanRule.create('加工备料-备料下架-原料编码','SKU')"
+                :owner-id="downData.ownerId"
+                :rule-serve-query="downData"
                 required
                 @confirm="downSkuConfirm"/>
 
@@ -133,7 +142,10 @@
                 :title="$lwLanguage.get('wms_project.pda.components.page.process.prepare.index.cuarvbqw','目标托盘号')"
                 v-model="down.toLpn.value"
                 :get-focus.sync="down.toLpn.focus"
-                rule-key="toLpn"
+                rule-key="downToLpn"
+                :create-rule="$lwScanRule.create('加工备料-备料下架-目标托盘','LPN')"
+                :owner-id="downData.ownerId"
+                :rule-serve-query="downData"
                 required
                 @confirm="downToLpnConfirm"/>
 
@@ -148,7 +160,6 @@
             <lw-not-data v-else/>
           </van-tab>
 
-
           <van-tab
             name="up"
             :title="$lwLanguage.get('wms_project.pda.components.page.process.prepare.index.zzamauqr','备料上架')">
@@ -184,6 +195,9 @@
                 v-model="up.lpn.value"
                 :get-focus.sync="up.lpn.focus"
                 rule-key="upLpn"
+                :create-rule="$lwScanRule.create('加工备料-备料上架-托盘','LPN')"
+                :owner-id="upData.ownerId"
+                :rule-serve-query="upData"
                 @confirm="upLpnConfirm"/>
 
               <lw-title-value-cell
@@ -199,6 +213,9 @@
                 :get-focus.sync="up.loc.focus"
                 required
                 rule-key="upLoc"
+                :create-rule="$lwScanRule.create('加工备料-备料上架-目标库位','LOCATION')"
+                :owner-id="upData.ownerId"
+                :rule-serve-query="upData"
                 @confirm="confirmUp"/>
 
               <lw-cut-card

package/src/views/wms/page/process/process/components/FinishView.vue

@@ -15,14 +15,14 @@
               <div class="lw-global-row-end lw-global-flex-between">
                 <lw-title-value-cell
                   :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.jjuaanoc','计划量')"
-                  :value="p.qty" :is-row="false"/>
+                  :value="p.qtyLabel" :is-row="false"/>
                 <lw-title-value-cell
                   :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.pryqiazx','已加工')"
-                  :value="p.endedQty" :is-row="false"
+                  :value="p.endedQtyLabel" :is-row="false"
                   val-bold/>
                 <lw-title-value-cell
                   :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.ftnvaive','待加工')"
-                  :value="p.qty - p.endedQty" :is-row="false"
+                  :value="p.pendingQtyLabel" :is-row="false"
                   val-bold val-red/>
               </div>
               <div>
@@ -40,7 +40,7 @@
                         :is-row="false"/>
                     </div>
                     <div style="flex: 1; text-align: center;">
-                      <div style="color: red; font-weight: bold;">{{ l.qty }}</div>
+                      <div style="color: red; font-weight: bold;">{{ l.qtyLabel }}</div>
                       <div style="font-size: 14px;">数量</div>
                     </div>
                     <div style="flex: 1; text-align: right;">
@@ -65,13 +65,13 @@
                 <div class="lw-global-row-end lw-global-flex-between">
                   <lw-title-value-cell
                     :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.kantbvvl','数量')"
-                    :value="p.qty" :is-row="false"/>
+                    :value="p.qtyLabel" :is-row="false"/>
                   <lw-title-value-cell
                     :title="p.prepareMethod==='LIMIT' ? $lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.avkmtyvkr','可用量') : $lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.avkmtyvk', '备料量')"
-                    :value="p.prepareQty" :is-row="false" val-bold/>
+                    :value="p.prepareQtyLabel" :is-row="false" val-bold/>
                   <lw-title-value-cell
                     :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.ccwgixyd','消耗量')"
-                    :value="p.expendQty" :is-row="false" val-bold val-red/>
+                    :value="p.expendQtyLabel" :is-row="false" val-bold val-red/>
                 </div>
                 <div v-if="p.prepareMethod === 'PREPARE'">
                   <template v-for="l in p.lines">
@@ -89,11 +89,11 @@
                             :is-row="false"/>
                         </div>
                         <div style="flex: 1; text-align: center;">
-                          <div style="color: green; font-weight: bold;">{{ l.prepareQty }}</div>
+                          <div style="color: green; font-weight: bold;">{{ l.prepareQtyLabel }}</div>
                           <div style="font-size: 14px;">备料量</div>
                         </div>
                         <div style="flex: 1; text-align: center;">
-                          <div style="color: red; font-weight: bold;">{{ l.expendQty }}</div>
+                          <div style="color: red; font-weight: bold;">{{ l.expendQtyLabel }}</div>
                           <div style="font-size: 14px;">消耗量</div>
                         </div>
                       </div>
@@ -137,13 +137,13 @@
       <div class="lw-global-row-end lw-global-flex-between">
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.jjuaanoc','计划量')"
-          :value="cp.data.qty" :is-row="false"/>
+          :value="cp.data.qtyLabel" :is-row="false"/>
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.pryqiazx','已加工')"
-          :value="cp.data.endedQty" :is-row="false" val-bold/>
+          :value="cp.data.endedQtyLabel" :is-row="false" val-bold/>
         <lw-title-value-cell
           :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.ftnvaive','待加工')"
-          :value="cp.data.qty - cp.data.endedQty"
+          :value="cp.data.pendingQtyLabel"
           :is-row="false" val-bold val-red/>
       </div>
 
@@ -151,12 +151,23 @@
 
       <lw-input
         :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.kuptounl','库位')"
-        v-model="cp.form.loc.value" :get-focus.sync="cp.form.loc.focus"
-        @confirm="cp.form.lpn.focus = true" required :show-bottom-border="false"/>
+        v-model="cp.form.loc.value"
+        :get-focus.sync="cp.form.loc.focus"
+        @confirm="cp.form.lpn.focus = true"
+        required
+        :show-bottom-border="false"
+        rule-key="loc"
+        :create-rule="$lwScanRule.create('完成加工-库位','LOCATION')"
+      />
       <lw-input
         :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.ojsdgyzw','LPN')"
-        v-model="cp.form.lpn.value" :get-focus.sync="cp.form.lpn.focus"
-        @confirm="cp.form.qty.focus = true" :show-bottom-border="false"/>
+        v-model="cp.form.lpn.value"
+        :get-focus.sync="cp.form.lpn.focus"
+        @confirm="cp.form.qty.focus = true"
+        :show-bottom-border="false"
+        rule-key="lpn"
+        :create-rule="$lwScanRule.create('完成加工-LPN','LPN')"
+      />
       <lw-input
         :title="$lwLanguage.get('wms_project.pda.components.page.process.process.components.FinishView.kantbvvl','数量')"
         required v-model="cp.form.qty.value" :get-focus.sync="cp.form.qty.focus"