root/yuenanFuJia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:基础功能优化

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2025-07-16 16:07:40 +08:00
parent d6d30ef859
commit 0a15908907
11 changed files with 162 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java
View File

@@ -99,9 +99,14 @@ public class ClassStandardController {
@GetMapping("/getClassTable")
@Log("查询物料基础类型")
//@PreAuthorize("@el.check('materialtype:list')")
public ResponseEntity<Object> queryClassTable(@RequestParam Map whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(iMdPbClassstandardService.queryClassTable(whereJson, page)), HttpStatus.OK);
}
@GetMapping("/getAllClass")
@Log("查询物料基础类型")
public ResponseEntity<Object> getAllClass(@RequestParam Map whereJson) {
return new ResponseEntity<>(iMdPbClassstandardService.getAllClass(whereJson), HttpStatus.OK);
}
}

6
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java
View File

@@ -98,4 +98,10 @@ public interface IMdPbClassstandardService extends IService<MdPbClassstandard> {
* @return
*/
List<String> getAllChildIdSet(String class_id);
/**
* 获取分类名称下拉框
* @return List<JSONObject>
*/
List<JSONObject> getAllClass(Map whereJson);
}

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java
View File

@@ -75,7 +75,7 @@ public class MdMeMaterialbase implements Serializable {
/**
* 工程图号
*/
private String print_no;
private String remark;
/**
* 物料分类标识

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java
View File

@@ -172,7 +172,7 @@ public class Structattr implements Serializable {
/**
* 是否启用
*/
private Boolean is_used;
private String is_used;
/**
* 是否判断高度

17
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java
View File

@@ -507,4 +507,21 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl<MdPbClassstandardM
ids.add(class_id);
return ids;
}
@Override
public List<JSONObject> getAllClass(Map whereJson) {
List<MdPbClassstandard> daoList = this.list(
new QueryWrapper<MdPbClassstandard>().lambda()
.eq(MdPbClassstandard::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否"))
);
List<JSONObject> result = new ArrayList<>();
daoList.forEach(row -> {
JSONObject json = new JSONObject();
json.put("label", row.getClass_name());
json.put("value", row.getClass_id());
result.add(json);
});
return result;
}
}

22
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
View File

@@ -154,20 +154,6 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
dto.setStor_code(bsrealStorattr.getStor_code());
dto.setStor_name(bsrealStorattr.getStor_name());
String storagevehicle_code = dto.getStoragevehicle_code();
if (ObjectUtil.isNotEmpty(storagevehicle_code)) {
// 暂时搁置后续添加
// WQLObject vehicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo");
// JSONObject obj = vehicleTab.query("storagevehicle_code = '" + storagevehicle_code + "'").uniqueResult(0);
// if (ObjectUtil.isEmpty(obj)) {
// throw new BadRequestException("未发现载具号为【" + storagevehicle_code + "】的载具信息");
// }
//
// dto.setStoragevehicle_id(obj.getLong
// ("storagevehicle_id"));
// dto.setStoragevehicle_type(obj.getString("storagevehicle_type"));
}
structattrMapper.insert(dto);
}
@@ -216,7 +202,6 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String struct_code = json.getString("struct_code");
String now = DateUtil.now();
String is_used = BaseDataEnum.IS_YES_NOT.code("是").equals(json.getString("is_used")) ? BaseDataEnum.IS_YES_NOT.code("否") : BaseDataEnum.IS_YES_NOT.code("是");
@@ -228,13 +213,6 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
structattrMapper.updateById(json.toJavaObject(Structattr.class));
// 暂时搁置后续添加
// json = new JSONObject();
// json.put("is_used", is_used);
// json.put("update_optid", currentUserId);
// json.put("update_optname", nickName);
// json.put("update_time", now);
// WQLObject.getWQLObject("sch_base_point").update(json, " point_code = '" + struct_code + "'");
}
@Override