feat:物料通用流程

# Conflicts:
#	zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

pom.xml

@@ -17,7 +17,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.44</revision>
+        <revision>3.0.45</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -177,8 +177,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>dev</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -190,8 +190,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>prod</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>
@@ -203,8 +203,8 @@
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>local</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
-                <config.username/>
-                <config.password/>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
                 <config.version>1.0.0</config.version>
             </properties>
         </profile>

qms-server/build-docker-push.bat

@@ -0,0 +1,11 @@
+call docker build -t zgty-qms:v6.0.0 .
+
+call docker tag zgty-qms:v6.0.0 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
+
+call docker push 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
+
+call docker rmi 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
+
+call docker rmi zgty-qms:v6.0.0
+
+pause

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

@@ -87,7 +87,7 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_PERMISSION_NOT_EXISTS = new ErrorCode(1_032_050_000, "权限配置不存在");
 	ErrorCode CONFIG_PERMISSION_DUPLICATE = new ErrorCode(1_032_050_000, "权限配置数据有误");
 	ErrorCode CONFIG_WAREHOUSE_LOCATION_NOT_EXISTS = new ErrorCode(1_032_050_000, "存放位置不存在");
-	ErrorCode CONFIG_WAREHOUSE_LOCATION_CODE_DUPLICATE = new ErrorCode(1_032_050_000, "库位编码重复，请检查库位数据，或联系管理员处理！");
+	ErrorCode CONFIG_WAREHOUSE_LOCATION_CODE_DUPLICATE = new ErrorCode(1_032_050_000, "库位编码重复，请检查！");
 
 	/*=================================bus 检验业务  1_032_100_000 ~ 1_032_149_999==================================*/
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_REGISTRATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记业务不存在");
@@ -149,6 +149,9 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材不存在");
 	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在");
 
+	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在");
+	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程不存在");
+
 
 	/*================================= tx 1_032_200_000 ~ 1_032_249_999 ==================================*/
 

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java

@@ -184,4 +184,14 @@ public interface QmsCommonConstant {
     
     /** 手动 **/
     String MANUAL = "manual";
+
+
+    /** 样品库操作类型： 归库、调拨、下架 **/
+    String SAMPLE_STORAGE_OPERATION_TYPE_STORAGE = "storage";
+    String SAMPLE_STORAGE_OPERATION_TYPE_TRANSFER = "dispatch";
+    String SAMPLE_STORAGE_OPERATION_TYPE_TAKEN_OFF = "take_off";
+
+
+    /** 允许提交 **/
+    String ALLOW_SUBMIT = "allow_submit";
 }

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsPermissionConstant.java

@@ -17,7 +17,8 @@ public interface QmsPermissionConstant {
     String TARGET_TYPE_CUSTOM = "custom";
 
     //======================各业务模块权限常量=============================
-    //报告发起权限
-    String REPORT_DOCUMENT_TYPE_START = "report_document_type_start";
+
+    String REPORT_DOCUMENT_TYPE_START = "report_document_type_start";                   //报告发起权限
+    String SAMPLE_WAREHOUSE_ADMIN = "sample_warehouse_admin";                   //样品库管理员
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleDispatchController.java

@@ -1,12 +1,16 @@
 package com.zt.plat.module.qms.business.bus.controller.admin;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleDispatchPageReqVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleDispatchRespVO;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleDispatchSaveReqVO;
+import com.zt.plat.module.qms.business.bus.controller.vo.*;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleDispatchDetailDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
+import com.zt.plat.module.qms.business.bus.service.BusinessSampleDispatchDetailService;
 import com.zt.plat.module.qms.business.bus.service.BusinessSubSampleService;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigWarehouseLocationPageReqVO;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigWarehouseLocationRespVO;
+import com.zt.plat.module.qms.business.config.service.ConfigWarehouseLocationService;
 import com.zt.plat.module.qms.enums.QmsCommonConstant;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -46,7 +50,9 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
 
 
     @Resource private BusinessSampleDispatchService businessSampleDispatchService;
+    @Resource private BusinessSampleDispatchDetailService businessSampleDispatchDetailService;
     @Resource private BusinessSubSampleService businessSubSampleService;
+    @Resource private ConfigWarehouseLocationService configWarehouseLocationService;
 
     @PostMapping("/createTempData")
     @Operation(summary = "创建临时数据")
@@ -60,6 +66,7 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
     @Operation(summary = "更新样品调拨")
     public CommonResult<Boolean> updateBusinessSampleDispatch(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
         updateReqVO.setCancelStatus("0");
+        updateReqVO.setFlowStatus(QmsCommonConstant.NOT_START);
         businessSampleDispatchService.updateBusinessSampleDispatch(updateReqVO);
         return success(true);
     }
@@ -67,7 +74,7 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
     @PostMapping("/addOrRemoveSample")
     @Operation(summary = "增加或移除样品")
     public CommonResult<Boolean> addOrRemoveSample(@Valid @RequestBody BusinessSampleDispatchSaveReqVO updateReqVO) {
-        businessSampleDispatchService.addOrRemoveSample(updateReqVO);
+        businessSampleDispatchService.addOrRemoveSample(updateReqVO, true);
         return success(true);
     }
 
@@ -76,10 +83,26 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
     public CommonResult<Boolean> addBySampleReturnCode(@RequestBody JSONObject param) {
         String id = param.getString("id");
         String sampleReturnCode = param.getString("sampleReturnCode");
+        String warehouseCode = param.getString("warehouseCode");
+        if(ObjectUtils.isEmpty(warehouseCode)){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "请选择仓库，再扫描样品！");
+        }
         BusinessSubSampleDO businessSubSampleDO = businessSubSampleService.getBySampleReturnCode(sampleReturnCode);
         if(businessSubSampleDO == null)
             return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "未查询到此样品！");
