rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
yf001217 2026-06-14 16:41:32 +08:00
parent 5f60cba0c6 3484122061
commit 085349bd08
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nflg-qms-admin/src/main/java/com/nflg/qms/admin/pojo/qo/QmsInspectionStandardSaveQO.java
View File

@ -42,11 +42,11 @@ public class QmsInspectionStandardSaveQO {
*/
private String drawingUrl;
/**
* 包装方式ID
*/
@NotNull
private Long packagingMethodId;
// /**
// * 包装方式ID
// */
// @NotNull
// private Long packagingMethodId;
/**
* 检验周期

4
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java
View File

@ -639,7 +639,7 @@ public class QmsInspectionStandardControllerService {
// 3. 更新字段（不修改版本号）
standard.setMaterialId(qo.getMaterialId());
standard.setDrawingUrl(qo.getDrawingUrl());
standard.setPackagingMethodId(qo.getPackagingMethodId());
// standard.setPackagingMethodId(qo.getPackagingMethodId());
standard.setInspectionCycle(qo.getInspectionCycle());
standard.setVersion(qo.getVersion());
standard.setIsEnabled(qo.getIsEnabled());
@ -702,7 +702,7 @@ public class QmsInspectionStandardControllerService {
QmsInspectionStandard newStandard = new QmsInspectionStandard();
newStandard.setMaterialId(qo.getMaterialId());
newStandard.setDrawingUrl(qo.getDrawingUrl());
newStandard.setPackagingMethodId(qo.getPackagingMethodId());
// newStandard.setPackagingMethodId(qo.getPackagingMethodId());
newStandard.setInspectionCycle(qo.getInspectionCycle());
newStandard.setVersion(qo.getVersion());
newStandard.setIsEnabled(qo.getIsEnabled());