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-10-20 11:01:39 +08:00
parent 235ca13d70
commit 59201e427c
7 changed files with 309 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-system/src/main/java/org/nl/wms/basedata/rest/VehicleController.java
View File

@@ -2,6 +2,7 @@
package org.nl.wms.basedata.rest;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.basedata.service.VehicleService;
import org.nl.wms.basedata.service.dto.VehicleDto;
import org.springframework.data.domain.Pageable;
@@ -41,9 +42,9 @@ public class VehicleController {
@Log("新增载具维护")
@ApiOperation("新增载具维护")
//@SaCheckPermission("@el.check('vehicle:add')")
public ResponseEntity<Object> create(@Validated @RequestBody VehicleDto dto){
vehicleService.create(dto);
return new ResponseEntity<>(HttpStatus.CREATED);
public ResponseEntity<Object> create(@Validated @RequestBody JSONObject WhereJson){
return new ResponseEntity<>(vehicleService.create(WhereJson),HttpStatus.CREATED);
}
@PutMapping
@@ -63,4 +64,12 @@ public class VehicleController {
vehicleService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping("/getVehicle/{code}")
@Log("获取起始载具号")
@ApiOperation("获取起始载具号")
public ResponseEntity<Object> getVehicle(@PathVariable String code) {
JSONObject json = vehicleService.getVehicle(code);
return new ResponseEntity<>(json,HttpStatus.OK);
}
}

12
lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/VehicleService.java
View File

@@ -1,6 +1,8 @@
package org.nl.wms.basedata.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.basedata.service.dto.VehicleDto;
import org.springframework.data.domain.Pageable;
import java.util.Map;
@@ -47,9 +49,9 @@ public interface VehicleService {
/**
* 创建
* @param dto /
* @param WhereJson /
*/
void create(VehicleDto dto);
JSONArray create(JSONObject WhereJson);
/**
* 编辑
@@ -62,4 +64,10 @@ public interface VehicleService {
* @param ids /
*/
void deleteAll(Long[] ids);
/**
* 获取起始载具号
* @param code /
*/
JSONObject getVehicle(String code);
}

90
lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java
View File

@@ -2,15 +2,21 @@
package org.nl.wms.basedata.service.impl;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.service.impl.GenCodeServiceImpl;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.wms.basedata.service.VehicleService;
import org.nl.wms.basedata.service.dto.VehicleDto;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Pageable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,9 +43,14 @@ public class VehicleServiceImpl implements VehicleService {
@Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){
WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
final JSONObject json = rb.pageResult();
String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code");
JSONObject map = new JSONObject();
map.put("flag", "1");
map.put("vehicle_type", MapUtil.getStr(whereJson, "vehicle_type"));
if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code","%"+vehicle_code+"%");
JSONObject json = WQL.getWO("QMD_PB_VEHICLE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
return json;
}
@@ -73,23 +84,45 @@ public class VehicleServiceImpl implements VehicleService {
@Override
@Transactional(rollbackFor = Exception.class)
public void create(VehicleDto dto) {
public JSONArray create(JSONObject WhereJson) {
WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
dto.setVehicle_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setVehicle_name(dto.getVehicle_name());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_optid(currentUserId);
dto.setUpdate_optname(nickName);
dto.setUpdate_time(now);
dto.setCreate_time(now);
String vehicle_type = WhereJson.getString("vehicle_type");
String code = "";
switch (vehicle_type) {
case "01":
code = "1m3_ttp";
break;
case "02":
code = "1m6_ttp";
break;
case "03":
code = "1m9_ttp";
break;
}
WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
JSONArray resultCodeArr = new JSONArray();
int num = WhereJson.getIntValue("num");
for (int i = 0; i < num; i++) {
VehicleDto dto = new VehicleDto();
dto.setVehicle_id(IdUtil.getSnowflake(1,1).nextId());
dto.setVehicle_code(CodeUtil.getNewCode(code));
dto.setVehicle_name(dto.getVehicle_code());
dto.setVehicle_type(vehicle_type);
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setCreate_time(now);
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
resultCodeArr.add(dto.getVehicle_code());
}
return resultCodeArr;
}
@Override
@@ -130,4 +163,31 @@ public class VehicleServiceImpl implements VehicleService {
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject getVehicle(String code) {
String term = "";
switch (code) {
case "01":
term = "1m3_ttp";
break;
case "02":
term = "1m6_ttp";
break;
case "03":
term = "1m9_ttp";
break;
}
HashMap<String, String> map = new HashMap<>();
map.put("code", term);
map.put("flag", "0");
GenCodeServiceImpl genCodeService = new GenCodeServiceImpl();
String value = genCodeService.codeDemo(map);
JSONObject json = new JSONObject();
json.put("value", value);
return json;
}
}

64
lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE.wql Normal file
View File

@@ -0,0 +1,64 @@
[交易说明]
交易名： 载具分页查询
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.vehicle_type TYPEAS s_string
输入.vehicle_code TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
PAGEQUERY
SELECT
*
FROM
md_pb_vehicle
WHERE
1=1
OPTION 输入.vehicle_code <> ""
vehicle_code like 输入.vehicle_code
ENDOPTION
OPTION 输入.vehicle_type <> ""
vehicle_type = 输入.vehicle_type
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.