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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-08-06 11:29:59 +08:00
parent e5bb0f9480
commit e75bae3a1a
15 changed files with 0 additions and 1389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/EndrealsemimaterialController.java
View File

@@ -1,69 +0,0 @@
package org.nl.wms.basedata.master.rest;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.annotation.Log;
import org.nl.wms.basedata.master.service.EndrealsemimaterialService;
import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* @author geng by
* @date 2022-05-31
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "成品对应半成品管理")
@RequestMapping("/api/endrealsemimaterial")
@Slf4j
public class EndrealsemimaterialController {
private final EndrealsemimaterialService endrealsemimaterialService;
@GetMapping
@Log("查询成品对应半成品")
@ApiOperation("查询成品对应半成品")
//@PreAuthorize("@el.check('endrealsemimaterial:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(endrealsemimaterialService.queryAll(whereJson,page),HttpStatus.OK);
}
@PostMapping
@Log("新增成品对应半成品")
@ApiOperation("新增成品对应半成品")
//@PreAuthorize("@el.check('endrealsemimaterial:add')")
public ResponseEntity<Object> create(@Validated @RequestBody EndrealsemimaterialDto dto){
endrealsemimaterialService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping("/updateRawmaterial")
@Log("修改成品对应半成品")
@ApiOperation("修改成品对应半成品")
//@PreAuthorize("@el.check('semirealrawmaterial:edit')")
public ResponseEntity<Object> updateRawmaterial(@RequestBody JSONObject param){
endrealsemimaterialService.updateRawmaterial(param);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除成品对应半成品")
@ApiOperation("删除成品对应半成品")
//@PreAuthorize("@el.check('endrealsemimaterial:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
endrealsemimaterialService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

69
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SemirealrawmaterialController.java
View File

@@ -1,69 +0,0 @@
package org.nl.wms.basedata.master.rest;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.annotation.Log;
import org.nl.wms.basedata.master.service.SemirealrawmaterialService;
import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* @author geng by
* @date 2022-05-31
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "半成品对应原材料管理")
@RequestMapping("/api/semirealrawmaterial")
@Slf4j
public class SemirealrawmaterialController {
private final SemirealrawmaterialService semirealrawmaterialService;
@GetMapping
@Log("查询半成品")
@ApiOperation("查询半成品")
//@PreAuthorize("@el.check('semirealrawmaterial:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(semirealrawmaterialService.queryAll(whereJson,page),HttpStatus.OK);
}
@PostMapping
@Log("新增半成品对应原材料")
@ApiOperation("新增半成品对应原材料")
//@PreAuthorize("@el.check('semirealrawmaterial:add')")
public ResponseEntity<Object> create(@Validated @RequestBody SemirealrawmaterialDto dto){
semirealrawmaterialService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@Log("删除半成品对应原材料")
@ApiOperation("删除半成品对应原材料")
//@PreAuthorize("@el.check('semirealrawmaterial:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
semirealrawmaterialService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PutMapping("/updateRawmaterial")
@Log("修改半成品对应原材料")
@ApiOperation("修改半成品对应原材料")
//@PreAuthorize("@el.check('semirealrawmaterial:edit')")
public ResponseEntity<Object> updateRawmaterial(@RequestBody JSONObject param){
semirealrawmaterialService.updateRawmaterial(param);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}

66
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/EndrealsemimaterialService.java
View File

@@ -1,66 +0,0 @@
package org.nl.wms.basedata.master.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
/**
* @description 服务接口
* @author geng by
* @date 2022-05-31
**/
public interface EndrealsemimaterialService {
/**
* 查询数据分页
* @param whereJson 条件
* @param page 分页参数
* @return Map<String,Object>
*/
Map<String,Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
* @param whereJson 条件参数
* @return List<EndrealsemimaterialDto>
*/
List<EndrealsemimaterialDto> queryAll(Map whereJson);
/**
* 根据ID查询
* @param relation_id ID
* @return Endrealsemimaterial
*/
EndrealsemimaterialDto findById(Long relation_id);
/**
* 根据编码查询
* @param code code
* @return Endrealsemimaterial
*/
EndrealsemimaterialDto findByCode(String code);
/**
* 创建
* @param dto /
*/
void create(EndrealsemimaterialDto dto);
/**
* 编辑
* @param param /
*/
void updateRawmaterial(JSONObject param);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Long[] ids);
}

66
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SemirealrawmaterialService.java
View File

@@ -1,66 +0,0 @@
package org.nl.wms.basedata.master.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
/**
* @description 服务接口
* @author geng by
* @date 2022-05-31
**/
public interface SemirealrawmaterialService {
/**
* 查询数据分页
* @param whereJson 条件
* @param page 分页参数
* @return Map<String,Object>
*/
Map<String,Object> queryAll(Map whereJson, Pageable page);
/**
* 查询所有数据不分页
* @param whereJson 条件参数
* @return List<SemirealrawmaterialDto>
*/
List<SemirealrawmaterialDto> queryAll(Map whereJson);
/**
* 根据ID查询
* @param relation_id ID
* @return Semirealrawmaterial
*/
SemirealrawmaterialDto findById(Long relation_id);
/**
* 根据编码查询
* @param code code
* @return Semirealrawmaterial
*/
SemirealrawmaterialDto findByCode(String code);
/**
* 创建
* @param dto /
*/
void create(SemirealrawmaterialDto dto);
/**
* 编辑
* @param param /
*/
void updateRawmaterial(JSONObject param);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Long[] ids);
}

