库存管理

ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java

@@ -26,14 +26,15 @@ public class BasStockFreezeRecord extends BaseEntity
     private String stockId;
 
     /** 货位编码 */
-    @Excel(name = "${stock.Freeze.cargoSpaceId}")
+    @Excel(name = "货位编码")
     private String cargoSpaceId;
+
     /** 货位名称 */
-    @Excel(name = "${stock.Freeze.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 托盘条码 */
-    @Excel(name = "${stock.Freeze.trayCode}")
+//    @Excel(name = "${stock.Freeze.trayCode}")
     private String trayCode;
 
     /** 物品编码 */
@@ -53,11 +54,11 @@ public class BasStockFreezeRecord extends BaseEntity
     private String lotNo;
 
     /** 初始状态 */
-    @Excel(name = "${stock.Freeze.oldStatus}",dictType="stock_status")
+    @Excel(name = "原库位状态",dictType="stock_status")
     private String oldStatus;
 
     /** 更改状态 */
-    @Excel(name = "${stock.Freeze.currStatus}",dictType="stock_status")
+    @Excel(name = "现库位状态",dictType="stock_status")
     private String currStatus;
 
     /** 操作 */
@@ -65,7 +66,7 @@ public class BasStockFreezeRecord extends BaseEntity
     private String method;
 
     /** 仓库 */
-    @Excel(name = "${stock.Freeze.warehouseId}")
+//    @Excel(name = "${stock.Freeze.warehouseId}")
     private String warehouseName;
 
     private String warehouseId;
@@ -90,7 +91,7 @@ public class BasStockFreezeRecord extends BaseEntity
 //    @Excel(name = "${stock.Freeze.productGuid}")
     private String productGuid;
 //    创建时间
-    @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 

ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java

@@ -23,54 +23,60 @@ public class BasStockMaintainRecord extends BaseEntity
     private String whGuid;
 
     /** 库存编码 */
-    @Excel(name = "${stock.Maintain.stockId}")
+    @Excel(name = "库存编码")
     private String stockId;
 
+    /** 批号 */
+    @Excel(name = "初始货位编码")
+    private String lotNo;
+
     /** 货位编码 */
-    @Excel(name = "${stock.Maintain.cargoSpaceId}")
+    @Excel(name = "操作后货位编码")
     private String cargoSpaceId;
     /** 货位名称 */
-    @Excel(name = "${stock.Maintain.cargoSpaceName}")
+    @Excel(name = "操作后货位名称")
     private String cargoSpaceName;
 
     /** 托盘条码 */
-    @Excel(name = "${stock.Maintain.trayCode}")
+    @Excel(name = "托盘条码")
     private String trayCode;
 
+    /** 物料guid */
+    @Excel(name = "初始物品名称")
+    private String productGuid;
+
     /** 物品编码 */
-    @Excel(name = "${stock.Maintain.productId}")
+    @Excel(name = "操作后物品编码")
     private String productId;
 
     /** 物品名称 */
-    @Excel(name = "${stock.Maintain.productName}")
+    @Excel(name = "操作后物品名称")
     private String productName;
 
     /** 生产日期 */
 //    @Excel(name = "${stock.Maintain.printDate}")
     private String printDate;
 
-    /** 批号 */
+
-//    @Excel(name = "${stock.Maintain.lotNo}")
-    private String lotNo;
 
     /** 初始数量 */
-    @Excel(name = "${stock.Maintain.oldQuantity}")
+    @Excel(name = "初始数量")
     private String oldQuantity;
 
     /** 操作后数量 */
-    @Excel(name = "${stock.Maintain.quantity}")
+    @Excel(name = "操作后数量")
     private String quantity;
 
     /** 操作 */
-    @Excel(name = "${stock.Maintain.method}", dictType="stock_maintain_method")
+    @Excel(name = "操作", dictType="stock_maintain_method")
     private String method;
 
     /** 仓库 */
-    @Excel(name = "${stock.Maintain.warehouseId}")
+    @Excel(name = "仓库")
     private String warehouseName;
     private String warehouseId;
 
-    @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
@@ -100,9 +106,7 @@ public class BasStockMaintainRecord extends BaseEntity
 //    @Excel(name = "${stock.Maintain.barCodeQuantity}")
     private String barCodeQuantity;
 
-    /** 物料guid */
+
-//    @Excel(name = "${stock.Maintain.productGuid}")
-    private String productGuid;
 
 
     public String getWarehouseName() {

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java

@@ -29,67 +29,119 @@ public class BasStock extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 库存id */
-    @Excel(name = "${stock.BasStock.stockId}")
+    @Excel(name = "库存编码")
     private String stockId;
 
-    /** 货位id */
-    @Excel(name = "${stock.BasStock.cargoSpaceId}")
-    private String cargoSpaceId;
     /** 货位名称 */
-    @Excel(name = "${stock.BasStock.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 库存状态 */
-    @Excel(name = "${stock.BasStock.stockStatus}", dictType = "stock_status")
+    @Excel(name = "库存状态", dictType = "stock_status")
     private String stockStatus;
+
+    /** 品号 */
+    @Excel(name = "物料编码")
+    private String productId;
+
+    @Excel(name = "物料名称")
+    private String productName;
+
+    /** 批次号 */
+    @Excel(name = "批次号")
+    private String lotNo;
+
+    /** 入库时间 */
+    @Excel(name = "入库时间")
+    private String inDate;
+
+    /** 库存数量 */
+    @Excel(name = "数量")
+    private String quantity;
+
+    /** 作业ID */
+    @Excel(name = "作业ID")
+    private String jobId;
+
+    /** 出库数量 */
+    @Excel(name = "出库数量")
+    private String outQuantity;
+
+    /** 入库主单 */
+    @Excel(name = "入库单ID")
+    private String stockinId;
+
+    /** 入库子单id */
+    @Excel(name = "入库子单ID")
+    private String stockinDetailId;
+
+    //物料英文描述
+    @Excel(name = "层级关系")
+    private String spare1;
+
+    //净重
+    @Excel(name = "上层物料")
+    private String spare2;
+
+    /** 备用字段3 */
+    @Excel(name = "顶层物料")
+    private String spare3;
+
+    /** 备用字段4 */
+    @Excel(name = "项目号")
+    private String spare4;
+
+    //长度
+    @Excel(name = "合同号")
+    private String spare5;
+
+    //宽度
+    @Excel(name = "销售订单")
+    private String spare6;
+
+    @Excel(name = "供应商编码")
+    private String voltage;
+
+    @Excel(name = "规格型号")
+    private String power;
+
+    @Excel(name = "计量单位")
+    private String phase;
+
+
+    //额外字段
+//    @Excels({
+//            @Excel(name = "物料编码", targetAttr = "productId"),// 品号
+//            @Excel(name = "物料名称", targetAttr = "materialDesc"),// 品名
+//            @Excel(name = "${stock.BasStock.englishDesc}", targetAttr = "englishDesc"),//物料英文描述
+//            @Excel(name = "${stock.BasStock.netWeight}", targetAttr = "netWeight"),//净重
+//            @Excel(name = "${stock.BasStock.length}",targetAttr = "length"),//长度
+//            @Excel(name = "${stock.BasStock.width}",targetAttr = "width"),//宽度
+//            @Excel(name = "${stock.BasStock.height}",targetAttr = "height"),//高度
+//            @Excel(name = "${stock.BasStock.volume}",targetAttr = "volume")//体积
+//    })
+
+    /** 货位id */
+//    @Excel(name = "货位ID")
+    private String cargoSpaceId;
+
     //货位库存状态
-    @Excel(name = "${stock.BasStock.cargoSpaceStockStatus}", dictType = "cargo_space_status")
+//    @Excel(name = "货位库存状态", dictType = "cargo_space_status")
     private String cargoSpaceStockStatus;
     //货位是否锁定
-    @Excel(name = "${stock.BasStock.cargoSpaceStatus}", dictType = "cargo_space_lock_status")
+//    @Excel(name = "是否锁定", dictType = "cargo_space_lock_status")
     private String cargoSpaceStatus;
 
     /** 物料状态 */
-    @Excel(name = "${stock.BasStock.productStatus}", dictType = "product_status")
+//    @Excel(name = "物料状态", dictType = "product_status")
     private String productStatus;
 
-    //额外字段
-    @Excels({
-            @Excel(name = "${stock.BasStock.productId}", targetAttr = "productId"),// 品号
-            @Excel(name = "${stock.BasStock.materialDesc}", targetAttr = "materialDesc"),// 品名
-            @Excel(name = "${stock.BasStock.englishDesc}", targetAttr = "englishDesc"),//物料英文描述
-            @Excel(name = "${stock.BasStock.netWeight}", targetAttr = "netWeight"),//净重
-            @Excel(name = "${stock.BasStock.length}",targetAttr = "length"),//长度
-            @Excel(name = "${stock.BasStock.width}",targetAttr = "width"),//宽度
-            @Excel(name = "${stock.BasStock.height}",targetAttr = "height"),//高度
-            @Excel(name = "${stock.BasStock.volume}",targetAttr = "volume")//体积
-    })
     private ExtraField extraField;
 
-    /** 品号 */
-//    @Excel(name = "${stock.BasStock.productId}")
-    private String productId;
-
     //品名
 //    @Excel(name = "${stock.BasStock.materialDesc}")
     private String materialDesc;
 
-    //物料英文描述
-//    @Excel(name = "${stock.BasStock.englishDesc}")
-    private String spare1;
-
-    //净重
-//    @Excel(name = "${stock.BasStock.netWeight}")
-    private String spare2;
-
-    //长度
-//    @Excel(name = "${stock.BasStock.length}")
-    private String spare5;
-
-    //宽度
-//    @Excel(name = "${stock.BasStock.width}")
-    private String spare6;
-
     //高度
 //    @Excel(name = "${stock.BasStock.height}")
     private String spare7;
@@ -97,52 +149,24 @@ public class BasStock extends BaseEntity
     //体积
 //    @Excel(name = "${stock.BasStock.volume}")
     private String spare8;
-
-    private String voltage;
-    private String power;
-    private String phase;
     private String netWeight;
     private String grossWeight;
     private String distribution;
     private String model;
     private String orderId;
 
-    /** 库存数量 */
-    @Excel(name = "${stock.BasStock.quantity}")
-    private String quantity;
-
-    /** 作业ID */
-    @Excel(name = "${stock.BasStock.jobId}")
-    private String jobId;
-
     /** 托盘条码 */
-    @Excel(name = "${stock.BasStock.trayCode}")
+//    @Excel(name = "${stock.BasStock.trayCode}")
     private String trayCode;
 
-    /** 入库主单 */
-    @Excel(name = "${stock.BasStock.stockinId}")
-    private String stockinId;
-
-    /** 入库子单id */
-    @Excel(name = "${stock.BasStock.stockinDetailId}")
-    private String stockinDetailId;
-
     /** 入库类型 */
-    @Excel(name = "${stock.BasStock.inType}")
+//    @Excel(name = "${stock.BasStock.inType}")
     private String inType;
 
     /** 仓库名称 */
-    @Excel(name = "${stock.BasStock.warehouseName}")
+//    @Excel(name = "${stock.BasStock.warehouseName}")
     private String warehouseName;
 
-    /** 入库时间 */
-    @Excel(name = "${stock.BasStock.inDate}")
-    private String inDate;
-
-    /** 批次号 */
-//     @Excel(name = "${stock.BasStock.lotNo}")
-    private String lotNo;
-
     /** 回流时间 */
 //     @Excel(name = "${stock.BasStock.backDate}")
     private String backDate;
@@ -151,9 +175,7 @@ public class BasStock extends BaseEntity
 //     @Excel(name = "${stock.BasStock.productGuid}")
     private String productGuid;
 
-    /** 出库数量 */
+
-//     @Excel(name = "${stock.BasStock.outQuantity}")
-    private String outQuantity;
 
     /** 入库班组ID */
 //     @Excel(name = "${stock.BasStock.inClassId}")
@@ -168,19 +190,6 @@ public class BasStock extends BaseEntity
 //     @Excel(name = "${stock.BasStock.stackingId}")
     private String stackingId;
 
-    /** 备用字段3 */
-//     @Excel(name = "${stock.BasStock.spare3}")
-    private String spare3;
-
-    /** 备用字段4 */
-//     @Excel(name = "${stock.BasStock.spare4}")
-    private String spare4;
-
-
-    //品名
-//    @Excel(name = "品名")
-    private String productName;
-
     private List<String> typeData;
 
 

ruoyi-ui/src/views/stock/freeze/index.vue

@@ -55,8 +55,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="freezeList" @selection-change="handleSelectionChange" max-height="650">
+    <el-table v-loading="loading" :data="freezeList"  max-height="650">
-      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
 <!--      <el-table-column label="库存编码" align="center" prop="stockId" /> &lt;!&ndash; 库存编码 &ndash;&gt;-->
       <el-table-column label="货位编码" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
       <el-table-column label="货位名称" align="left" prop="cargoSpaceName" /> <!-- 货位名称 -->

ruoyi-ui/src/views/stock/management/index.vue

@@ -100,34 +100,34 @@
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" align="center" />
-      <el-table-column label="库存编码" align="center" prop="stockId" width="160" sortable/>
+      <el-table-column label="库存编码" align="left" prop="stockId" width="180" sortable/>
-      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="160"/>
+      <el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="180"/>
-      <el-table-column label="库存状态" align="center" prop="stockStatus" >
+      <el-table-column width="180" label="库存状态" align="center" prop="stockStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="存货编码" align="center" prop="productId" />
+      <el-table-column width="180"  label="物料编码" align="left" prop="productId" />
-      <el-table-column label="存货名称" align="center" prop="productName" width="160"/>
+      <el-table-column width="180"  label="物料名称" align="left" prop="productName" />
-      <el-table-column label="批次号" align="center" prop="lotNo"  width="160"/>
+      <el-table-column width="180"  label="批次号" align="left" prop="lotNo"  />
 <!--      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
-      <el-table-column label="入库时间" align="center" prop="inDate" width="160" sortable/>
+      <el-table-column width="180" label="入库时间" align="left" prop="inDate"  sortable/>
-      <el-table-column label="数量" align="center" prop="quantity" sortable/>
+      <el-table-column width="100" label="数量" align="left" prop="quantity" sortable/>
-      <el-table-column label="作业编码" align="center" prop="jobId" width="160" sortable/>
+      <el-table-column width="180" label="作业ID" align="left" prop="jobId"  sortable/>
-      <el-table-column label="出库数量" align="center" prop="outQuantity" />
+      <el-table-column width="180" label="出库数量" align="left" prop="outQuantity" />
-      <el-table-column label="入库子单号" align="center" prop="stockinDetailId" width="160" sortable/>
+      <el-table-column width="180" label="入库单ID" align="left" prop="stockinId"  sortable/>
-      <el-table-column label="入库单号" align="center" prop="stockinId" width="160" sortable/>
+      <el-table-column width="180" label="入库子单ID" align="left" prop="stockinDetailId" sortable/>
 <!--      <el-table-column label="入库类型" align="center" prop="inType" />-->
 <!--      <el-table-column label="仓库编码" align="center" prop="warehouseId" />-->
-      <el-table-column label="层级关系" align="center" prop="spare1" />
+      <el-table-column width="180" label="层级关系" align="left" prop="spare1" />
-      <el-table-column label="层级关系" align="center" prop="spare2" />
+      <el-table-column width="180" label="上层物料" align="left" prop="spare2" />
-      <el-table-column label="顶层物料" align="center" prop="spare3" />
+      <el-table-column width="180" label="顶层物料" align="left" prop="spare3" />
-      <el-table-column label="项目号" align="center" prop="spare4" />
+      <el-table-column width="180" label="项目号" align="left" prop="spare4" />
-      <el-table-column label="合同号" align="center" prop="spare5" />
+      <el-table-column width="180" label="合同号" align="left" prop="spare5" />
-      <el-table-column label="销售订单" align="center" prop="spare6" />
+      <el-table-column width="180" label="销售订单" align="left" prop="spare6" />
-      <el-table-column label="供应商编码" align="center" prop="voltage" />
+      <el-table-column width="180" label="供应商编码" align="left" prop="voltage" />
-      <el-table-column label="规格型号" align="center" prop="power" />
+      <el-table-column width="180" label="规格型号" align="left" prop="power" />
-      <el-table-column label="计量单位" align="center" prop="phase" />
+      <el-table-column width="180" label="计量单位" align="left" prop="phase" />
 <!--      <el-table-column label="净重" align="center" prop="netWeight" />-->
       <el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
         <template slot-scope="scope">

ruoyi-ui/src/views/stock/record/index.vue

@@ -82,25 +82,25 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange" max-height="650">
+    <el-table v-loading="loading" :data="recordList"  max-height="650">
-      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="库存编码" align="left" prop="stockId" /> <!-- 库存编码 -->
+      <el-table-column width="180" label="库存编码" align="left" prop="stockId" /> <!-- 库存编码 -->
-      <el-table-column label="初始货位编码" align="left" prop="lotNo" /> <!-- 库存编码 -->
+      <el-table-column width="180" label="初始货位编码" align="left" prop="lotNo" /> <!-- 库存编码 -->
-      <el-table-column label="操作后货位编码" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
+      <el-table-column width="180" label="操作后货位编码" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
-      <el-table-column label="操作后货位名称" align="left" prop="cargoSpaceName" /> <!-- 货位编码 -->
+      <el-table-column width="180" label="操作后货位名称" align="left" prop="cargoSpaceName" /> <!-- 货位编码 -->
-      <el-table-column label="托盘条码" align="left" prop="trayCode" /> <!-- 托盘条码 -->
+      <el-table-column width="180" label="托盘条码" align="left" prop="trayCode" /> <!-- 托盘条码 -->
-      <el-table-column label="初始物品名称" align="left" prop="productGuid" /> <!-- 托盘条码 -->
+      <el-table-column width="180" label="初始物品名称" align="left" prop="productGuid" /> <!-- 托盘条码 -->
-      <el-table-column label="操作后物品编码" align="left" prop="productId" /> <!-- 物品编码 -->
+      <el-table-column width="180" label="操作后物品编码" align="left" prop="productId" /> <!-- 物品编码 -->
-      <el-table-column label="操作后物品名称" align="left" prop="productName" /> <!-- 物品名称 -->
+      <el-table-column width="180" label="操作后物品名称" align="left" prop="productName" /> <!-- 物品名称 -->
-      <el-table-column label="初始数量" align="right" prop="oldQuantity" /> <!-- 初始数量 -->
+      <el-table-column width="180" label="初始数量" align="left" prop="oldQuantity" /> <!-- 初始数量 -->
-      <el-table-column label="操作后数量" align="right" prop="quantity" /> <!-- 操作后数量 -->
+      <el-table-column width="180" label="操作后数量" align="left" prop="quantity" /> <!-- 操作后数量 -->
-      <el-table-column label="操作" align="left" prop="method"> <!-- 操作 -->
+      <el-table-column width="180" label="操作" align="left" prop="method"> <!-- 操作 -->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.stock_maintain_method" :value="scope.row.method"/>
         </template>
       </el-table-column>
-      <el-table-column label="仓库" align="left" prop="warehouseName" /> <!-- 仓库 -->
+      <el-table-column width="180" label="仓库" align="left" prop="warehouseName" /> <!-- 仓库 -->
-      <el-table-column label="创建时间" align="left" prop="createTime" /> <!-- 创建时间 -->
+      <el-table-column width="180" label="创建时间" align="left" prop="createTime" /> <!-- 创建时间 -->
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->