From 44a6e11803930c5c7ba4e9479453601d2bd1b84f Mon Sep 17 00:00:00 2001 From: FCL Date: Mon, 24 Nov 2025 18:11:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B7=E5=93=81=E5=BA=93=E8=81=94?= =?UTF-8?q?=E8=B0=83=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessSampleDispatchController.java | 10 +-- ...usinessSampleDispatchDetailController.java | 6 +- .../admin/BusinessSubSampleController.java | 7 ++ ...BusinessSampleDispatchDetailPageReqVO.java | 4 +- .../vo/BusinessSampleDispatchPageReqVO.java | 6 ++ .../vo/BusinessSampleDispatchRespVO.java | 8 ++ .../vo/BusinessSampleDispatchSaveReqVO.java | 6 ++ .../vo/BusinessSubSamplePageReqVO.java | 11 ++- .../controller/vo/BusinessSubSampleReqVO.java | 2 + .../dataobject/BusinessSampleDispatchDO.java | 7 ++ .../BusinessSampleDispatchDetailMapper.java | 2 +- .../dal/mapper/BusinessSubSampleMapper.java | 8 +- .../BusinessSampleDispatchServiceImpl.java | 3 +- .../bus/service/BusinessSubSampleService.java | 2 + .../service/BusinessSubSampleServiceImpl.java | 49 ++++++++---- .../ReportDocumentDataServiceImpl.java | 20 ++++- .../dal/mapper/BusinessSubSampleMapper.xml | 79 +++++++++++++++++++ 17 files changed, 195 insertions(+), 35 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchController.java index 71a702d..e4bdc09 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchController.java @@ -71,12 +71,12 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke return success(true); } - @PostMapping("/addBySampleCode") - @Operation(summary = "增加或移除样品") - public CommonResult addBySampleCode(@RequestBody JSONObject param) { + @PostMapping("/addBySampleReturnCode") + @Operation(summary = "按归库码增加样品") + public CommonResult addBySampleReturnCode(@RequestBody JSONObject param) { String id = param.getString("id"); - String sampleCode = param.getString("sampleCode"); - BusinessSubSampleDO businessSubSampleDO = businessSubSampleService.getBySampleCode(sampleCode); + String sampleReturnCode = param.getString("sampleReturnCode"); + BusinessSubSampleDO businessSubSampleDO = businessSubSampleService.getBySampleReturnCode(sampleReturnCode); if(businessSubSampleDO == null) return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "未查询到此样品！"); //判断样品状态 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchDetailController.java index d70ec9f..fcec9ee 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchDetailController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchDetailController.java @@ -50,11 +50,11 @@ public class BusinessSampleDispatchDetailController implements BusinessControlle @GetMapping("/searchBySampleCode") @Operation(summary = "扫码查询待归还样品") public CommonResult searchBySampleCode(HttpServletRequest request) { - String sampleCode = request.getParameter("sampleCode"); - if(ObjectUtils.isEmpty(sampleCode)) + String sampleReturnCode = request.getParameter("sampleReturnCode"); + if(ObjectUtils.isEmpty(sampleReturnCode)) return CommonResult.error(BUSINESS_SAMPLE_DISPATCH_DETAIL_NOT_EXISTS.getCode(), "请输入样品编号！"); BusinessSampleDispatchDetailPageReqVO reqVO = new BusinessSampleDispatchDetailPageReqVO(); - reqVO.setSampleCode(sampleCode); + reqVO.setSampleReturnCode(sampleReturnCode); reqVO.setBorrowStatus("1"); reqVO.setGivebackStatus("0"); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java index 9619050..6b45a6d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java @@ -121,6 +121,13 @@ public class BusinessSubSampleController implements BusinessControllerMarker { return success(pageResult); } + @GetMapping("/selectPageForDispatch") + @Operation(summary = "查询可申请调拨子样") + public CommonResult> selectPageForDispatch(@Valid BusinessSubSamplePageReqVO pageReqVO) { + PageResult pageResult = businessSubSampleService.selectPageForDispatch(pageReqVO); + return success(pageResult); + } + @GetMapping("/page-task") @Operation(summary = "获得子样业务分页") //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchDetailPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchDetailPageReqVO.java index 4e2d30e..681174a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchDetailPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchDetailPageReqVO.java @@ -60,8 +60,8 @@ public class BusinessSampleDispatchDetailPageReqVO extends PageParam { //================================扩展字段============================================= - @Schema(description = "样品号") - private String sampleCode; + @Schema(description = "样品归库码") + private String sampleReturnCode; @Schema(description = "idsList") private List idList; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchPageReqVO.java index 78ebfdc..5468cb9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchPageReqVO.java @@ -64,6 +64,12 @@ public class BusinessSampleDispatchPageReqVO extends PageParam { @Schema(description = "备注") private String remark; + @Schema(description = "仓库名称") + private String warehouseName; + + @Schema(description = "仓库编码") + private String warehouseCode; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchRespVO.java index 5cc4f43..d7f3a31 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchRespVO.java @@ -83,6 +83,14 @@ public class BusinessSampleDispatchRespVO { @ExcelProperty("备注") private String remark; + @Schema(description = "仓库名称") + @ExcelProperty("仓库名称") + private String warehouseName; + + @Schema(description = "仓库编码") + @ExcelProperty("仓库编码") + private String warehouseCode; + @Schema(description = "创建时间") @ExcelProperty("创建时间") private LocalDateTime createTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchSaveReqVO.java index 221b983..e8b4508 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchSaveReqVO.java @@ -64,6 +64,12 @@ public class BusinessSampleDispatchSaveReqVO { @Schema(description = "备注") private String remark; + @Schema(description = "仓库名称") + private String warehouseName; + + @Schema(description = "仓库编码") + private String warehouseCode; + //=========================扩展字段======================================= @Schema(description = "新增子样id") List addSubSampleIds; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSamplePageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSamplePageReqVO.java index eac0ee6..cf97617 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSamplePageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSamplePageReqVO.java @@ -141,9 +141,16 @@ public class BusinessSubSamplePageReqVO extends PageParam { @Schema(description = "分析部门状态") private String assayDepartmentStatus; - - //扩展字段 + + //=======================================扩展字段======================================= @Schema(description = "库位编码") private String warehouseLocationCode; + @Schema(description = "仓库编码") + private String warehouseCode; + + //是否过滤已申请调拨的数据: 1-是， 其他值：否 + @Schema(description = "是否过滤已申请调拨的数据") + private String hideDispatchData; + } \ 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/controller/vo/BusinessSubSampleReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleReqVO.java index 2eac248..e116687 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleReqVO.java @@ -134,4 +134,6 @@ public class BusinessSubSampleReqVO { @Schema(description = "备注") private String remark; + + } \ 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/dataobject/BusinessSampleDispatchDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSampleDispatchDO.java index c612afa..52d58f5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSampleDispatchDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSampleDispatchDO.java @@ -119,4 +119,11 @@ public class BusinessSampleDispatchDO extends BusinessBaseDO { @TableField("RMK") private String remark; + //仓库编码 + @TableField("WRH_CD") + private String warehouseCode; + + //仓库名称 + @TableField("WRH_NAME") + private String warehouseName; } \ 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/BusinessSampleDispatchDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleDispatchDetailMapper.java index f171aba..3ef2110 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleDispatchDetailMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleDispatchDetailMapper.java @@ -44,7 +44,7 @@ public interface BusinessSampleDispatchDetailMapper extends BaseMapperX selectPageForDispatch(IPage page, @Param("param") BusinessSubSamplePageReqVO reqVO); + } \ 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/BusinessSampleDispatchServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleDispatchServiceImpl.java index d4fdb1c..9cc8ac8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleDispatchServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleDispatchServiceImpl.java @@ -69,7 +69,7 @@ public class BusinessSampleDispatchServiceImpl implements BusinessSampleDispatch businessSampleDispatchDetailService.deleteBusinessSampleDispatchDetailListByIds(removeDetailIds); } //处理新增 - if(!addSubSampleIds.isEmpty()){ + if(addSubSampleIds != null && !addSubSampleIds.isEmpty()){ List detailList = businessSampleDispatchDetailService.listByParID(id); //去除已添加过的 List hasIds = detailList.stream().map(BusinessSampleDispatchDetailDO::getBusinessSubSampleId).toList(); @@ -160,6 +160,7 @@ public class BusinessSampleDispatchServiceImpl implements BusinessSampleDispatch BusinessHandoverRecordSubDO handoverRecord = new BusinessHandoverRecordSubDO(); handoverRecord.setBusinessSubSampleId(detail.getBusinessSubSampleId()); handoverRecord.setSampleCode(detail.getSampleCode()); + handoverRecord.setSampleFlowNodeKey(QmsCommonConstant.FLOW_SAMPLE_STORAGE); handoverRecord.setOperationTime(borrowTime); handoverRecord.setOperator(warehouseUser); handoverRecord.setOperatorId(warehouseUserId); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleService.java index abcdcea..18cd2e3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleService.java @@ -68,6 +68,8 @@ public interface BusinessSubSampleService { */ PageResult getBusinessSubSamplePage(BusinessSubSamplePageReqVO pageReqVO); + PageResult selectPageForDispatch(BusinessSubSamplePageReqVO pageReqVO); + /** * 获取子样分析班组分页 * @param pageReqVO 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 2c759c1..05a9fc3 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 @@ -3,11 +3,12 @@ package com.zt.plat.module.qms.business.bus.service; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; import com.zt.plat.module.qms.business.bus.controller.vo.*; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessHandoverRecordSubDO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleHandoverDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleHandoverDetailDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleDO; @@ -159,7 +160,15 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { return page; } - @Override + @Override + public PageResult selectPageForDispatch(BusinessSubSamplePageReqVO pageReqVO) { + IPage page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + Page pageList = businessSubSampleMapper.selectPageForDispatch(page, pageReqVO); + PageResult ret = new PageResult<>(pageList.getRecords(), pageList.getTotal()); + return ret; + } + + @Override public PageResult getAnalysisGroupPage(BusinessSubSamplePageReqVO pageReqVO) { PageResult page = businessSubSampleMapper.selectAnalysisGroupPage(pageReqVO); List list = page.getList(); @@ -210,9 +219,9 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { public BusinessSubSampleRespVO execReturnToStock(BusinessSubSampleSaveReqVO reqVo) { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); String loginUserName = SecurityFrameworkUtils.getLoginUserNickname(); - BusinessSubSampleDO businessSubSampleDO = this.getBySampleReturnCode(reqVo.getSampleCode()); + BusinessSubSampleDO businessSubSampleDO = this.getBySampleReturnCode(reqVo.getSampleReturnCode()); if(businessSubSampleDO == null) - throw exception(BUSINESS_SUB_SAMPLE_NOT_EXISTS); + throw exception0(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "未查询到子样数据，请检查：样品所处环节和是否已归库！"); //检查样品状态 if(!QmsCommonConstant.FLOW_SAMPLE_STORAGE.equals(businessSubSampleDO.getSampleFlowNodeKey())) throw exception0(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "子样任务不在“归库”环节，请检查前置任务是否已完成！"); @@ -222,6 +231,16 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { //判断仓库位置 Long configSubSampleId = businessSubSampleDO.getConfigSubSampleId(); ConfigSubSampleDO configSubSampleDO = configSubSampleService.getConfigSubSample(configSubSampleId); + String cfgLocationCode = configSubSampleDO.getConfigWarehouseLocationCode(); //子样配置表的仓库编码 + ConfigWarehouseLocationDO locationDO = configWarehouseLocationService.getLocationByCode(reqVo.getWarehouseLocationCode(), QmsWarehouseLocationConstant.WAREHOUSE_TYPE_SAMPLE); + if(locationDO == null) + throw exception(CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS); + ConfigWarehouseLocationDO warehouseDO = configWarehouseLocationService.getConfigWarehouseLocation(locationDO.getParentId()); + if(warehouseDO == null) + throw exception0(CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS.getCode(), "库位编码对应的仓库不存在，请联系管理员处理！"); + if(!warehouseDO.getCode().equals(cfgLocationCode)) + throw exception0(CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS.getCode(), "您归库的样品不该进入此库，请检查后再重新归库。应归入仓库（编码）：" + cfgLocationCode); + //判断归库码 Integer isGenerateSimpleCode = configSubSampleDO.getIsGenerateSimpleCode(); Integer printFlag = 0; if(1 == isGenerateSimpleCode){ @@ -235,9 +254,7 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { } } - ConfigWarehouseLocationDO locationDO = configWarehouseLocationService.getLocationByCode(reqVo.getWarehouseLocationCode(), QmsWarehouseLocationConstant.WAREHOUSE_TYPE_SAMPLE); - if(locationDO == null) - throw exception(CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS); + //更新入库状态 businessSubSampleDO.setReturnStatus(QmsCommonConstant.COMPLETED); @@ -273,7 +290,7 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { public Integer execTakeOff(JSONObject reqVo) { String actionWay = reqVo.getString("actionWay"); String warehouseLocationCode = reqVo.getString("warehouseLocationCode"); - String sampleCode = reqVo.getString("sampleCode"); + String sampleReturnCode = reqVo.getString("sampleReturnCodes"); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); String loginUserName = SecurityFrameworkUtils.getLoginUserNickname(); //查询要操作的样品 @@ -282,10 +299,10 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { queryWrapper.eq(BusinessSubSampleDO::getReturnStatus, QmsCommonConstant.COMPLETED); if(QmsWarehouseLocationConstant.SAMPLE_TAKE_OFF_ACTION_WAY_SAMPLE.equals(actionWay)){ //按编号查询样品 - if(ObjectUtils.isEmpty(sampleCode)) + if(ObjectUtils.isEmpty(sampleReturnCode)) throw exception0(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "缺少样品编号参数！"); - List sampleCodes = Arrays.asList(sampleCode.split( ",")); - queryWrapper.in(BusinessSubSampleDO::getSampleCode, sampleCodes); + List sampleReturnCodes = Arrays.asList(sampleReturnCode.split( ",")); + queryWrapper.in(BusinessSubSampleDO::getSampleReturnCode, sampleReturnCodes); } else if(QmsWarehouseLocationConstant.SAMPLE_TAKE_OFF_ACTION_WAY_LOCATION.equals(actionWay)){ //按库位查询样品 @@ -355,7 +372,7 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { String actionWay = reqVo.getString("actionWay"); String targetLocation = reqVo.getString("targetLocation"); String warehouseLocationCode = reqVo.getString("warehouseLocationCode"); - String sampleCode = reqVo.getString("sampleCode"); + String sampleReturnCode = reqVo.getString("sampleReturnCode"); if(ObjectUtils.isEmpty(targetLocation)) throw exception0(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "缺少目标库位参数！"); ConfigWarehouseLocationDO targetLocationDO = configWarehouseLocationService.getLocationByCode(targetLocation, QmsWarehouseLocationConstant.WAREHOUSE_TYPE_SAMPLE); @@ -365,10 +382,10 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { queryWrapper.eq(BusinessSubSampleDO::getReturnStatus, QmsCommonConstant.COMPLETED); if(QmsWarehouseLocationConstant.SAMPLE_TAKE_OFF_ACTION_WAY_SAMPLE.equals(actionWay)){ //按编号查询样品 - if(ObjectUtils.isEmpty(sampleCode)) + if(ObjectUtils.isEmpty(sampleReturnCode)) throw exception0(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "缺少样品编号参数！"); - List sampleCodes = Arrays.asList(sampleCode.split( ",")); - queryWrapper.in(BusinessSubSampleDO::getSampleCode, sampleCodes); + List sampleReturnCodes = Arrays.asList(sampleReturnCode.split( ",")); + queryWrapper.in(BusinessSubSampleDO::getSampleReturnCode, sampleReturnCodes); } else if(QmsWarehouseLocationConstant.SAMPLE_TAKE_OFF_ACTION_WAY_LOCATION.equals(actionWay)){ //按库位查询样品 @@ -377,7 +394,7 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService { ConfigWarehouseLocationDO locationDO = configWarehouseLocationService.getLocationByCode(warehouseLocationCode, QmsWarehouseLocationConstant.WAREHOUSE_TYPE_SAMPLE); if(locationDO == null) throw exception(CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS); - queryWrapper.eq(BusinessSubSampleDO::getConfigWarehouseLocationInfomationId, warehouseLocationCode); + queryWrapper.eq(BusinessSubSampleDO::getConfigWarehouseLocationInfomationId, locationDO.getId()); }else{ throw exception0(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "actionWay参数错误！"); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java index 356bf06..40b2521 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java @@ -123,10 +123,10 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService String hasRange = jsonObject.getString("hasRange"); //是否有检出限 String verticalFlag = jsonObject.getString("verticalFlag"); //vertical-纵表， 否则为横表 String fixedFields = jsonObject.getString("fixedFields"); //固定检测项。如果固定检测项，则以检测项作为数据Key - if("1".equals(verticalFlag)){ + if("1".equals(verticalFlag)){ //纵表 return assembleVerticalData(fieldList, dataList, customConfig); } - if(!ObjectUtils.isEmpty(fixedFields)){ + if(!ObjectUtils.isEmpty(fixedFields)){ //固定列 return assembleFixedFieldsData(fieldList, dataList, customConfig); } if(!ObjectUtils.isEmpty(dynamicColCountStr)) dynamicColCount = Integer.parseInt(dynamicColCountStr); @@ -152,7 +152,13 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService if(rowCountOneSample > 1){ allRowCount = (1 + dataLength + emptyRowCount + 9) * rowCountOneSample + emptyRowCount; //(标题 + 样品数 + 空行) * 但样品行数 + 末尾行 } - List rowList = new ArrayList<>(Arrays.asList(new JSONObject[allRowCount + 1])); + List rowList = new ArrayList<>(); + for(int i = 0; i < maxRowCount; i++){ + JSONObject row = new JSONObject(); + row.put("col01", " "); + rowList.add( row); + } + //=============处理表头============ JSONObject t = new JSONObject(); @@ -393,6 +399,13 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService if(!ObjectUtils.isEmpty(maxRowCountStr)) maxRowCount = Integer.parseInt(maxRowCountStr); List rowList = new ArrayList<>(); + for(int i = 0; i < maxRowCount; i++){ + JSONObject row = new JSONObject(); + row.put("sampleNameCode", " "); + row.put("sampleName", " "); + row.put("sampleCode", " "); + rowList.add( row); + } for(ReportDocumentDataDO dataDO : dataList) { JSONObject t = new JSONObject(); String documentContent = dataDO.getDocumentContent(); @@ -524,7 +537,6 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService return rowList; } - @Override public CommonResult> listByMainDataId(Long mainDataId) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml index b9a6678..5c3c893 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml @@ -9,4 +9,83 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> + + + \ No newline at end of file