【admin】优化#1、优化出入库管理、调拨管理的备件信息

admin/src/main/java/com/hcy/admin/service/sparePartAllot/impl/SpareParAllotServiceImpl.java

@@ -11,10 +11,12 @@ import com.hcy.admin.vo.SparePartOutWarehouseListVo.SparePartOutWarehouseListVo;
 import com.hcy.admin.vo.sparePartAllotListVo.SparePartAllotListVo;
 import com.hcy.common.core.PageResult;
 import com.hcy.common.entity.SparePartAudit.SparePartAudit;
+import com.hcy.common.entity.sparePart.SparePart;
 import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
 import com.hcy.common.entity.warehouse.Warehouse;
 import com.hcy.common.enums.Audit.AuditStateEnum;
 import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
+import com.hcy.common.mapper.sparePart.SparePartMapper;
 import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;
 import com.hcy.common.mapper.warehouse.WarehouseMapper;
 import com.hcy.common.utils.TimeUtil;
@@ -24,10 +26,7 @@ import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 备件调拨实现类
@@ -41,6 +40,9 @@ public class SpareParAllotServiceImpl implements ISparePartAllotService {
     @Resource
     SparePartAuditMapper sparePartAuditMapper;
 
+    @Resource
+    SparePartMapper sparePartMapper;
+
     @Resource
     WarehouseMapper warehouseMapper;
 
@@ -73,6 +75,7 @@ public class SpareParAllotServiceImpl implements ISparePartAllotService {
             BeanUtils.copyProperties(item, vo);
             vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
             vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
+            vo.setHandlingTime(TimeUtil.timestampToDate(item.getHandlingTime())); //经办时间
             // 调入仓库名
             Warehouse importWarehouseName = warehouseMapper.selectOne(
                     new QueryWrapper<Warehouse>()
@@ -113,13 +116,6 @@ public class SpareParAllotServiceImpl implements ISparePartAllotService {
         SparePartAllotListVo vo = new SparePartAllotListVo();
         BeanUtils.copyProperties(model, vo);
 
-        //获取待审核备件信息
-        List<SparePartAudit> stockAuditId = sparePartAuditMapper.selectList(
-                new QueryWrapper<SparePartAudit>()
-                        .eq("stock_audit_id", model.getId())
-        );
-        vo.setSparePartAuditList(stockAuditId); // 待入库的备件
-
         // 调入仓库名
         Warehouse importWarehouseName = warehouseMapper.selectOne(
                 new QueryWrapper<Warehouse>()
@@ -135,6 +131,32 @@ public class SpareParAllotServiceImpl implements ISparePartAllotService {
                         .last("limit 1"));
         vo.setExportWarehouseName(exportWarehouseName.getWarehouseName());
 
+        //获取待审核备件信息
+        List<SparePartAudit> stockAuditId = sparePartAuditMapper.selectList(
+                new QueryWrapper<SparePartAudit>()
+                        .eq("stock_audit_id", model.getId())
+                        .eq("is_delete", 0)
+        );
+        //获取备件信息
+        List<SparePartAudit> listVo = new ArrayList<>();
+        for (SparePartAudit sparePartAudit : stockAuditId) {
+            SparePart sparePart = sparePartMapper.selectOne(
+                    new QueryWrapper<SparePart>()
+                            .eq("id", sparePartAudit.getSparePartsId())
+                            .eq("is_delete", 0)
+                            .last("limit 1"));
+
+            SparePartAudit sparePartAudit1 = new SparePartAudit();
+            BeanUtils.copyProperties(sparePart, sparePartAudit1);
+            sparePartAudit1.setId(sparePartAudit.getId());
+            sparePartAudit1.setSparePartsId(sparePart.getId());
+            sparePartAudit1.setStockAuditId(sparePartAudit.getStockAuditId());
+            sparePartAudit1.setCount(sparePartAudit.getCount()); // 调拨数量
+            listVo.add(sparePartAudit1);
+        }
+
+        vo.setSparePartAuditList(listVo); // 待入库的备件
+        vo.setHandlingTime(TimeUtil.timestampToDate(model.getHandlingTime())); //经办时间
         return vo;
     }
 
@@ -164,6 +186,8 @@ public class SpareParAllotServiceImpl implements ISparePartAllotService {
         // 获取当前的用户
         Object username = AdminThreadLocal.get("username");
         model.setResponsiblePerson((String) username);
+        model.setHandlingTime(System.currentTimeMillis() / 1000); //经办时间
+
         // 审核状态
         model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
         //单据类型（0=入库单，1=出库单，2=仓库调拨单）
@@ -173,10 +197,14 @@ public class SpareParAllotServiceImpl implements ISparePartAllotService {
         // 使用StringBuilder来拼接id值
         StringBuilder sb = new StringBuilder();
         for (SparePartAudit sparePartAudit : sparePartAuditList) {
-            sparePartAudit.setStockAuditId(model.getId());
+            SparePartAudit insertSparePartAudit = new SparePartAudit();
-            sparePartAudit.setUpdateTime(System.currentTimeMillis() / 1000);
+            insertSparePartAudit.setSparePartsId(sparePartAudit.getId()); //备件id
-            sparePartAuditMapper.updateById(sparePartAudit);//插入备件审核信息
             sb.append(sparePartAudit.getId()).append(",");
+
+            insertSparePartAudit.setCount(sparePartAudit.getCount()); //备件调拨数量
+            insertSparePartAudit.setStockAuditId(model.getId()); // 出入库审核id
+            insertSparePartAudit.setCreateTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.insert(insertSparePartAudit);//插入备件审核信息
         }
         sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号
         model.setSparePartAuditId(String.valueOf(sb));// 备件审核id
@@ -208,7 +236,26 @@ public class SpareParAllotServiceImpl implements ISparePartAllotService {
         // 使用StringBuilder来拼接id值
         StringBuilder sb = new StringBuilder();
         for (SparePartAudit sparePartAudit : sparePartAuditList) {
+            //将旧备件审核信息删除
+            SparePartAudit delectSparePartAudit = sparePartAuditMapper.selectOne(
+                    new QueryWrapper<SparePartAudit>()
+                            .eq("stock_audit_id", model.getId())
+                            .eq("is_delete", 0)
+                            .last("limit 1"));
+            Assert.notNull(delectSparePartAudit, "数据不存在!");
+            delectSparePartAudit.setIsDelete(1);
+            delectSparePartAudit.setDeleteTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.updateById(delectSparePartAudit);
+
+            //插入新的备件审核信息
+            SparePartAudit insertSparePartAudit = new SparePartAudit();
+            insertSparePartAudit.setSparePartsId(sparePartAudit.getId()); //备件id
             sb.append(sparePartAudit.getId()).append(",");
+
+            insertSparePartAudit.setCount(sparePartAudit.getCount()); //备件调拨数量
+            insertSparePartAudit.setStockAuditId(model.getId()); // 出入库审核id
+            insertSparePartAudit.setUpdateTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.insert(insertSparePartAudit);//插入备件审核信息
         }
         sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号
         model.setSparePartAuditId(String.valueOf(sb));// 备件审核id

admin/src/main/java/com/hcy/admin/service/sparePartAudit/impl/SparePartAuditServiceImpl.java

@@ -123,8 +123,7 @@ public class SparePartAuditServiceImpl implements ISparePartAuditService {
         model.setUnit(sparePartAuditParam.getUnit());
         model.setQuantity(sparePartAuditParam.getQuantity());
         model.setUnitPrice(sparePartAuditParam.getUnitPrice());
-        model.setIntCount(sparePartAuditParam.getIntCount());
+        model.setCount(sparePartAuditParam.getCount());
-        model.setOutCount(sparePartAuditParam.getOutCount());
         model.setCreateTime(System.currentTimeMillis() / 1000);
         sparePartAuditMapper.insert(model);
     }

admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java

@@ -12,11 +12,13 @@ import com.hcy.admin.vo.sparePartStockAudit.SparePartStockAuditDetailVo;
 import com.hcy.common.constant.GlobalConstant;
 import com.hcy.common.core.PageResult;
 import com.hcy.common.entity.SparePartAudit.SparePartAudit;
+import com.hcy.common.entity.sparePart.SparePart;
 import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
 import com.hcy.common.entity.user.User;
 import com.hcy.common.entity.warehouse.Warehouse;
 import com.hcy.common.enums.Audit.AuditStateEnum;
 import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
+import com.hcy.common.mapper.sparePart.SparePartMapper;
 import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;
 import com.hcy.common.mapper.warehouse.WarehouseMapper;
 import com.hcy.common.utils.TimeUtil;
@@ -42,6 +44,9 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
     @Resource
     SparePartAuditMapper sparePartAuditMapper;
 
+    @Resource
+    SparePartMapper sparePartMapper;
+
     @Resource
     WarehouseMapper warehouseMapper;
 
@@ -77,6 +82,7 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
             BeanUtils.copyProperties(item, vo);
             vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
             vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
+            vo.setHandlingTime(TimeUtil.timestampToDate(item.getHandlingTime())); //经办时间
             vo.setSupplierPhone(item.getSupplier() + "/" + item.getPhone());
             //获取仓库名称
             Warehouse warehouse = warehouseMapper.selectOne(
@@ -109,6 +115,7 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
         Assert.notNull(model, "数据不存在");
 
         SparePartInWarehouseListVo vo = new SparePartInWarehouseListVo();
+        //获取仓库名称
         Warehouse warehouse = warehouseMapper.selectOne(
                 new QueryWrapper<Warehouse>()
                         .eq("id", model.getWarehouseId())
@@ -121,9 +128,28 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
         List<SparePartAudit> stockAuditId = sparePartAuditMapper.selectList(
                 new QueryWrapper<SparePartAudit>()
                         .eq("stock_audit_id", model.getId())
+                        .eq("is_delete", 0)
         );
-        vo.setSparePartAuditList(stockAuditId);
+        //获取备件信息
+        List<SparePartAudit> listVo = new ArrayList<>();
+        for (SparePartAudit sparePartAudit : stockAuditId) {
+            SparePart sparePart = sparePartMapper.selectOne(
+                    new QueryWrapper<SparePart>()
+                            .eq("id", sparePartAudit.getSparePartsId())
+                            .eq("is_delete", 0)
+                            .last("limit 1"));
 
+            SparePartAudit sparePartAudit1 = new SparePartAudit();
+            BeanUtils.copyProperties(sparePart, sparePartAudit1);
+            sparePartAudit1.setId(sparePartAudit.getId());
+            sparePartAudit1.setSparePartsId(sparePart.getId());
+            sparePartAudit1.setStockAuditId(sparePartAudit.getStockAuditId());
+            sparePartAudit1.setCount(sparePartAudit.getCount()); // 入库数量
+            listVo.add(sparePartAudit1);
+        }
+
+        vo.setSparePartAuditList(listVo);
+        vo.setHandlingTime(TimeUtil.timestampToDate(model.getHandlingTime())); //经办时间
         return vo;
     }
 
@@ -154,6 +180,7 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
         // 获取当前的用户
         Object username = AdminThreadLocal.get("username");
         model.setResponsiblePerson((String) username);
+        model.setHandlingTime(System.currentTimeMillis() / 1000); //经办时间
         // 审核状态
         model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
         //单据类型（0=入库单，1=出库单，2=仓库调拨单）
@@ -164,10 +191,15 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
         // 使用StringBuilder来拼接id值
         StringBuilder sb = new StringBuilder();
         for (SparePartAudit sparePartAudit : sparePartAuditList) {
-            sparePartAudit.setStockAuditId(model.getId());
+            SparePartAudit insertSparePartAudit = new SparePartAudit();
-            sparePartAudit.setUpdateTime(System.currentTimeMillis() / 1000);
+            insertSparePartAudit.setSparePartsId(sparePartAudit.getId()); //备件id
-            sparePartAuditMapper.updateById(sparePartAudit);//插入备件审核信息
             sb.append(sparePartAudit.getId()).append(",");
+
+            insertSparePartAudit.setCount(sparePartAudit.getCount()); //备件入库数量
+            insertSparePartAudit.setStockAuditId(model.getId()); // 出入库审核id
+            insertSparePartAudit.setCreateTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.insert(insertSparePartAudit);//插入备件审核信息
+
         }
         sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号
         model.setSparePartAuditId(String.valueOf(sb));// 备件审核id
@@ -201,7 +233,26 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
         // 使用StringBuilder来拼接id值
         StringBuilder sb = new StringBuilder();
         for (SparePartAudit sparePartAudit : sparePartAuditList) {
+            //将旧备件审核信息删除
+            SparePartAudit delectSparePartAudit = sparePartAuditMapper.selectOne(
+                    new QueryWrapper<SparePartAudit>()
+                            .eq("stock_audit_id", model.getId())
+                            .eq("is_delete", 0)
+                            .last("limit 1"));
+            Assert.notNull(delectSparePartAudit, "数据不存在!");
+            delectSparePartAudit.setIsDelete(1);
+            delectSparePartAudit.setDeleteTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.updateById(delectSparePartAudit);
+
+            //插入新的备件审核信息
+            SparePartAudit insertSparePartAudit = new SparePartAudit();
+            insertSparePartAudit.setSparePartsId(sparePartAudit.getId()); //备件id
             sb.append(sparePartAudit.getId()).append(",");
+
+            insertSparePartAudit.setCount(sparePartAudit.getCount()); //备件入库数量
+            insertSparePartAudit.setStockAuditId(model.getId()); // 出入库审核id
+            insertSparePartAudit.setUpdateTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.insert(insertSparePartAudit);//插入备件审核信息
         }
         sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号
         model.setSparePartAuditId(String.valueOf(sb));// 备件审核id

admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java

@@ -11,10 +11,12 @@ import com.hcy.admin.vo.SparePartOutWarehouseListVo.SparePartOutWarehouseListVo;
 import com.hcy.admin.vo.sparePartInWarehouse.SparePartInWarehouseListVo;
 import com.hcy.common.core.PageResult;
 import com.hcy.common.entity.SparePartAudit.SparePartAudit;
+import com.hcy.common.entity.sparePart.SparePart;
 import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
 import com.hcy.common.entity.warehouse.Warehouse;
 import com.hcy.common.enums.Audit.AuditStateEnum;
 import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
+import com.hcy.common.mapper.sparePart.SparePartMapper;
 import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;
 import com.hcy.common.mapper.warehouse.WarehouseMapper;
 import com.hcy.common.utils.TimeUtil;
@@ -24,10 +26,7 @@ import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 备件出库实现类
@@ -41,6 +40,9 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
     @Resource
     SparePartAuditMapper sparePartAuditMapper;
 
+    @Resource
+    SparePartMapper sparePartMapper;
+
     @Resource
     WarehouseMapper warehouseMapper;
 
@@ -76,6 +78,7 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
             BeanUtils.copyProperties(item, vo);
             vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
             vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
+            vo.setHandlingTime(TimeUtil.timestampToDate(item.getHandlingTime())); //经办时间
             vo.setConsigneePhone(item.getConsignee() + "/" + item.getPhone());
             Warehouse warehouse = warehouseMapper.selectOne(
                     new QueryWrapper<Warehouse>()
@@ -109,13 +112,6 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
         SparePartOutWarehouseListVo vo = new SparePartOutWarehouseListVo();
         BeanUtils.copyProperties(model, vo);
 
-        //获取待审核备件信息
-        List<SparePartAudit> stockAuditId = sparePartAuditMapper.selectList(
-                new QueryWrapper<SparePartAudit>()
-                        .eq("stock_audit_id", model.getId())
-        );
-        vo.setSparePartAuditList(stockAuditId); // 待入库的备件
-
         Warehouse warehouse = warehouseMapper.selectOne(
                 new QueryWrapper<Warehouse>()
                         .eq("id", model.getWarehouseId())
@@ -123,6 +119,32 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
                         .last("limit 1"));
         vo.setWarehouseName(warehouse.getWarehouseName());
 
+        //获取待审核备件信息
+        List<SparePartAudit> stockAuditId = sparePartAuditMapper.selectList(
+                new QueryWrapper<SparePartAudit>()
+                        .eq("stock_audit_id", model.getId())
+                        .eq("is_delete", 0)
+        );
+        //获取备件信息
+        List<SparePartAudit> listVo = new ArrayList<>();
+        for (SparePartAudit sparePartAudit : stockAuditId) {
+            SparePart sparePart = sparePartMapper.selectOne(
+                    new QueryWrapper<SparePart>()
+                            .eq("id", sparePartAudit.getSparePartsId())
+                            .eq("is_delete", 0)
+                            .last("limit 1"));
+
+            SparePartAudit sparePartAudit1 = new SparePartAudit();
+            BeanUtils.copyProperties(sparePart, sparePartAudit1);
+            sparePartAudit1.setId(sparePartAudit.getId());
+            sparePartAudit1.setSparePartsId(sparePart.getId());
+            sparePartAudit1.setStockAuditId(sparePartAudit.getStockAuditId());
+            sparePartAudit1.setCount(sparePartAudit.getCount()); // 出库数量
+            listVo.add(sparePartAudit1);
+        }
+
+        vo.setSparePartAuditList(listVo);
+        vo.setHandlingTime(TimeUtil.timestampToDate(model.getHandlingTime())); //经办时间
         return vo;
     }
 
@@ -150,9 +172,12 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
         model.setConsignee(sparePartStockAuditParam.getConsignee()); // 收货单位（人员）
         model.setPhone(sparePartStockAuditParam.getPhone()); // 联系电话
         model.setReceiptNumber(generateOrderNumber()); // 单据编号
+
         // 获取当前的用户
         Object username = AdminThreadLocal.get("username");
         model.setResponsiblePerson((String) username);
+        model.setHandlingTime(System.currentTimeMillis() / 1000); //经办时间
+
         // 审核状态
         model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
         //单据类型（0=入库单，1=出库单，2=仓库调拨单）
@@ -162,10 +187,14 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
         // 使用StringBuilder来拼接id值
         StringBuilder sb = new StringBuilder();
         for (SparePartAudit sparePartAudit : sparePartAuditList) {
-            sparePartAudit.setStockAuditId(model.getId());
+            SparePartAudit insertSparePartAudit = new SparePartAudit();
-            sparePartAudit.setUpdateTime(System.currentTimeMillis() / 1000);
+            insertSparePartAudit.setSparePartsId(sparePartAudit.getId()); //备件id
-            sparePartAuditMapper.updateById(sparePartAudit);//插入备件审核信息
             sb.append(sparePartAudit.getId()).append(",");
+
+            insertSparePartAudit.setCount(sparePartAudit.getCount()); //备件出库数量
+            insertSparePartAudit.setStockAuditId(model.getId()); // 出入库审核id
+            insertSparePartAudit.setCreateTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.insert(insertSparePartAudit);//插入备件审核信息
         }
         sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号
         model.setSparePartAuditId(String.valueOf(sb));// 备件审核id
@@ -199,7 +228,26 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
         // 使用StringBuilder来拼接id值
         StringBuilder sb = new StringBuilder();
         for (SparePartAudit sparePartAudit : sparePartAuditList) {
+            //将旧备件审核信息删除
+            SparePartAudit delectSparePartAudit = sparePartAuditMapper.selectOne(
+                    new QueryWrapper<SparePartAudit>()
+                            .eq("stock_audit_id", model.getId())
+                            .eq("is_delete", 0)
+                            .last("limit 1"));
+            Assert.notNull(delectSparePartAudit, "数据不存在!");
+            delectSparePartAudit.setIsDelete(1);
+            delectSparePartAudit.setDeleteTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.updateById(delectSparePartAudit);
+
+            //插入新的备件审核信息
+            SparePartAudit insertSparePartAudit = new SparePartAudit();
+            insertSparePartAudit.setSparePartsId(sparePartAudit.getId()); //备件id
             sb.append(sparePartAudit.getId()).append(",");
+
+            insertSparePartAudit.setCount(sparePartAudit.getCount()); //备件出库数量
+            insertSparePartAudit.setStockAuditId(model.getId()); // 出入库审核id
+            insertSparePartAudit.setUpdateTime(System.currentTimeMillis() / 1000);
+            sparePartAuditMapper.insert(insertSparePartAudit);//插入备件审核信息
         }
         sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号
         model.setSparePartAuditId(String.valueOf(sb));// 备件审核id

admin/src/main/java/com/hcy/admin/validate/SparePartAudit/SparePartAuditParam.java

@@ -52,6 +52,5 @@ public class SparePartAuditParam implements Serializable {
     @NotNull(message = "unitPrice参数缺失", groups = {create.class, update.class})
     private BigDecimal unitPrice;
 
-    private Integer intCount;
+    private Long count;
-    private Integer outCount;
 }

admin/src/main/java/com/hcy/admin/validate/sparePart/SparePartParam.java

@@ -26,8 +26,7 @@ public class SparePartParam implements Serializable {
     public interface update{}
     public interface delete{}
 
-    @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class})
+    private Long id;
-    private Integer id;
 
     @NotNull(message = "sparePartsCode参数缺失", groups = {create.class, update.class})
     @Length(max = 255, message = "sparePartsCode参数不能超出255个字符", groups = {create.class, update.class})

admin/src/main/java/com/hcy/admin/vo/SparePartOutWarehouseListVo/SparePartOutWarehouseListVo.java

@@ -21,7 +21,7 @@ public class SparePartOutWarehouseListVo implements Serializable {
     private String consignee; // 收货单位（人员）
     private String phone; // 联系电话
     private String responsiblePerson; // 经办人
-    private Long handlingTime; // 经办时间
+    private String handlingTime; // 经办时间
     private Integer auditState; // 审核状态（0=未审核，1=已审核，2=已取消）
     private Integer auditResult; // 审核结果（0=未通过，1=已通过）
     private Long auditTime; // 审核时间

admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartDetailVo.java

@@ -13,7 +13,7 @@ public class SparePartDetailVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Integer id; // 主键id
+    private Long id; // 主键id
     private String sparePartsCode; // 备件编码
     private String sparePartsName; // 备件名称
     private Long warehouseId; // 所属仓库

admin/src/main/java/com/hcy/admin/vo/sparePart/SparePartListVo.java

@@ -13,7 +13,7 @@ public class SparePartListVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Integer id; // 主键id
+    private Long id; // 主键id
     private String sparePartsCode; // 备件编码
     private String sparePartsName; // 备件名称
     private Long warehouseId; // 所属仓库

admin/src/main/java/com/hcy/admin/vo/sparePartAllotListVo/SparePartAllotListVo.java

@@ -20,7 +20,7 @@ public class SparePartAllotListVo implements Serializable {
     private Long exportWarehouse; // 调出仓库
     private String remark; // 备注
     private String responsiblePerson; // 经办人
-    private Long handlingTime; // 经办时间
+    private String handlingTime; // 经办时间
     private Integer auditState; // 审核状态（0=未审核，1=已审核，2=已取消）
     private Integer auditResult; // 审核结果（0=未通过，1=已通过）
     private Long auditTime; // 审核时间

admin/src/main/java/com/hcy/admin/vo/sparePartInWarehouse/SparePartInWarehouseListVo.java

@@ -21,7 +21,7 @@ public class SparePartInWarehouseListVo implements Serializable {
     private String supplier; // 供应商
     private String phone; // 联系电话
     private String responsiblePerson; // 经办人
-    private Long handlingTime; // 经办时间
+    private String handlingTime; // 经办时间
     private Integer auditState; // 审核状态（0=未审核，1=已审核，2=已取消）
     private Integer auditResult; // 审核结果（0=未通过，1=已通过）
     private Long auditTime; // 审核时间

common/src/main/java/com/hcy/common/entity/SparePartAudit/SparePartAudit.java

@@ -17,6 +17,7 @@ public class SparePartAudit implements Serializable {
 
     @TableId(value="id", type= IdType.AUTO)
     private Long id; // 主键id
+    private Long sparePartsId; // 备件id
     private Long stockAuditId; // 出入库审核id
     private String sparePartsCode; // 备件编码
     private String sparePartsName; // 备件名称
@@ -29,7 +30,6 @@ public class SparePartAudit implements Serializable {
     private Long createTime; // 创建时间
     private Long updateTime; // 更新时间
     private Long deleteTime; // 删除时间
-    private Integer intCount; // 入库数量
+    private Long count; // 出入库数量
-    private Integer OutCount; // 出库数量
 
 }

common/src/main/java/com/hcy/common/entity/sparePart/SparePart.java

@@ -17,7 +17,7 @@ public class SparePart implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value="id", type= IdType.AUTO)
-    private Integer id; // 主键id
+    private Long id; // 主键id
     private String sparePartsCode; // 备件编码
     private String sparePartsName; // 备件名称
     private Long warehouseId; // 所属仓库