修改物品导出Excle的模板

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java

@@ -67,6 +67,8 @@ public class Reagent extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private List<TypeAndOperation> operationList;
 
-    private long fomulaId;
+    // 公式id
+    private String formulaId;
+
 }
 

lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/GoodsExcel.java

@@ -22,8 +22,8 @@ public class GoodsExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@ColumnWidth(20)
-	private Long  bigClassId;
+//	@ColumnWidth(20)
+//	private Long  bigClassId;
 
 	@ColumnWidth(20)
 	@ExcelProperty("物品大类名称")
@@ -33,8 +33,8 @@ public class GoodsExcel implements Serializable {
 	@ExcelProperty("物品名称")
 	private String name;
 
-	@ColumnWidth(20)
-	private String code;
+//	@ColumnWidth(20)
+//	private String code;
 
 	@ColumnWidth(20)
 	@ExcelProperty("物品型号")
@@ -52,11 +52,12 @@ public class GoodsExcel implements Serializable {
 	@ExcelProperty("物品厂商")
 	private String company;
 
-	@ColumnWidth(20)
-	@ExcelProperty("物品厂商id")
-	private Long companyId;
+//	@ColumnWidth(20)
+//	@ExcelProperty("物品厂商id")
+//	private Long companyId;
 
 	@ColumnWidth(20)
+	@ExcelProperty("物品类型")
 	private String  type;
 
 	@ColumnWidth(20)
@@ -80,13 +81,14 @@ public class GoodsExcel implements Serializable {
 	private Integer danger;
 
 	@ColumnWidth(20)
+	@ExcelProperty("预警数量")
 	private Integer warnNum;
 
-	@ColumnWidth(20)
-	private Date warnTime;
+//	@ColumnWidth(20)
+//	private Date warnTime;
 
-	@ColumnWidth(20)
-	private Integer deactivate;
+//	@ColumnWidth(20)
+//	private Integer deactivate;
 
 	@ColumnWidth(20)
 	@ExcelProperty("过期时间")

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java

@@ -292,7 +292,7 @@ public class GoodsController extends BladeController {
      * 入库详情
      */
     @GetMapping("inDetail")
-    public R<IPage> inDetail(Goods goods, Query query) {
+    public R<IPage<ProductStoreDetial>> inDetail(Goods goods, Query query) {
         LambdaQueryWrapper<ProductStoreDetial> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProductStoreDetial::getGoodsId, goods.getId());
         if (goods.getStatus() != null) {
@@ -593,7 +593,7 @@ public class GoodsController extends BladeController {
      * 出入库记录查询
      */
     @GetMapping("/inAndOutRecord")
-    public R<IPage> inAndOutRecord(String id, Query query, String type, Date startTime, Date endTime) {
+    public R<IPage<InAndOutRecord>> inAndOutRecord(String id, Query query, String type, Date startTime, Date endTime) {
         List<InAndOutRecord> inAndOutRecordList = new ArrayList<>();
 
         // 物品出库信息
@@ -645,7 +645,9 @@ public class GoodsController extends BladeController {
         page.setCurrent(query.getCurrent());
         page.setSize(query.getSize());
         page.setTotal(inAndOutRecords.size());
-        page.setPages((inAndOutRecords.size() / query.getSize()) + 1);
+        if (query.getSize() != null && query.getSize() > 0) {
+            page.setPages((inAndOutRecords.size() / query.getSize()) + 1);
+        }
         return R.data(page);
     }