133
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/EndrealsemimaterialServiceImpl.java
View File

@@ -1,133 +0,0 @@
package org.nl.wms.basedata.master.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.utils.SecurityUtils;
import org.nl.wms.basedata.master.service.EndrealsemimaterialService;
import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.nl.wql.util.WqlUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* @description 服务实现
* @author geng by
* @date 2022-05-31
**/
@Service
@RequiredArgsConstructor
@Slf4j
public class EndrealsemimaterialServiceImpl implements EndrealsemimaterialService {
@Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){
String search = MapUtil.getStr(whereJson, "search");
JSONObject map = new JSONObject();
map.put("flag", "1");
if (!StrUtil.isEmpty(search)) {
map.put("search", "%" + search + "%");
}
JSONObject json = WQL.getWO("QMD_ME_ENDREALRAWMATERIAL001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "endRealRawMaterial.semi_material_id desc");
return json;
}
@Override
public List<EndrealsemimaterialDto> queryAll(Map whereJson){
WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial");
JSONArray arr = wo.query().getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(EndrealsemimaterialDto.class);
return null;
}
@Override
public EndrealsemimaterialDto findById(Long relation_id) {
WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial");
JSONObject json = wo.query("relation_id = '" + relation_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){
return json.toJavaObject( EndrealsemimaterialDto.class);
}
return null;
}
@Override
public EndrealsemimaterialDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)){
return json.toJavaObject( EndrealsemimaterialDto.class);
}
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(EndrealsemimaterialDto dto) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
dto.setRelation_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateRawmaterial(JSONObject param) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
String relation_id = param.getString("relation_id");
String semi_material_id = param.getString("semi_material_id");
JSONObject map = new JSONObject();
map.put("semi_material_id", semi_material_id);
map.put("update_optid", currentUserId);
map.put("update_optname", nickName);
map.put("update_time", now);
WQLObject wo = WQLObject.getWQLObject("MD_ME_EndRealSemiMaterial");
wo.update(map, "relation_id = '" + relation_id + "'");
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial");
for (Long relation_id : ids) {
JSONObject param = new JSONObject();
param.put("relation_id", String.valueOf(relation_id));
param.put("raw_material_id", "");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
param.put("update_time", now);
wo.update(param);
}
}
}

133
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SemirealrawmaterialServiceImpl.java
View File

