zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:调整物料检定及批次拆分

Browse Source
This commit is contained in:
shusir
2026-03-10 18:10:47 +08:00
parent 5eb77f6ede
commit fe44b27539
17 changed files with 146 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInfomationController.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.resource.material.controller.admin;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationRespVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationSaveReqVO;
@@ -39,6 +40,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@RestController
@RequestMapping("/qms/resource/material-infomation")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialInfomationController implements BusinessControllerMarker {

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleDetailController.java
View File

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailRespVO;
@@ -33,6 +34,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/qms/resource/material-lifecycle-detail")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialLifecycleDetailController implements BusinessControllerMarker {

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialStandardSolutionController.java
View File

@@ -9,6 +9,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceProductPageReqVO;
import com.zt.plat.module.qms.resource.device.controller.vo.DeviceProductRespVO;
@@ -42,6 +43,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RequestMapping("/qms/resource/material-standard-solution")
@Validated
@FileUploadController(source = "qms.materialstandardsolution")
@DeptDataPermissionIgnore(enable = "true")
public class MaterialStandardSolutionController extends AbstractFileUploadController implements BusinessControllerMarker{
static {

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialUseEndReuseController.java
View File

@@ -9,6 +9,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialUseEndReusePageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialUseEndReuseRespVO;
@@ -36,6 +37,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RequestMapping("/qms/resource/material-use-end-reuse")
@Validated
@FileUploadController(source = "qms.materialuseendreuse")
@DeptDataPermissionIgnore(enable = "true")
public class MaterialUseEndReuseController extends AbstractFileUploadController implements BusinessControllerMarker{
static {

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialUseEndReuseDetailController.java
View File

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialUseEndReuseDetailPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialUseEndReuseDetailRespVO;
@@ -33,6 +34,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/qms/resource/material-use-end-reuse-detail")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialUseEndReuseDetailController implements BusinessControllerMarker {

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialUseRecordController.java
View File

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.*;
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialUseRecordDO;
@@ -33,6 +34,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/qms/resource/material-use-record")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialUseRecordController implements BusinessControllerMarker {

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialUseRecordDetailController.java
View File

@@ -7,6 +7,7 @@ import com.zt.plat.framework.common.pojo.PageParam;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialUseRecordDetailPageReqVO;
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialUseRecordDetailRespVO;
@@ -35,6 +36,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
@RestController
@RequestMapping("/qms/resource/material-use-record-detail")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class MaterialUseRecordDetailController implements BusinessControllerMarker {

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java
View File

@@ -114,6 +114,10 @@ public class MaterialLifecycleDetailRespVO {
@ExcelProperty("批次或工段数量")
private BigDecimal inboundQuantity;
@Schema(description = "批次或工段可用数量")
@ExcelProperty("批次或工段可用数量")
private BigDecimal remaineQuantity;
@Schema(description = "影响数量", example = "15772")
@ExcelProperty("影响数量")
private String influenceCount;

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductSaveReqVO.java
View File

@@ -1,6 +1,5 @@
package com.zt.plat.module.qms.resource.material.controller.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.zt.plat.module.qms.resource.material.valid.AddGroup;
import com.zt.plat.module.qms.resource.material.valid.UpdateGroup;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -100,10 +99,10 @@ public class MaterialProductSaveReqVO {
private Integer assayFlag;
@Schema(description = "是否进行库存预警,1-是，0-否")
private Integer InventoryAlarmFlag;
private Integer inventoryAlarmFlag;
@Schema(description = "库存预警区间,json格式配置")
private String InventoryAlarmRange;
private String inventoryAlarmRange;
@Schema(description = "备注")
private String remark;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/query/MaterialProductQueryVO.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.resource.material.controller.vo.query;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -40,7 +41,10 @@ public class MaterialProductQueryVO {
private Integer assayFlag;
@Schema(description = "是否进行库存预警,1-是，0-否")
private Integer InventoryAlarmFlag;
private Integer inventoryAlarmFlag;
@Schema(description = "分类其他配置")
private String categoryCustomConfig;
@Schema(description = "备注")
private String remark;

Some files were not shown because too many files have changed in this diff Show More