Merge remote-tracking branch 'origin/yonghu' into yonghu

ruoyi-ui/src/views/ams/inv/invLotLocId/index.vue

@@ -56,10 +56,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="分配出库单" prop="lotatt15">
+      <el-form-item label="已分配出库单号" prop="lotatt15">
         <el-input
           v-model="queryParams.lotatt15"
-          placeholder="请输入分配出库单"
+          placeholder="请输入已分配出库单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"

ruoyi-ui/src/views/wms/barcodesinv/index.vue

@@ -105,7 +105,6 @@
 <!--         >导出</el-button>-->
 <!--       </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
     <el-table v-loading="loading" :data="barcodesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -134,7 +133,7 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -209,7 +208,6 @@ export default {
         lotnum: null,
         qty: null,
         lotatt02: null,
-        stockId: null,
         type: null,
         erpNo: null,
         erpName: null,

ruoyi-ui/src/views/wms/skuinv/index.vue

@@ -118,7 +118,7 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

warewms-ams/src/main/java/com/ruoyi/ams/order/erp/ErpBarCodesVO.java

@@ -14,4 +14,5 @@ public class ErpBarCodesVO {
     private String sku;         //产品
     private String skuType;     //产品类型
     private String barcode;     //ERP品号
-}
+    private String lotnum;      //批次号
+}