Dlp-Gyjd
/
dlp-reagent-managment
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
main
杨海航 2 years ago
parent 976aa1422f
commit d2dfbac2f4
22 changed files with 176 additions and 1213 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1037
      db/dlp_reagent_managment.sql
  2. 31
      src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java
  3. 105
      src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceRecordForm.java
  4. 2
      src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceSignFor.java
  5. 30
      src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java
  6. 50
      src/main/java/digital/laboratory/platform/reagent/entity/BatchDetails.java
  7. 4
      src/main/java/digital/laboratory/platform/reagent/entity/CatalogueDetails.java
  8. 6
      src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumableInventory.java
  9. 2
      src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumables.java
  10. 21
      src/main/java/digital/laboratory/platform/reagent/entity/ReferenceMaterial.java
  11. 2
      src/main/java/digital/laboratory/platform/reagent/entity/StandardReserveSolution.java
  12. 2
      src/main/java/digital/laboratory/platform/reagent/entity/StandardSolutionCurve.java
  13. 7
      src/main/java/digital/laboratory/platform/reagent/service/impl/AcceptanceRecordFormServiceImpl.java
  14. 2
      src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApplicationServiceImpl.java
  15. 7
      src/main/java/digital/laboratory/platform/reagent/service/impl/StandardReserveSolutionServiceImpl.java
  16. 2
      src/main/java/digital/laboratory/platform/reagent/service/impl/SupplierInformationServiceImpl.java
  17. 59
      src/main/java/digital/laboratory/platform/reagent/service/impl/WarehousingRecordFormServiceImpl.java
  18. 2
      src/main/java/digital/laboratory/platform/reagent/task/MaturityCalculation.java
  19. 2
      src/main/java/digital/laboratory/platform/reagent/vo/ReagentConsumableInventoryFullVO.java
  20. 2
      src/main/java/digital/laboratory/platform/reagent/vo/StandardMaterialApplicationVO.java
  21. 4
      src/main/java/digital/laboratory/platform/reagent/vo/StandardReserveSolutionVO.java
  22. 4
      src/main/resources/mapper/PurchaseCatalogueMapper.xml

1037
db/dlp_reagent_managment.sql
View File

File diff suppressed because it is too large Load Diff

31
src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java
Unescape View File

@ -93,7 +93,8 @@ public class ReagentConsumableInventoryController {
if (reagentConsumableName != null) {
reagentConsumableInventoryQueryWrapper.like("reagent_consumable_name", reagentConsumableName);
reagentConsumableInventoryQueryWrapper.like("reagent_consumable_name", reagentConsumableName).or()
.like("species", reagentConsumableName);
}
@ -125,7 +126,17 @@ public class ReagentConsumableInventoryController {
.like(StrUtil.isNotBlank(reagentConsumableName), "remark", reagentConsumableName)
.like(warning != null && warning == 1, "warning_information", "库存不足")
.eq("category", "标准储备溶液"), warning);
.eq("category", "标准储备溶液").or()
.like(StrUtil.isNotBlank(reagentConsumableName), "species", reagentConsumableName)
.like(warning != null && warning == 1, "warning_information", "库存不足")
.eq("category", "标准物质").or().
like(StrUtil.isNotBlank(reagentConsumableName), "species", reagentConsumableName)
.like(warning != null && warning == 1, "warning_information", "库存不足")
.eq("category", "标准储备溶液").or(), warning);
return R.ok(reagentConsumableInventoryRMVOList);
// return R.ok(reagentConsumableInventoryService.page(page, Wrappers.query(reagentConsumableInventory)));
}
@ -152,7 +163,15 @@ public class ReagentConsumableInventoryController {
.like(StrUtil.isNotBlank(reagentConsumableName), "remark", reagentConsumableName)
.like(warning != null && warning == 1, "warning_information", "库存不足")
.eq("category", "耗材"), warning);
.eq("category", "耗材")
.like(StrUtil.isNotBlank(reagentConsumableName), "reagent_consumable_name", reagentConsumableName)
.like(warning != null && warning == 1, "species", "库存不足")
.eq("category", "试剂").or()
.like(StrUtil.isNotBlank(reagentConsumableName), "remark", reagentConsumableName)
.like(warning != null && warning == 1, "species", "库存不足")
.eq("category", "耗材").or(), warning);
return R.ok(reagentConsumableInventoryRMVOList);
// return R.ok(reagentConsumableInventoryService.page(page, Wrappers.query(reagentConsumableInventory)));
}
@ -174,8 +193,12 @@ public class ReagentConsumableInventoryController {
IPage<ReagentConsumableInventoryFullVO> allRM = reagentConsumableInventoryService.getAllRM(page, reagentConsumableInventoryQueryWrapper
.eq("category", "试剂")
.like(!StrUtil.isEmpty(reagentConsumableName), "reagent_consumable_name", reagentConsumableName).or()
.eq("category", "试剂")
.like(!StrUtil.isEmpty(reagentConsumableName), "species", reagentConsumableName).or()
.eq("category", "耗材")
.like(!StrUtil.isEmpty(reagentConsumableName), "reagent_consumable_name", reagentConsumableName).or()
.eq("category", "耗材")
.like(!StrUtil.isEmpty(reagentConsumableName), "reagent_consumable_name", reagentConsumableName));
.like(!StrUtil.isEmpty(reagentConsumableName), "species", reagentConsumableName));
return R.ok(allRM);

