库存日志

sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java

@@ -274,7 +274,7 @@ public class LogAspect
                     bmStorageLogList.add(bmStorageLog);
                 }
             }
-            // 新购验收任务
+            // 新购验收任务,暂时未加"新购配件入库审核"相关日志 PurchaseAccessoryController.checkInput
             if (joinPoint.getArgs()[0] instanceof MaInputVO) {
                 MaInputVO maInputVO = (MaInputVO) joinPoint.getArgs()[0];
                 for (MaInputRecord maInputRecord : maInputVO.getInputRecordList()) {

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java

@@ -31,6 +31,10 @@ public class PurchasePartDetails extends BaseEntity
     @ApiModelProperty(value = "规格id")
     private Long partId;
 
+    /** 实时库存 */
+    @ApiModelProperty(value = "实时库存")
+    private BigDecimal num;
+
     /** 规格id */
     @ApiModelProperty(value = "规格id")
     private Long typeId;
@@ -194,6 +198,14 @@ public class PurchasePartDetails extends BaseEntity
         this.partId = partId;
     }
 
+    public BigDecimal getNum() {
+        return num;
+    }
+
+    public void setNum(BigDecimal num) {
+        this.num = num;
+    }
+
     public void setPurchasePrice(String purchasePrice)
     {
         this.purchasePrice = purchasePrice;

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml

@@ -310,6 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPutinDetails" resultType="com.bonus.sgzb.material.domain.PurchasePartDetails">
         SELECT pcd.id,
         mt.pa_id as partId,
+        mt.num as num,
         mt1.pa_id as modelId,
         mt.pa_name specificationType,
         mt1.pa_name typeName,

sgzb-ui/src/views/inventoryLogs/index.vue

@@ -41,7 +41,9 @@
       <el-table-column show-overflow-tooltip align="center" prop="preStoreNum" label="操作前库存" />
       <el-table-column show-overflow-tooltip align="center" prop="inNum" label="入库数量" />
       <el-table-column show-overflow-tooltip align="center" prop="outNum" label="出库数量" />
-      <el-table-column show-overflow-tooltip align="center" prop="backNum" label="退库数量" />
+      <el-table-column show-overflow-tooltip align="center" prop="passNum" label="(退库)合格数量" />
+      <el-table-column show-overflow-tooltip align="center" prop="maintenanceNum" label="(退库)维修数量" />
+      <el-table-column show-overflow-tooltip align="center" prop="scrapNum" label="(退库)报废数量" />
 <!--      <el-table-column show-overflow-tooltip align="center" prop="description" label="描述" />-->
       <el-table-column show-overflow-tooltip align="center" prop="postStoreNum" label="操作后库存" />
       <el-table-column show-overflow-tooltip align="center" prop="createTime" label="日期" />
@@ -120,10 +122,10 @@ export default {
         { label: '操作前库存', content: 'preStoreNum' },
         { label: '入库数量', content: 'inNum' },
         { label: '出库数量', content: 'outNum' },
-        { label: '退库数量', content: 'backNum' },
+        { label: '(退库)总数量', content: 'backNum' },
-        { label: '合格数量', content: 'passNum' },
+        { label: '(退库)合格数量', content: 'passNum' },
-        { label: '维修数量', content: 'maintenanceNum' },
+        { label: '(退库)维修数量', content: 'maintenanceNum' },
-        { label: '报废数量', content: 'scrapNum' },
+        { label: '(退库)报废数量', content: 'scrapNum' },
         { label: '操作后库存', content: 'postStoreNum' },
         { label: '请求地址', content: 'method' },
       ],