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

Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

Browse Source
This commit is contained in:
周俊杰
2023-03-21 20:35:12 +08:00
parent 6fe15cf71d c5077035c1
commit e7f050f35e
1478 changed files with 145144 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/WorkProcedureService.java
View File

@@ -38,7 +38,7 @@ public interface WorkProcedureService {
* @param workProcedure_id ID
* @return WorkProcedure
*/
WorkProcedureDto findById(Long workProcedure_id);
WorkProcedureDto findById(String workProcedure_id);
/**
* 根据编码查询

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/dto/WorkProcedureDto.java
View File

@@ -17,11 +17,11 @@ import java.util.Date;
@Data
public class WorkProcedureDto implements Serializable {
/** 工序标识 */
/** 防止精度丢失 */
@JsonSerialize(using= ToStringSerializer.class)
private Long workprocedure_id;
private String workprocedure_id;
/** 生产区域 */
private String product_area;
/** 工序编码 */
private String workprocedure_code;
@@ -56,9 +56,6 @@ public class WorkProcedureDto implements Serializable {
/** 创建时间 */
private String create_time;
/** 是否删除 */
private String is_delete;
/** 修改人 */
private String update_id;
@@ -67,10 +64,5 @@ public class WorkProcedureDto implements Serializable {
/** 修改时间 */
private String update_time;
/** 外部标识 */
private String ext_id;
}

28
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java
View File

@@ -47,10 +47,14 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
String where = "";
WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure");
String search = (String) whereJson.get("search");
String product_area = (String) whereJson.get("product_area");
if (!StrUtil.isEmpty(search)) {
where = " AND (workprocedure_code like '%" + search + "%' OR workprocedure_name like '%" + search + "%' ) ";
where += " AND (workprocedure_code like '%" + search + "%' OR workprocedure_name like '%" + search + "%' )";
}
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete= '0' " + where, "workprocedure_code");
if(!StrUtil.isEmpty(product_area)) {
where += " AND product_area = '" + product_area + "'";
}
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_used = '1' " + where, "workprocedure_code");
final JSONObject json = rb.pageResult();
return json;
}
@@ -64,7 +68,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
}
@Override
public WorkProcedureDto findById(Long workProcedure_id) {
public WorkProcedureDto findById(String workProcedure_id) {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure");
JSONObject json = wo.query("workProcedure_id =" + workProcedure_id + "").uniqueResult(0);
if (ObjectUtil.isEmpty(json)) return null;
@@ -92,7 +96,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
String currentUserId = currentUser.getId();
String nickName = SecurityUtils.getCurrentNickName();
dto.setWorkprocedure_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setWorkprocedure_id(IdUtil.getSnowflake(1, 1).nextIdStr());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
dto.setUpdate_id(currentUserId);
@@ -132,19 +136,9 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteAll(Long[] ids) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure");
for (Long workProcedure_id : ids) {
JSONObject param = new JSONObject();
param.put("workprocedure_id", String.valueOf(workProcedure_id));
param.put("is_delete", "1");
param.put("update_optid", currentUserId);
param.put("update_optname", nickName);
param.put("update_time", DateUtil.now());
wo.delete(param);
wo.delete("workProcedure_id = '" + workProcedure_id + "'");
}
}
@@ -152,7 +146,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
public JSONArray downSelect() {
//工序表【PDM_BI_WorkProcedure】
WQLObject workProcedureTab = WQLObject.getWQLObject("PDM_BI_WorkProcedure");
JSONArray resultJSONArray = workProcedureTab.query("is_delete = '0' and is_used ='1'", "workprocedure_code").getResultJSONArray(0);
JSONArray resultJSONArray = workProcedureTab.query("is_used ='1'", "workprocedure_code").getResultJSONArray(0);
return resultJSONArray;
}
@@ -160,7 +154,7 @@ public class WorkProcedureServiceImpl implements WorkProcedureService {
public List<WorkprocedureDto> queryWorkprocedure() {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure");
//只查清洗 跟仓储
JSONArray arr = wo.query(" is_delete = '0' and workprocedure_code in ('12','08')").getResultJSONArray(0);
JSONArray arr = wo.query(" is_used = '1' and workprocedure_code in ('12','08')").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(WorkprocedureDto.class);
return null;
}

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

Binary file not shown.

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
View File

@@ -68,6 +68,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
String parent_id = MapUtil.getStr(whereJson, "product_series");
String sale_id = MapUtil.getStr(whereJson, "sale_id");
String is_error = MapUtil.getStr(whereJson, "is_error");
String product_area = MapUtil.getStr(whereJson, "product_area");
String product_series = "";
JSONObject map = new JSONObject();
map.put("flag", "1");
@@ -75,6 +76,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
map.put("shift_type_scode", shift_type_scode);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
map.put("product_area", product_area);
if (StrUtil.isNotEmpty(order_status)) {
order_status = order_status.replace("[\"", "").replace("\"]", "").replace("\"", "");
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql
View File

@@ -20,6 +20,7 @@
输入.workprocedure_code TYPEAS s_string
输入.order_status TYPEAS s_string
输入.shift_type_scode TYPEAS s_string
输入.product_area TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.produceorder_code TYPEAS s_string
@@ -83,6 +84,9 @@
OPTION 输入.is_error <> ""
ShiftOrder.is_error = 输入.is_error
ENDOPTION
OPTION 输入.product_area <> ""
ShiftOrder.product_area = 输入.product_area
ENDOPTION
OPTION 输入.product_series <> ""
material.product_series in 输入.product_series
ENDOPTION

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql
View File

@@ -54,7 +54,7 @@
PDM_BI_PersonCorrDevice personDevice
LEFT JOIN sys_user user ON personDevice.jockey_id = user.user_id
WHERE
user.enabled = '1'
user.is_used = '1'
GROUP BY
personDevice.jockey_id
) view_person

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
View File

@@ -120,7 +120,7 @@ public class DeviceServiceImpl implements DeviceService {
@Override
public JSONArray getWorkprocedure() {
WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure");
final JSONArray resultJSONArray = wo.query("is_delete = '0'").getResultJSONArray(0);
final JSONArray resultJSONArray = wo.query("is_used = '0'").getResultJSONArray(0);
return resultJSONArray;
}

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

Binary file not shown.

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java
View File

@@ -4,13 +4,13 @@ package org.nl.wms.sch.manage;
* Task状态:00生成 ,01：下发，02、执行中，03、完成
*/
public enum TaskStatusEnum {
CREATED("01", "生成"),
SURE_START("02", "确定起点"),
SURE_END("03", "确定终点"),
START_AND_POINT("04", "起点终点确认"),
ISSUE("05", "下发"),
EXECUTING("06", "执行中"),
FINISHED("07", "完成");
CREATED("1", "生成"),
SURE_START("2", "确定起点"),
SURE_END("3", "确定终点"),
START_AND_POINT("4", "起点终点确认"),
ISSUE("5", "下发"),
EXECUTING("6", "执行中"),
FINISHED("7", "完成");
private String name;
private String code;

17
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
View File

@@ -55,14 +55,12 @@ public class PointServiceImpl implements PointService {
map.put("col_num", whereJson.get("col_num"));
map.put("layer_num", whereJson.get("layer_num"));
map.put("name", whereJson.get("name"));
map.put("product_area", whereJson.get("product_area"));
JSONObject json = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc");
JSONArray content = json.getJSONArray("content");
JSONArray res = new JSONArray();
for (int i = 0; i < content.size(); i++) {
JSONObject object = content.getJSONObject(i);
// 可以存放的载具类型
String[] can_vehicle_types = object.getString("can_vehicle_type").split(",");
object.put("can_vehicle_types", can_vehicle_types);
String region_code = object.getString("region_code");
String point_status = object.getString("point_status");
String point_type = object.getString("point_type");
@@ -133,14 +131,8 @@ public class PointServiceImpl implements PointService {
if (ObjectUtil.isNotEmpty(byCode)) {
throw new BadRequestException("存在相同的点位编码");
}
String can_vehicle_type = String.join(",", dto.getCan_vehicle_types());
dto.setCan_vehicle_type(can_vehicle_type);
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
dto.setPoint_id(IdUtil.getSnowflake(1, 1).nextIdStr());
dto.setCreate_id(currentUserId);
dto.setCreate_name(nickName);
@@ -168,9 +160,6 @@ public class PointServiceImpl implements PointService {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String can_vehicle_type = String.join(",", dto.getCan_vehicle_types());
dto.setCan_vehicle_type(can_vehicle_type);
String now = DateUtil.now();
dto.setUpdate_time(now);
dto.setUpdate_id(currentUserId);
@@ -182,9 +171,9 @@ public class PointServiceImpl implements PointService {
dto.setVehicle_type("");
dto.setVehicle_code("");
dto.setVehicle_qty(0);
} else if (pointStatus.equals("2")) { // 空载具
} else if (pointStatus.equals("3")) { // 空载具
dto.setMaterial_id(null);
} else if (pointStatus.equals("3")) { // 有料
} else if (pointStatus.equals("2")) { // 有料
if (ObjectUtil.isEmpty(dto.getMaterial_id())) throw new BadRequestException("物料不能为空");
JSONObject materialObj = materialBaseTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(materialObj)) throw new BadRequestException("未找到该物料");

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
View File

@@ -36,10 +36,12 @@ public class RegionServiceImpl implements RegionService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String region_code = MapUtil.getStr(whereJson, "region_code");
String product_area = MapUtil.getStr(whereJson, "product_area");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
if (ObjectUtil.isNotEmpty(region_code)) map.put("region_code","%" + region_code + "%");
if (ObjectUtil.isNotEmpty(product_area)) map.put("product_area", product_area);
JSONObject json = WQL.getWO("QSCH_REGION_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "region.region_code ASC");
return json;

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -51,6 +51,7 @@ public class TaskServiceImpl implements TaskService {
JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form));
String task_status = whereJson.getString("task_status");
map.put("product_area", whereJson.getString("product_area"));
if (StrUtil.isNotEmpty(task_status)) {
task_status = task_status.replace("[\"", "").replace("\"]", "").replace("\"", "");
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql
View File

@@ -19,6 +19,7 @@
输入.name TYPEAS s_string
输入.point_type TYPEAS s_string
输入.point_status TYPEAS s_string
输入.product_area TYPEAS s_string
输入.block_num TYPEAS s_string
输入.row_num TYPEAS s_string
输入.col_num TYPEAS s_string
@@ -78,6 +79,9 @@
OPTION 输入.lock_type <> ""
point.lock_type = 输入.lock_type
ENDOPTION
OPTION 输入.product_area <> ""
point.product_area = 输入.product_area
ENDOPTION
OPTION 输入.point_status <> ""
point.point_status = 输入.point_status
ENDOPTION

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_REGION_01.wql
View File

@@ -15,6 +15,7 @@
#################################################
输入.flag TYPEAS s_string
输入.region_code TYPEAS s_string
输入.product_area TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -46,12 +47,13 @@
SCH_BASE_Region region
WHERE
1=1
OPTION 输入.region_code <> ""
(region.region_code like 输入.region_code or
region.region_name like 输入.region_code)
OPTION 输入.product_area <> ""
region.product_area = 输入.product_area
ENDOPTION
OPTION 输入.region_code <> ""
(region.region_code like 输入.region_code or
region.region_name like 输入.region_code)
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql
View File

@@ -14,12 +14,13 @@
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.task_status TYPEAS s_string
输入.task_status TYPEAS s_string
输入.finished_type TYPEAS s_string
输入.task_type TYPEAS s_string
输入.point_code1 TYPEAS s_string
输入.point_code1 TYPEAS s_string
输入.point_code2 TYPEAS s_string
输入.task_code TYPEAS s_string
输入.product_area TYPEAS s_string
输入.vehicle_code TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
@@ -76,7 +77,7 @@
WHERE
task.is_delete = '0'
OPTION 输入.task_type <> ""
task.task_type = 输入.task_type
task.task_type = ( select md2.class_code from md_pb_classstandard md2 where md2.class_id = 输入.task_type )
ENDOPTION
OPTION 输入.finished_type <> ""
task.finished_type = 输入.finished_type
@@ -87,6 +88,9 @@
OPTION 输入.end_time <> ""
task.create_time <= 输入.end_time
ENDOPTION
OPTION 输入.product_area <> ""
task.product_area = 输入.product_area
ENDOPTION
OPTION 输入.unFinish <> ""
task.task_status <> '7'
ENDOPTION

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

Binary file not shown.