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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-09-19 10:48:19 +08:00
parent ce6ce0717b
commit e8063dfb4f
6 changed files with 0 additions and 619 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);
}
}

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);
}

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);
}
}
}