@@ -1,133 +0,0 @@
package org.nl.wms.basedata.master.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.utils.SecurityUtils;
import org.nl.wms.basedata.master.service.SemirealrawmaterialService;
import org.nl.wms.basedata.master.service.dto.SemirealrawmaterialDto;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.nl.wql.util.WqlUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* @author geng by
* @description 服务实现
* @date 2022-05-31
**/
@Service
@RequiredArgsConstructor
@Slf4j
public class SemirealrawmaterialServiceImpl implements SemirealrawmaterialService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String search = MapUtil.getStr(whereJson, "search");
JSONObject map = new JSONObject();
map.put("flag", "1");
if (!StrUtil.isEmpty(search)) {
map.put("search", "%" + search + "%");
}
JSONObject json = WQL.getWO("QMD_ME_SEMIREALRAWMATERIAL001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "semiRealRawMaterial.raw_material_id desc");
return json;
}
@Override
public List<SemirealrawmaterialDto> queryAll(Map whereJson) {
WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial");
JSONArray arr = wo.query().getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SemirealrawmaterialDto.class);
return null;
}
@Override
public SemirealrawmaterialDto findById(Long relation_id) {
WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial");
JSONObject json = wo.query("relation_id = '" + relation_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)) {
return json.toJavaObject(SemirealrawmaterialDto.class);
}
return null;
}
@Override
public SemirealrawmaterialDto findByCode(String code) {
WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial");
JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)) {
return json.toJavaObject(SemirealrawmaterialDto.class);
}
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void create(SemirealrawmaterialDto dto) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
dto.setRelation_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateRawmaterial(JSONObject param) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
String relation_id = param.getString("relation_id");
String raw_material_id = param.getString("raw_material_id");
JSONObject map = new JSONObject();
map.put("raw_material_id", raw_material_id);
map.put("update_optid", currentUserId);
map.put("update_optname", nickName);
map.put("update_time", now);
WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial");
wo.update(map, "relation_id = '" + relation_id + "'");
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getNickName();
String now = DateUtil.now();
WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial");
for (Long relation_id : ids) {
JSONObject param = new JSONObject();
param.put("relation_id", String.valueOf(relation_id));
param.put("raw_material_id", "");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
param.put("update_time", now);
wo.update(param);
}
}
}

74
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql
View File

@@ -1,74 +0,0 @@
[交易说明]
交易名： 成品对应半成品查询
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.search TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
PAGEQUERY
SELECT
endRealRawMaterial.*,
material.material_id,
material.material_code,
material.material_name,
material.material_spec,
material.product_series,
classstandard.class_name,
material1.material_id ymaterial_id,
material1.material_code ymaterial_code,
material1.material_name ymaterial_name,
material1.material_spec ymaterial_spec,
material1.product_series yproduct_series,
classstandard1.class_name yclass_name
FROM
MD_ME_EndRealSemiMaterial endRealRawMaterial
LEFT JOIN MD_ME_MaterialBase material ON endRealRawMaterial.end_material_id = material.material_id
LEFT JOIN md_pb_classstandard classstandard on material.product_series = classstandard.class_id
LEFT JOIN MD_ME_MaterialBase material1 ON endRealRawMaterial.semi_material_id = material1.material_id
LEFT JOIN md_pb_classstandard classstandard1 on material1.product_series = classstandard1.class_id
WHERE
material.is_delete = '0'
OPTION 输入.search <> ""
(material.material_code like 输入.search or
material.material_name like 输入.search)
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

74
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql
View File

@@ -1,74 +0,0 @@
[交易说明]
交易名： 半成品对应原材料查询
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.search TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
PAGEQUERY
SELECT
semiRealRawMaterial.*,
material.material_id,
material.material_code,
material.material_name,
material.material_spec,
material.product_series,
classstandard.class_name,
material1.material_id ymaterial_id,
material1.material_code ymaterial_code,
material1.material_name ymaterial_name,
material1.material_spec ymaterial_spec,
material1.product_series yproduct_series,
classstandard1.class_name yclass_name
FROM
MD_ME_SemiRealRawMaterial semiRealRawMaterial
LEFT JOIN MD_ME_MaterialBase material ON semiRealRawMaterial.semi_material_id = material.material_id
LEFT JOIN md_pb_classstandard classstandard on material.product_series = classstandard.class_id
LEFT JOIN MD_ME_MaterialBase material1 ON semiRealRawMaterial.raw_material_id = material1.material_id
LEFT JOIN md_pb_classstandard classstandard1 on material1.product_series = classstandard1.class_id
WHERE
material.is_delete = '0'
OPTION 输入.search <> ""
(material.material_code like 输入.search or
material.material_name like 输入.search)
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls
View File

Binary file not shown.