105
src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceRecordForm.java
Unescape View File

@ -22,204 +22,113 @@ import lombok.EqualsAndHashCode;
*/
@Data
@TableName(value = "acceptance_record_form", autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "(验收记录表)")
public class AcceptanceRecordForm extends BaseEntity {
@ApiModelProperty(value = "(试剂耗材名称)")
private String reagentConsumableName;
/**
* (供应商ID)
*/
@ApiModelProperty(value = "(供应商ID)")
private String supplierId;
/**
* 部门负责人审核时间
*/
@ApiModelProperty(value = "三级审核时间")
private LocalDateTime auditTimeOfThreeLevel;
/**
* (验收日期)
*/
@ApiModelProperty(value = "(验收日期)")
private LocalDateTime dateOfAcceptance;
/**
* (部门负责人审核意见)
*/
@ApiModelProperty(value = "(三级审核意见)")
private String auditOpinionOfThreeLevel;
@ApiModelProperty(value = "(提交时间)")
private LocalDateTime commitTime;
/**
* (部门负责人ID)
*/
@ApiModelProperty(value = "(三级审核人ID)")
private String threeLevelAuditorId;
/**
* (后续处理情况)
*/
@ApiModelProperty(value = "(后续处理情况)")
private String followUpTreatment;
/**
* (二级审核意见)
*/
@ApiModelProperty(value = "(二级审核意见)")
private String auditOpinionOfSecondary;
/**
* (二级审核人ID)
*/
@ApiModelProperty(value = "(二级审核人ID)")
private String secondaryAuditorId;
/**
* (二级审核时间)
*/
@ApiModelProperty(value = "(二级审核时间)")
private LocalDateTime auditTimeOfSecondary;
/**
* (试剂耗材ID)
*/
@ApiModelProperty(value = "(试剂耗材ID)")
private String reagentConsumableId;
/**
* (一级审核意见)
*/
@ApiModelProperty(value = "(一级审核意见)")
private String auditOpinionOfPrimary;
/**
* (一级审核时间)
*/
@ApiModelProperty(value = "(一级审核时间)")
private LocalDateTime auditTimeOfPrimary;
/**
* (一级审核人ID)
*/
@ApiModelProperty(value = "(一级审核人ID)")
private String primaryAuditorId;
/**
* acceptanceRecordFormId
*/
@TableId(value = "id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value = "id")
private String id;
/**
* 一级审核结果
*/
@ApiModelProperty(value = "一级审核结果")
private boolean auditResultOfPrimary;
/**
* 部门负责人审核结果
*/
@ApiModelProperty(value = "三级审核结果")
private boolean auditResultOfThreeLevel;
/**
* (二级审核结果)
*/
@ApiModelProperty(value = "(二级审核结果)")
private boolean auditResultOfSecondary;
/**
* (品牌型号一致)
*/
@ApiModelProperty(value = "(品牌型号一致)")
private String theSameBrandAndModel;
/**
* (品牌型号一致备注)
*/
@ApiModelProperty(value = "(品牌型号一致备注)")
private String bam_remarks;
/**
* (数量一致)
*/
@ApiModelProperty(value = "(数量一致)")
private String consistentQuantity;
/**
* (数量一致备注)
*/
@ApiModelProperty(value = "(数量一致备注)")
private String cq_remarks;
/**
* (包装完好)
*/
@ApiModelProperty(value = "(包装完好)")
private String packingInGoodCondition;
/**
* (包装完好备注)
*/
@ApiModelProperty(value = "(包装完好备注)")
private String pgc_remarks;
/**
* (有效期)
*/
@ApiModelProperty(value = "(有效期)")
private String validityPeriod;
/**
* (有效期备注)
*/
@ApiModelProperty(value = "(有效期备注)")
private String vp_remarks;
/**
* (供货周期)
*/
@ApiModelProperty(value = "(供货周期)")
private String deliveryCycle;
/**
* (供货周期备注)
*/
@ApiModelProperty(value = "(供货周期备注)")
private String dc_remarks;
/**
* (验收结论)
*/
@ApiModelProperty(value = "(验收结论)")
private String acceptanceConclusion;
/**
* (不合格项目)
*/
@ApiModelProperty(value = "(不合格项目)")
private String nonconformingItem;
/**
* (状态)
*/
@ApiModelProperty(value = "状态(0：未提交，1：一级待审核，2：二级待审核，3：三级待审核，6：审核通过，-2 一级审核不不通过，-3：二级审核不通过，-4 三级审核不通过)")
private Integer status;
/**
* (签收物品明细Id)
*/
@ApiModelProperty(value = "(签收物品明细Id)")
private String warehousingContentId;
@ApiModelProperty(value = "(验收人名称)")
private String userName;
@ApiModelProperty(value = "(验收中间表ID)")
private String acceptanceSignForId;
}

2
src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceSignFor.java
Unescape View File

@ -19,11 +19,9 @@ public class AcceptanceSignFor extends BaseEntity {
@ApiModelProperty(value = "ID")
private String id;
@ApiModelProperty(value = "验收种数")
private Integer quantity;
@ApiModelProperty(value = "签收记录表ID")
private String warehousingRecordFormId;

30
src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java
Unescape View File

@ -24,57 +24,29 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "(试剂耗材领用申请表)")
public class ApplicationForUse extends BaseEntity {
/**
* (领取日期)
*/
@ApiModelProperty(value="(领取日期)")
private LocalDateTime dateOfCollection;
/**
* (领用人ID)
*/
@ApiModelProperty(value="(领用人ID)")
private String recipientId;
/**
* (状态)
*/
@ApiModelProperty(value="(状态)")
private Integer status;
/**
* applicationForUseId
*/
@TableId(value = "id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="id")
private String id;
/**
* 出库记录表
*/
@ApiModelProperty(value="出库记录表")
private String deliveryRegistrationFormId;
/**
* 领用记录表
*/
@ApiModelProperty(value="领用记录表")
private String requisitionRecordId;
/**
* 领取码
*/
@ApiModelProperty(value="领取码")
private String claimCode;
/**
* 实验模板ID
*/
@ApiModelProperty(value="实验ID")
@ApiModelProperty(value="检验鉴定实验ID")
private String experimentId;

50
src/main/java/digital/laboratory/platform/reagent/entity/BatchDetails.java
Unescape View File

@ -25,95 +25,54 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "批次明细")
public class BatchDetails extends BaseEntity {
/**
* (批次)
*/
@ApiModelProperty(value="(批次)")
private String batch;
/**
* (批号)
*/
@ApiModelProperty(value="(批号)")
private String batchNumber;
/**
* (符合性检验情况)
*/
@ApiModelProperty(value="(符合性检验情况)")
private Boolean complianceTestSituation;
/**
* (上次期间核查日期)
*/
@ApiModelProperty(value="(上次期间核查日期)")
private LocalDateTime dateOfLastCheck;
/**
* (生产日期)
*/
@ApiModelProperty(value="(生产日期)")
private LocalDate dateOfProduction;
/**
* (偏差/不确定度)
*/
@ApiModelProperty(value="(偏差/不确定度)")
private String deviationOrUncertainty;
/**
* (有效日期)
*/
@ApiModelProperty(value="(有效日期)")
private LocalDate expirationDate;
@ApiModelProperty(value = "(存储期限)")
private String limitDate;
/**
* (定值结果)
*/
@ApiModelProperty(value="(定值结果)")
private String fixedResult;
/**
* (编号)
*/
@ApiModelProperty(value="(编号)")
private String number;
/**
* (购置时间)
*/
@ApiModelProperty(value="(购置时间)")
private LocalDateTime purchaseTime;
/**
* (数量)
*/
@ApiModelProperty(value="(数量)")
private Integer quantity;
/**
* (试剂耗材库存ID)
*/
@ApiModelProperty(value="(试剂耗材库存ID)")
private String reagentConsumableInventoryId;
/**
* (使用状态)
*/
@ApiModelProperty(value="(使用状态 1 库存充足 -1 库存为0)")
private Integer serviceStatus;
/**
* (供应商ID)
*/
@ApiModelProperty(value="(供应商ID)")
private String supplierId;
@ApiModelProperty(value = "(格子Id)")
private String latticeId;
@ApiModelProperty(value = "(位置信息)")
private String location;
@ -126,13 +85,6 @@ public class BatchDetails extends BaseEntity {
@ApiModelProperty(value="签收批次ID")
private String warehousingBatchListId;
/**
* batchDetailsId
*/
@TableId(value = "batch_details_id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="batchDetailsId")
private String batchDetailsId;

4
src/main/java/digital/laboratory/platform/reagent/entity/CatalogueDetails.java
Unescape View File

@ -127,7 +127,9 @@ public class CatalogueDetails extends BaseEntity {
*/
@ApiModelProperty(value = "CAS-号")
private String casNumber;
/**
* 物品编码
*/
@ApiModelProperty(value = "物品编码")
private String code;

6
src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumableInventory.java
Unescape View File

@ -51,10 +51,6 @@ public class ReagentConsumableInventory extends BaseEntity {
@ApiModelProperty(value = "(类别)")
private String category;
/**
* (类别)
*/
/**
* 偏差/不确定度
@ -149,7 +145,7 @@ public class ReagentConsumableInventory extends BaseEntity {
* (溶液浓度)
*/
@ApiModelProperty(value = "(溶液浓度)")
private String configurationConcentration;
private double configurationConcentration;
/**
* 英文名
*/

2
src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumables.java
Unescape View File

@ -122,7 +122,7 @@ public class ReagentConsumables extends BaseEntity {
* 溶液浓度
*/
@ApiModelProperty(value="溶液浓度")
private String configurationConcentration;
private double configurationConcentration;
/**

21
src/main/java/digital/laboratory/platform/reagent/entity/ReferenceMaterial.java
Unescape View File

@ -22,9 +22,6 @@ import lombok.EqualsAndHashCode;
@ApiModel(value = "")
public class ReferenceMaterial extends BaseEntity {
/**
* number
*/
@ApiModelProperty(value="标准物质编号")
private String number;
@ -33,30 +30,19 @@ public class ReferenceMaterial extends BaseEntity {
@ApiModelProperty(value="打印序列号")
private String code;
/**
* number
*/
@ApiModelProperty(value="状态(0为可以使用，-1为停用,-2为降级使用、-3 已被领用,-4 使用完毕,报废")
private Integer status;
/**
* reagentConsumableId
*/
@ApiModelProperty(value="试剂耗材Id")
private String reagentConsumableId;
@ApiModelProperty(value="使用状态 0 正常使用、-2降级使用")
private Integer serviceStatus;
/**
* batchDetailsId
*/
@ApiModelProperty(value="批次明细Id")
private String batchDetailsId;
/**
* batchDetailsId
*/
@ApiModelProperty(value="格子ID")
private String latticeId;
@ -66,9 +52,6 @@ public class ReferenceMaterial extends BaseEntity {
@ApiModelProperty(value="柜子ID")
private String boxId;
/**
* id
*/
@TableId(value = "id", type = IdType.ASSIGN_UUID)
@ApiModelProperty(value="id")
private String id;

2
src/main/java/digital/laboratory/platform/reagent/entity/StandardReserveSolution.java
Unescape View File

@ -31,7 +31,7 @@ public class StandardReserveSolution extends BaseEntity {
* (配置浓度(mg/mL))
*/
@ApiModelProperty(value="(配置浓度(mg/mL))")
private String configurationConcentration;
private double configurationConcentration;
/**
* (预警信息)

2
src/main/java/digital/laboratory/platform/reagent/entity/StandardSolutionCurve.java
Unescape View File

@ -46,7 +46,7 @@ public class StandardSolutionCurve extends BaseEntity {
* (标准储备溶液浓度)
*/
@ApiModelProperty(value="(标准储备溶液浓度)")
private String solutionConcentration;
private double solutionConcentration;
/**
* (标准储备溶液浓度编号)

7
src/main/java/digital/laboratory/platform/reagent/service/impl/AcceptanceRecordFormServiceImpl.java
Unescape View File

@ -55,27 +55,22 @@ public class AcceptanceRecordFormServiceImpl extends ServiceImpl<AcceptanceRecor
@Autowired
private BlacklistService blacklistService;
@Autowired
private AcceptanceSignForService acceptanceSignForService;
@Autowired
private ReagentConsumablesService reagentConsumablesService;
@Autowired
private WarehousingContentService warehousingContentService;
@Autowired
private OssFile ossFile;
@Autowired
private RemoteWord2PDFService remoteWord2PDFService;
@Autowired
private WarehousingRecordFormService warehousingRecordFormService;
@Transactional
@Override
@Override//批量提交
public void culkCommit(List<AcceptanceRecordFormDTO> acceptanceRecordFormDTOList, DLPUser dlpUser) {
for (AcceptanceRecordFormDTO acceptanceRecordFormDTO : acceptanceRecordFormDTOList) {

2
src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApplicationServiceImpl.java
Unescape View File

@ -187,7 +187,7 @@ public class StandardMaterialApplicationServiceImpl extends ServiceImpl<Standard
record.setReagentConsumables(byId);
if (one != null) {
String configurationConcentration = one.getConfigurationConcentration();
double configurationConcentration = one.getConfigurationConcentration();
record.setConfigurationConcentration(configurationConcentration);
}

7
src/main/java/digital/laboratory/platform/reagent/service/impl/StandardReserveSolutionServiceImpl.java
Unescape View File

@ -86,7 +86,10 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl<StandardRese
StandardReserveSolutionVO standardReserveSolutionVOById = baseMapper.getStandardReserveSolutionVOById(id);
standardReserveSolutionVOById.setConfigurationDatePrint("配置日期:"+LocalDateTimeUtil.format(standardReserveSolutionVOById.getConfigurationDate(), "yyyy-MM-dd"));
standardReserveSolutionVOById.setPrintName(reagentConsumablesService.getById(referenceMaterialService.getById(standardReserveSolutionVOById.getReferenceMaterialId()).getReagentConsumableId()).getReagentConsumableName()+"[储]"
);
standardReserveSolutionVOById.setConfigurationDatePrint(standardReserveSolutionVOById.getDispenserName() + "-" + LocalDateTimeUtil.format(standardReserveSolutionVOById.getConfigurationDate(), "yyyy-MM-dd") +"-"+ standardReserveSolutionVOById.getConfigurationConcentration());
//查出该标准储备溶液对应的所有使用记录
List<SolutionUseFormVO> solutionUseFormVOList = solutionUseFormService.getSolutionUseFormVOList(standardReserveSolutionVOById.getId());
@ -123,7 +126,7 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl<StandardRese
//计算浓度
Double v = standardReserveSolution.getReferenceMaterialScale() / standardReserveSolution.getConstantVolume();
standardReserveSolution.setConfigurationConcentration(String.format("%.05f", v));
standardReserveSolution.setConfigurationConcentration(v);
LambdaQueryWrapper<ReagentConsumableInventory> reagentConsumableInventoryLambdaQueryWrapper = new LambdaQueryWrapper<>();

2
src/main/java/digital/laboratory/platform/reagent/service/impl/SupplierInformationServiceImpl.java
Unescape View File

@ -32,8 +32,6 @@ public class SupplierInformationServiceImpl extends ServiceImpl<SupplierInformat
@Autowired
private EvaluationFormService evaluationFormService;
@Autowired
private ProvideServicesOrSuppliesService provideServicesOrSuppliesService;
@Override//新增供应商信息
@Transactional

59
src/main/java/digital/laboratory/platform/reagent/service/impl/WarehousingRecordFormServiceImpl.java
Unescape View File

@ -120,13 +120,8 @@ public class WarehousingRecordFormServiceImpl extends ServiceImpl<WarehousingRec
throw new RuntimeException(String.format("请选择存放位置后再进行提交"));
}
boolean flag = true;
int i = 0;
String latticeId = warehousingRecordFormDTO.getLatticeId();
//录入签收批次信息
WarehousingBatchList warehousingBatchList = new WarehousingBatchList();
@ -423,6 +418,7 @@ public class WarehousingRecordFormServiceImpl extends ServiceImpl<WarehousingRec
warehousingContent.setStatus(1);
warehousingContentService.updateById(warehousingContent);
if (warehousingContent.getAcceptanceRecordFormId() == null) {
AcceptanceSignFor acceptanceSignForServiceOne = acceptanceSignForService.getOne(Wrappers.<AcceptanceSignFor>query().eq("warehousing_record_form_id", warehousingRecordFormId));
@ -523,60 +519,7 @@ public class WarehousingRecordFormServiceImpl extends ServiceImpl<WarehousingRec
return warehousingRecordFormVOPage;
}
public List<PurchaseRequestPrintVO> getPurchaseRequestPrint(String id) {
WarehousingRecordForm byId = this.getById(id);
List<WarehousingContent> warehousingContentList = warehousingContentService.list(Wrappers.<WarehousingContent>query().eq("warehousing_record_form_id", id));
PurchaseListDetails purchaseListDetails1 = purchaseListDetailsService.getById(warehousingContentList.get(0).getPurchaseListDetailsId());
DecentralizedRequest request = decentralizedRequestService.getOne(Wrappers.<DecentralizedRequest>query().eq("purchase_list_id", purchaseListDetails1.getPurchaseListId()));
if (request != null) {
DecentralizedRequestVO requestById = decentralizedRequestService.getRequestById(request.getId());
List<DecentralizeDetails> decentralizeDetailsVOList = requestById.getDecentralizeDetailsVOList();
}
for (WarehousingContent warehousingContent : warehousingContentList) {
PurchaseListDetails purchaseListDetails = purchaseListDetailsService.getById(warehousingContent.getPurchaseListDetailsId());
String purchaseListId = purchaseListDetails.getPurchaseListId();
List<WarehousingBatchList> batchListList = warehousingBatchListService.list(Wrappers.<WarehousingBatchList>query().eq("warehousing_content_id", warehousingContent.getId()));
// DecentralizedRequest request = decentralizedRequestService.getOne(Wrappers.<DecentralizedRequest>query().eq("purchase_list_id", purchaseListId));
if (request != null) {
DecentralizedRequestVO requestById = decentralizedRequestService.getRequestById(request.getId());
List<DecentralizeDetails> decentralizeDetailsVOList = requestById.getDecentralizeDetailsVOList();
for (DecentralizeDetails decentralizeDetail : decentralizeDetailsVOList) {
PurchaseRequestPrintVO purchaseRequestPrintVO = new PurchaseRequestPrintVO();
if (decentralizeDetail.getCategory().equals("标准物质")) {
purchaseRequestPrintVO.setRemarks(decentralizeDetail.getRemarks());
purchaseRequestPrintVO.setQuantity(decentralizeDetail.getQuantity());
purchaseRequestPrintVO.setPurpose(decentralizeDetail.getPurpose());
purchaseRequestPrintVO.setSubtotal(decentralizeDetail.getUnitPrice() * decentralizeDetail.getQuantity());
purchaseRequestPrintVO.setApplicantName(requestById.getApplicantName());
purchaseRequestPrintVO.setReagentConsumableName(decentralizeDetail.getReagentConsumableName());
// purchaseRequestPrintVO.setSupplierName();
}
}
}
ProcurementContent procurementContent = procurementContentService.getById(purchaseListDetails.getProcurementContentId());
}
return
null;
}
}

2
src/main/java/digital/laboratory/platform/reagent/task/MaturityCalculation.java
Unescape View File

@ -65,14 +65,12 @@ public class MaturityCalculation {
periodVerificationPlanService.getPlan();
System.out.println("期间核查计划自动更新");
}
@Scheduled(cron = "0 0/1 * * * ? ")
public void inventoryReminder() {
List<StandardReserveSolution> list2 = standardReserveSolutionService.list(Wrappers.<StandardReserveSolution>query()
.eq("status", 1));

2
src/main/java/digital/laboratory/platform/reagent/vo/ReagentConsumableInventoryFullVO.java
Unescape View File

@ -48,7 +48,7 @@ public class ReagentConsumableInventoryFullVO extends ReagentConsumableInventory
private String fixedResult;
@ApiModelProperty(value="(配置浓度(mg/mL))")
private String configurationConcentration;
private double configurationConcentration;
@ApiModelProperty(value="(配置日期)")
private LocalDateTime configurationDate;

2
src/main/java/digital/laboratory/platform/reagent/vo/StandardMaterialApplicationVO.java
Unescape View File

@ -25,7 +25,7 @@ public class StandardMaterialApplicationVO extends StandardMaterialApplication {
private String category;
@ApiModelProperty(value="(配置浓度(mg/mL))")
private String configurationConcentration;
private double configurationConcentration;
private ReagentConsumables reagentConsumables;

4
src/main/java/digital/laboratory/platform/reagent/vo/StandardReserveSolutionVO.java
Unescape View File

@ -11,6 +11,7 @@ public class StandardReserveSolutionVO extends StandardReserveSolution {
@ApiModelProperty(value="(配制人名称)")
private String dispenserName;
@ApiModelProperty(value="(标准储备溶液使用记录表集合)")
private List<SolutionUseFormVO> solutionUseFormVOList;
@ -24,4 +25,7 @@ public class StandardReserveSolutionVO extends StandardReserveSolution {
@ApiModelProperty(value = "配置日期打印")
private String configurationDatePrint;
@ApiModelProperty(value="(打印储备溶液名称)")
private String printName;
}

4
src/main/resources/mapper/PurchaseCatalogueMapper.xml
Unescape View File

@ -62,6 +62,10 @@
FROM dlp_base.sys_user user
WHERE user.user_id=pc.create_by
) AS create_name
, (
select department
from dlp_base.sys_user
where user_id = pc.create_by) as department
FROM purchase_catalogue pc
WHERE pc.purchase_catalogue_id = #{purchaseCatalogueId}
</sql>

Write Preview
Loading…
Cancel
Save