diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java index 2b54f51..ec5d8b1 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java @@ -126,4 +126,18 @@ public class Goods extends BaseEntity { @ApiModelProperty(value = "库存下限") private Integer warnNumLower; + + //质检状态 + @TableField(exist = false) + private String qualityStatus; + + @TableField(exist = false) + private String statusStr; + + //是否停用 + @TableField(exist = false) + private String deactivateStr; + + @TableField(exist = false) + private String unitStr; } diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/Excel/InstrumentExcel.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/Excel/InstrumentExcel.java index 91fbabc..e23899d 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/Excel/InstrumentExcel.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/Excel/InstrumentExcel.java @@ -58,7 +58,7 @@ public class InstrumentExcel implements Serializable { @ExcelProperty("报废年限") private Integer scrapYears; - @ExcelProperty("状态（正常、维修中、报废申请中、已报废）") + @ExcelProperty("状态（正常）") private String instrumentStatus; @ExcelProperty("额定功率") diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/ApplyDetailExcel.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/ApplyDetailExcel.java index 8ed93dc..0a0a445 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/ApplyDetailExcel.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/ApplyDetailExcel.java @@ -45,6 +45,10 @@ public class ApplyDetailExcel implements Serializable { @ExcelProperty("申领人") private String applyUser; + @ColumnWidth(20) + @ExcelProperty("申领状态") + private String status; + @ColumnWidth(20) @ExcelProperty("备注") private String remark; @@ -53,4 +57,5 @@ public class ApplyDetailExcel implements Serializable { @ExcelProperty("申领时间") private Date applyTime; + } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/GoodsExcel.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/GoodsExcel.java index b465fca..92315aa 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/GoodsExcel.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/excel/GoodsExcel.java @@ -5,11 +5,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * UserExcel @@ -22,19 +20,21 @@ public class GoodsExcel implements Serializable { private static final long serialVersionUID = 1L; -// @ColumnWidth(20) -// private Long bigClassId; + @ColumnWidth(20) + @ExcelProperty("物品名称") + private String name; @ColumnWidth(20) - @ExcelProperty("物品大类名称") - private String bigClass; + @ExcelProperty("供应商") + private String company; @ColumnWidth(20) - @ExcelProperty("物品名称") - private String name; + @ExcelProperty("品牌") + private String brand; -// @ColumnWidth(20) -// private String code; + @ColumnWidth(20) + @ExcelProperty("物品大类") + private String bigClass; @ColumnWidth(20) @ExcelProperty("物品型号") @@ -45,52 +45,31 @@ public class GoodsExcel implements Serializable { private String rule; @ColumnWidth(20) - @ExcelProperty("库存") - private Integer num; + @ExcelProperty("存放地点") + private String location; @ColumnWidth(20) - @ExcelProperty("物品厂商") - private String company; - -// @ColumnWidth(20) -// @ExcelProperty("物品厂商id") -// private Long companyId; + @ExcelProperty("是否已确认") + private String statusStr; @ColumnWidth(20) - @ExcelProperty("物品类型") - private String type; + @ExcelProperty("状态") + private String deactivateStr; @ColumnWidth(20) - @ExcelProperty("单位") - private String unit; + @ExcelProperty("物品质检状态") + private String qualityStatus; @ColumnWidth(20) - @ExcelProperty("存放地点") - private String location; + @ExcelProperty("库存") + private Integer num; @ColumnWidth(20) - @ExcelProperty("存储方式") - private String ccfs; + @ExcelProperty("计量单位") + private String unit; @ColumnWidth(20) @ExcelProperty("用途") private String yt; - @ColumnWidth(20) - @ExcelProperty("是否危险品") - private Integer danger; - - @ColumnWidth(20) - @ExcelProperty("预警数量") - private Integer warnNum; - -// @ColumnWidth(20) -// private Date warnTime; - -// @ColumnWidth(20) -// private Integer deactivate; - - @ColumnWidth(20) - @ExcelProperty("过期时间") - private Date beyondTime; } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java index e22c82f..529716c 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java @@ -112,45 +112,56 @@ public class ApplyController extends BladeController { public Map getEveryStatusAndCount(String isGetAll) { Map map = new HashMap<>(6); QueryWrapper queryWrapper = new QueryWrapper<>(); + List roles = Arrays.asList(AuthUtil.getUserRole().split(",")); + List deptIds = new ArrayList<>(); + boolean flag = false; + if(!roles.contains("admin") && !roles.contains("政府")){ + flag = true; + List depts = SysCache.getDeptChild(Long.parseLong(AuthUtil.getDeptId())); + if(CollectionUtils.isNotEmpty(depts)){ + deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList()); + } + deptIds.add(Long.parseLong(AuthUtil.getDeptId())); + } // 驳回 queryWrapper.eq("status", -1); - if (!"1".equals(isGetAll)) { - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (flag) { + queryWrapper.in("create_dept",deptIds); } map.put("bh", applyService.count(queryWrapper)); queryWrapper.clear(); // 待审核 queryWrapper.eq("status", 0); - if (!"1".equals(isGetAll)) { - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (flag) { + queryWrapper.in("create_dept",deptIds); } map.put("dsh", applyService.count(queryWrapper)); queryWrapper.clear(); // 待出库 queryWrapper.eq("status", 1); - if (!"1".equals(isGetAll)) { - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (flag) { + queryWrapper.in("create_dept",deptIds); } map.put("dck", applyService.count(queryWrapper)); queryWrapper.clear(); // 待确定 queryWrapper.eq("status", 2); - if (!"1".equals(isGetAll)) { - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (flag) { + queryWrapper.in("create_dept",deptIds); } map.put("dqd", applyService.count(queryWrapper)); queryWrapper.clear(); // 待归还 queryWrapper.eq("status", 3); - if (!"1".equals(isGetAll)) { - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (flag) { + queryWrapper.in("create_dept",deptIds); } map.put("dgh", applyService.count(queryWrapper)); queryWrapper.clear(); // 申领完成 queryWrapper.eq("status", 4); - if (!"1".equals(isGetAll)) { - queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + if (flag) { + queryWrapper.in("create_dept",deptIds); } map.put("slwc", applyService.count(queryWrapper)); queryWrapper.clear(); @@ -282,6 +293,13 @@ public class ApplyController extends BladeController { goods.setNum(goods.getNum() + applyDetail.getApplyNum()); goodsService.updateById(goods); } + String[] strings = applyDetail.getBatchNum().split(":"); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(ProductStoreDetial::getPNum,strings[0]); + wrapper1.eq(ProductStoreDetial::getGoodsId,goods.getId()); + ProductStoreDetial productStoreDetial = productStoreDetialService.getOne(wrapper1); + productStoreDetial.setNum(productStoreDetial.getNum() + Integer.parseInt(strings[1])); + productStoreDetialService.updateById(productStoreDetial); } } } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java index a7bfbc4..c233d3e 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java @@ -97,6 +97,19 @@ public class ApplyDetailController extends BladeController { excel.setApplyNum(detail.getApplyNum()); excel.setXh(detail.getXh()); excel.setRule(detail.getRule()); + if(detail.getStatus() == -1){ + excel.setStatus("驳回"); + }else if(detail.getStatus() == 0){ + excel.setStatus("待审批"); + }else if(detail.getStatus() == 1){ + excel.setStatus("待出库"); + }else if(detail.getStatus() == 2){ + excel.setStatus("待确认"); + }else if(detail.getStatus() == 3){ + excel.setStatus("待归还"); + }else if(detail.getStatus() == 4){ + excel.setStatus("申领完成"); + } excels.add(excel); } } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java index db2433c..606e57d 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java @@ -296,11 +296,33 @@ public class GoodsController extends BladeController { String[] strIds = ids.split(","); List goods = goodsService.listByIds(Arrays.asList(strIds)); - List list = BeanUtil.copy(goods, GoodsExcel.class); + for (Goods goods1 : goods) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProductStoreDetial::getGoodsId, goods1.getId()); + wrapper.eq(ProductStoreDetial::getStatus, 0); + List list1 = productStoreDetialService.list(wrapper); + if(list1.size() > 0){ + goods1.setQualityStatus("已质检"); + }else{ + goods1.setQualityStatus("未质检"); + } + if(goods1.getStatus() ==0){ + goods1.setStatusStr("未确认"); + }else{ + goods1.setStatusStr("已确认"); + } + if(goods1.getDeactivate() == 0){ + goods1.setDeactivateStr("闲置"); + }else if(goods1.getDeactivate() == 1){ + goods1.setDeactivateStr("在用"); + }else if(goods1.getDeactivate() ==2){ + goods1.setDeactivateStr("库存"); + }else{ + goods1.setDeactivateStr("已报废"); + } + } - list.forEach(item -> { - item.setUnit(DictBizCache.getValue(DictBizEnum.UNIT.getName(), item.getUnit())); - }); + List list = BeanUtil.copy(goods, GoodsExcel.class); ExcelUtil.export(response, "物品数据", "物品列表", list, GoodsExcel.class); } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml index 82e04d0..abfacc8 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml @@ -46,7 +46,8 @@ b.rule, b.product_id, b.out_num, - b.apply_num + b.apply_num, + a.status from f_apply a left join f_apply_detail b on a.id = b.apply_id diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InstrumentController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InstrumentController.java index 6200cf4..dc3226b 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InstrumentController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InstrumentController.java @@ -243,7 +243,9 @@ public class InstrumentController extends BladeController { instrument.setPurchaseTime(instrumentExcel.getPurchaseTime()); //instrument.setIsVerification(DictCache.getKey(DictEnum.YES_NO.getName(), instrumentExcel.getType())); instrument.setScrapYears(instrumentExcel.getScrapYears()); - instrument.setInstrumentStatus(DictBizCache.getKey(DictBizEnum.EQUIP_STATUS.getName(), instrumentExcel.getInstrumentStatus())); + //instrument.setInstrumentStatus(DictBizCache.getKey(DictBizEnum.EQUIP_STATUS.getName(), instrumentExcel.getInstrumentStatus())); + instrument.setInstrumentStatus("1"); + instrument.setRatedPower(instrumentExcel.getRatedPower()); success++; list.add(instrument); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainProjectServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainProjectServiceImpl.java index 847c436..e06738b 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainProjectServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainProjectServiceImpl.java @@ -59,7 +59,7 @@ public class MaintainProjectServiceImpl extends BaseServiceImpl roles = Arrays.asList(AuthUtil.getUserRole().split(",")); if(!roles.contains("admin") && !roles.contains("政府")){