From 1719035b389120ed30a15bf3d62202a87bfa0ea3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 17:04:58 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 1 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 11 -----------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 15 +++++++++++++++
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 2cd2283..ea755fb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -217,6 +217,9 @@
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
}
+ if (Objects.isNull(dto.getReceiptQty()) || Double.compare(dto.getReceiptQty(), 0.0) == 0) {
+ throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
+ }
orderItem.setQty(dto.getReceiptQty())
.setProdTime(dto.getProdTime());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
index b9427e9..db6a786 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -80,7 +80,6 @@
return qlyInspectService.saveSelected(param, loginUserId);
}
-
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/list")
public R list(@RequestBody Map<String, Object> map) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
index 29bb484..a80dafc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
@@ -43,6 +43,9 @@
@ApiModelProperty(value= "涓诲崟ID")
private Long ispectId;
+ @ApiModelProperty("璐ㄦ鍗曠姸鎬�")
+ private String isptStatus;
+
@ApiModelProperty("鍗曟嵁鏄庣粏ID")
private Long asnItemId;
@@ -214,6 +217,18 @@
// null // 澶囨敞
// );
+ public String getIsptStatus$() {
+ if (null == this.isptStatus) {return null; }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_QLY_INSPECT_STATUS)
+ .eq(DictData::getValue, this.isptStatus));
+ if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ return null;
+ }
+ return dictDatas.getLabel();
+ }
+
public String getIsptResult$() {
if (null == this.isptResult) {return null; }
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index bbc13ea..07896ec 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -117,17 +117,6 @@
}
}
}
-// IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, queryWrapper);
-// /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
-// List<Map<String, Object>> mapList = reulst.getRecords();
-// if (!mapList.isEmpty()) {
-// mapList.forEach(map -> {
-// if (!Objects.isNull(map.get("fieldsIndex"))) {
-// FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
-// }
-// });
-// }
-
/**鎷兼帴鎵╁睍瀛楁*/
PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
List<Matnr> records = page.getRecords();
--
Gitblit v1.9.1