diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java index d95a382..a89c1e0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverDetailController.java @@ -92,6 +92,14 @@ public class BusinessSampleHandoverDetailController implements BusinessControlle return success(BeanUtils.toBean(pageResult, BusinessSampleHandoverDetailRespVO.class)); } + @GetMapping("/takeOffPageList") + @Operation(summary = "获得样品交接明细分页") + //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:query')") + public CommonResult> takeOffPageList(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO) { + PageResult pageResult = businessSampleHandoverDetailService.takeOffPageList(pageReqVO); + return success(pageResult); + } + @GetMapping("/export-excel") @Operation(summary = "导出样品交接明细 Excel") //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:export')") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleHandoverDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleHandoverDetailRespVO.java index 54cf9e6..88e5562 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleHandoverDetailRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleHandoverDetailRespVO.java @@ -61,4 +61,19 @@ public class BusinessSampleHandoverDetailRespVO { @ExcelProperty("备注") private String remark; + + //==================================扩展字段================================== + @Schema(description = "原样品编号") + @ExcelProperty("原样品编号") + private String originalSampleCode; + + @Schema(description = "库位编码") + @ExcelProperty("归库时间") + private String warehouseLocationCode; + + @Schema(description = "归库时间") + @ExcelProperty("归库时间") + private LocalDateTime returnTime; + + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.java index b07b3f9..927ae00 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.java @@ -2,6 +2,7 @@ package com.zt.plat.module.qms.business.bus.dal.mapper; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; import com.zt.plat.module.qms.business.bus.controller.vo.*; import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleHandoverDetailPageReqVO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleHandoverDetailDO; @@ -9,6 +10,8 @@ import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import java.util.List; +import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigWarehouseLocationDO; import org.apache.ibatis.annotations.Mapper; /** @@ -40,4 +43,28 @@ public interface BusinessSampleHandoverDetailMapper extends BaseMapperX takeOffPageList(BusinessSampleHandoverDetailPageReqVO reqVO) { + return selectJoinPage(reqVO, BusinessSampleHandoverDetailRespVO.class, new MPJLambdaWrapperX() + .leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessSampleHandoverDetailDO::getBusinessSubSampleId) + .leftJoin(ConfigWarehouseLocationDO.class, ConfigWarehouseLocationDO::getId, BusinessSubSampleDO::getConfigWarehouseLocationInfomationId) + .selectAll(BusinessSampleHandoverDetailDO.class) + .selectAs(BusinessSubSampleDO::getSampleCode, BusinessSampleHandoverDetailRespVO::getOriginalSampleCode) + .selectAs(BusinessSubSampleDO::getReturnTime, BusinessSampleHandoverDetailRespVO::getReturnTime) + .selectAs(ConfigWarehouseLocationDO::getCode, BusinessSampleHandoverDetailRespVO::getWarehouseLocationCode) + .eqIfPresent(BusinessSampleHandoverDetailDO::getBusinessSampleHandoverId, reqVO.getBusinessSampleHandoverId()) + .eqIfPresent(BusinessSampleHandoverDetailDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId()) + .likeIfPresent(BusinessSampleHandoverDetailDO::getSampleName, reqVO.getSampleName()) + .eqIfPresent(BusinessSampleHandoverDetailDO::getSampleCode, reqVO.getSampleCode()) + .eqIfPresent(BusinessSampleHandoverDetailDO::getSampleWeight, reqVO.getSampleWeight()) + .eqIfPresent(BusinessSampleHandoverDetailDO::getBalanceCode, reqVO.getBalanceCode()) + .eqIfPresent(BusinessSampleHandoverDetailDO::getDictionaryBusinessId, reqVO.getDictionaryBusinessId()) + .likeIfPresent(BusinessSampleHandoverDetailDO::getDictionaryBusinessName, reqVO.getDictionaryBusinessName()) + .eqIfPresent(BusinessSampleHandoverDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .betweenIfPresent(BusinessSampleHandoverDetailDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BusinessSampleHandoverDetailDO::getRemark, reqVO.getRemark()) + .orderByDesc(BusinessSampleHandoverDetailDO::getId)); + } + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleHandoverDetailService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleHandoverDetailService.java index b5fcd8e..c9247a3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleHandoverDetailService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleHandoverDetailService.java @@ -61,5 +61,7 @@ public interface BusinessSampleHandoverDetailService { */ PageResult getBusinessSampleHandoverDetailPage(BusinessSampleHandoverDetailPageReqVO pageReqVO); + PageResult takeOffPageList(BusinessSampleHandoverDetailPageReqVO pageReqVO); + void insertBatch(List list); } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleHandoverDetailServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleHandoverDetailServiceImpl.java index 5ebc517..55e2f1d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleHandoverDetailServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleHandoverDetailServiceImpl.java @@ -91,6 +91,11 @@ public class BusinessSampleHandoverDetailServiceImpl implements BusinessSampleHa return businessSampleHandoverDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult takeOffPageList(BusinessSampleHandoverDetailPageReqVO pageReqVO) { + return businessSampleHandoverDetailMapper.takeOffPageList(pageReqVO); + } + @Override @Transactional(rollbackFor = Exception.class) public void insertBatch(List list) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleServiceImpl.java index e538517..e52428a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleServiceImpl.java @@ -379,17 +379,17 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { for(BusinessSubSampleDO businessSubSampleDO : waitingList){ businessSubSampleDO.setReturnStatus(QmsCommonConstant.TAKEN_OFF); //创建流转记录 - BusinessHandoverRecordSubDO reecordDO = new BusinessHandoverRecordSubDO(); - reecordDO.setBusinessSubSampleId(businessSubSampleDO.getId()); - reecordDO.setSampleFlowNodeKey(QmsCommonConstant.FLOW_SAMPLE_STORAGE); - reecordDO.setSampleCode(businessSubSampleDO.getSampleReturnCode()); - reecordDO.setOperationTime(LocalDateTime.now()); - reecordDO.setOperator(loginUserName); - reecordDO.setOperatorId(loginUser.getId()); - reecordDO.setSendSampleOperator(""); - reecordDO.setReceiveSampleOperator(""); - reecordDO.setConfigSampleFlowId(0L); - recordList.add(reecordDO); + BusinessHandoverRecordSubDO record = new BusinessHandoverRecordSubDO(); + record.setBusinessSubSampleId(businessSubSampleDO.getId()); + record.setSampleFlowNodeKey(QmsCommonConstant.FLOW_SAMPLE_STORAGE); + record.setSampleCode(businessSubSampleDO.getSampleReturnCode()); + record.setOperationTime(LocalDateTime.now()); + record.setOperator(loginUserName); + record.setOperatorId(loginUser.getId()); + record.setSendSampleOperator(""); + record.setReceiveSampleOperator(""); + record.setConfigSampleFlowId(0L); + recordList.add(record); BusinessSampleHandoverDetailDO detailDO = new BusinessSampleHandoverDetailDO(); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationPageReqVO.java index 28861de..635a7e0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationPageReqVO.java @@ -50,4 +50,6 @@ public class ConfigWarehouseLocationPageReqVO extends PageParam { @Schema(description = "备注") private String remark; + @Schema(description = "标签打印模板key") + private String printTemplate; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java index 5080ffb..da88519 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java @@ -63,4 +63,7 @@ public class ConfigWarehouseLocationRespVO { @ExcelProperty("备注") private String remark; + @Schema(description = "标签打印模板key") + @ExcelProperty("标签打印模板key") + private String printTemplate; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationSaveReqVO.java index 01ff684..3127529 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationSaveReqVO.java @@ -48,4 +48,7 @@ public class ConfigWarehouseLocationSaveReqVO { @Schema(description = "备注") private String remark; + @Schema(description = "标签打印模板key") + private String printTemplate; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigWarehouseLocationDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigWarehouseLocationDO.java index 6e980e1..8d38d53 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigWarehouseLocationDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigWarehouseLocationDO.java @@ -85,4 +85,8 @@ public class ConfigWarehouseLocationDO extends BusinessBaseDO { @TableField("RMK") private String remark; + //标签打印模板key + @TableField("PRNT_TMPL") + private String printTemplate; + } \ No newline at end of file