-        //判断样品状态
+        //判断样品状态、库位
+//        String sampleWarehouseCode = businessSubSampleDO.getWarehouseCode();  //todo 判断库位
+        ConfigWarehouseLocationPageReqVO warehouseReqVO = new ConfigWarehouseLocationPageReqVO();
+        warehouseReqVO.setId(businessSubSampleDO.getConfigWarehouseLocationInfomationId());
+        PageResult<ConfigWarehouseLocationRespVO> warehousePage = configWarehouseLocationService.getConfigWarehouseLocationPage(warehouseReqVO);
+        if(warehousePage.getTotal() == 0){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "未查询到样品所在仓库，请检查样品码是否正确！");
+        }
+        ConfigWarehouseLocationRespVO warehouse = warehousePage.getList().get(0);
+        if(!warehouseCode.equals(warehouse.getWarehouseCode())){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "此样品所在仓库为："+warehouse.getWarehouseName()+"，请检查样品码是否正确！");
+        }
+
         String returnStatus = businessSubSampleDO.getReturnStatus();
         if(!QmsCommonConstant.COMPLETED.equals(returnStatus)){
             return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "样品状态为："+returnStatus+"，不能调拨！");
@@ -88,14 +111,19 @@ public class BusinessSampleDispatchController implements BusinessControllerMarke
         if("1".equals(dispatchStatus)){
             return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "样品已被调拨：请归还后再调拨！");
         }
-        //todo 重复校验
-
+        BusinessSampleDispatchDetailPageReqVO reqVO = new BusinessSampleDispatchDetailPageReqVO();
+        reqVO.setParentId(Long.valueOf(id));
+        reqVO.setSampleReturnCode(sampleReturnCode);
+        PageResult<BusinessSampleDispatchDetailExtendRespVO> pageDetailList = businessSampleDispatchDetailService.getBusinessSampleDispatchDetailPage(reqVO);
+        if(pageDetailList.getTotal() > 0){
+            return CommonResult.error(BUSINESS_SUB_SAMPLE_NOT_EXISTS.getCode(), "次样品已添加，请勿重复添加！");
+        }
         List<Long> sampleIds = new ArrayList<>();
         sampleIds.add(businessSubSampleDO.getId());
         BusinessSampleDispatchSaveReqVO updateReqVO = new BusinessSampleDispatchSaveReqVO();
         updateReqVO.setId(Long.valueOf(id));
         updateReqVO.setAddSubSampleIds(sampleIds);
-        businessSampleDispatchService.addOrRemoveSample(updateReqVO);
+        businessSampleDispatchService.addOrRemoveSample(updateReqVO, false);
         return success(true);
     }
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleHandoverController.java

@@ -37,7 +37,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/qms/business-sample-handover")
 @Validated
-public class BusinessSampleHandoverController implements BusinessControllerMarker {
+public class BusinessSampleHandoverController {
 
 
     @Resource

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<PageResult<BusinessSampleHandoverDetailRespVO>> takeOffPageList(@Valid BusinessSampleHandoverDetailPageReqVO pageReqVO) {
+        PageResult<BusinessSampleHandoverDetailRespVO> pageResult = businessSampleHandoverDetailService.takeOffPageList(pageReqVO);
+        return success(pageResult);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出样品交接明细 Excel")
     //@PreAuthorize("@ss.hasPermission('qms:business-sample-handover-detail:export')")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSubSampleController.java

@@ -90,6 +90,14 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     	return success(result);
     }
 
+    @GetMapping("/getPrintSubSample")
+    @Operation(summary = "获得打印子样业务")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<BusinessSubSampleExtendRespVO> getPrintSubSample(@RequestParam("id") Long id) {
+    	BusinessSubSampleExtendRespVO result = businessSubSampleService.getPrintSubSample(id);
+    	return success(result);
+    }
+
     @GetMapping("/list")
     @Operation(summary = "获得子样业务列表")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleAnalysisAuditController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
@@ -25,7 +26,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis-audit")
 @Validated
-public class SampleAnalysisAuditController {
+public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleAnalysisAuditService sampleAnalysisAuditService;