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

Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

Browse Source
This commit is contained in:
zhouz
2024-05-09 20:02:00 +08:00
parent d03c915e92 dee0cf57ae
commit ce168c147b
2 changed files with 124 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussCallAirShaftTask.java
View File

@@ -17,6 +17,7 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproducti
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
import org.nl.b_lms.sch.task.dao.SchBaseTask;
import org.nl.b_lms.sch.task.service.IschBaseTaskService;
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.common.utils.SecurityUtils;
@@ -111,14 +112,15 @@ public class TrussCallAirShaftTask extends AbstractAcsTask {
.eq(PdmBiSlittingproductionplan::getResource_name, planDistinctDto.getResource_name())
.eq(PdmBiSlittingproductionplan::getParent_container_name, planDistinctDto.getParent_container_name())
.eq(PdmBiSlittingproductionplan::getUp_or_down, planDistinctDto.getUp_or_down())
.eq(PdmBiSlittingproductionplan::getSplit_group, planDistinctDto.getSplit_group())
.eq(PdmBiSlittingproductionplan::getIs_paper_ok, "2"));
if (needPlans.size() == 0) {
throw new BadRequestException("找不到气涨轴编码【" + task.getVehicle_code() + "】对应的气涨轴");
}
for (PdmBiSlittingproductionplan plan : needPlans) {
if ("1".equals(plan.getLeft_or_right())) {
if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {
// 左卷
if ("1".equals(plan.getPaper_tube_or_FRP())) {
if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
endPointObj.setTube_code1(plan.getPaper_tube_material());
endPointObj.setTube_name1(plan.getPaper_tube_model());
} else {
@@ -128,12 +130,12 @@ public class TrussCallAirShaftTask extends AbstractAcsTask {
endPointObj.setContainer_name1(plan.getContainer_name());
} else {
// 右卷
if ("1".equals(plan.getPaper_tube_or_FRP())) {
endPointObj.setTube_code1(plan.getPaper_tube_material());
endPointObj.setTube_name1(plan.getPaper_tube_model());
if (SlitterConstant.SLITTER_TYPE_PAPER.equals(plan.getPaper_tube_or_FRP())) {
endPointObj.setTube_code2(plan.getPaper_tube_material());
endPointObj.setTube_name2(plan.getPaper_tube_model());
} else {
endPointObj.setTube_code1(plan.getFRP_material());
endPointObj.setTube_name1(plan.getFRP_model());
endPointObj.setTube_code2(plan.getFRP_material());
endPointObj.setTube_name2(plan.getFRP_model());
}
endPointObj.setContainer_name2(plan.getContainer_name());
}

115
lms/nladmin-system/src/main/java/org/nl/start/Init.java
View File

@@ -22,6 +22,120 @@ public class Init implements ApplicationRunner {
public void run(ApplicationArguments args) throws Exception {
// initTwoAttr(4,30,3,2, "2");
// createAttr();
// initTwoAttr2(1,10,2, 2, 1, 2);
}
/**
* 初始化二期仓位
* row_num: 当前排
* col_all：共多少列
* layer_all： 共多少层
* row_num_now : 系统程序排
* block_num: 巷道
* zdepth: 深度
*/
private void initTwoAttr2(int row_num, int col_all, int layer_all, int row_num_now ,int block_num, int zdepth) {
WQLObject tab = WQLObject.getWQLObject("ST_IVT_StructAttr");
WQLObject tab2 = WQLObject.getWQLObject("st_ivt_bsrealstorattr");
WQLObject tab3 = WQLObject.getWQLObject("st_ivt_sectattr");
WQLObject tab4 = WQLObject.getWQLObject("sch_base_point");
// 排
String row = row_num + "";
if (row_num < 10) {
row = "0" + row_num + "";
}
for (int j = 1; j < layer_all + 1; j++) {
// 层
String layer_num = j + "";
if (j < 10) {
layer_num = "0" + j;
}
for (int i = 1; i < col_all + 1; i++) {
JSONObject json = new JSONObject();
json.put("struct_id", IdUtil.getSnowflake(1, 1).nextId());
// 列
String col_num = i + "";
if (i < 10) {
col_num = "0" + i;
}
String struct_code = "L" + row + "-" + col_num + "-" + layer_num + "";
JSONObject jsonObject = tab2.query("stor_id = '1582991156504039455'").uniqueResult(0);
JSONObject jsonObjec2 = tab3.query("stor_id = '1582991156504039455' and sect_code = 'BZC01'").uniqueResult(0);
// 新增仓位
json.put("sect_id", jsonObjec2.getString("sect_id"));
json.put("sect_code", jsonObjec2.getString("sect_code"));
json.put("sect_name", jsonObjec2.getString("sect_name"));
json.put("stor_id", jsonObject.getString("stor_id"));
json.put("stor_code", jsonObject.getString("stor_code"));
json.put("stor_name", jsonObject.getString("stor_name"));
json.put("lock_type", "1");
json.put("row_num", row_num_now);
json.put("col_num", i);
json.put("layer_num", j);
json.put("block_num", block_num);
json.put("capacity", row_num);
json.put("struct_code",struct_code);
json.put("struct_name",row + "排" + col_num+ "列"+ layer_num +"层");
json.put("simple_name",json.getString("struct_name"));
json.put("in_order_seq", i);
json.put("out_order_seq", i);
json.put("in_empty_seq", i);
json.put("out_empty_seq", i);
json.put("zdepth", Integer.valueOf(zdepth));
json.put("create_id", "1");
json.put("create_name", "管理员");
json.put("create_time", DateUtil.now());
json.put("material_height_type", 1);
tab.insert(json);
// 新增点位
JSONObject jsonPoint = new JSONObject();
jsonPoint.put("point_id",IdUtil.getSnowflake(1,1).nextId());
jsonPoint.put("point_code", json.getString("struct_code"));
jsonPoint.put("point_name", json.getString("struct_name"));
jsonPoint.put("region_id", json.getString("sect_id"));
jsonPoint.put("region_code", json.getString("sect_code"));
jsonPoint.put("region_name", json.getString("sect_name"));
jsonPoint.put("point_type", "2");
jsonPoint.put("point_status", "1");
jsonPoint.put("lock_type", "1");
jsonPoint.put("vehicle_max_qty", 0);
jsonPoint.put("vehicle_qty", 0);
jsonPoint.put("block_num", json.getBigDecimal("block_num"));
jsonPoint.put("row_num", json.getBigDecimal("row_num"));
jsonPoint.put("col_num", json.getBigDecimal("col_num"));
jsonPoint.put("layer_num", json.getBigDecimal("layer_num"));
jsonPoint.put("in_order_seq", i);
jsonPoint.put("out_order_seq", i);
jsonPoint.put("in_empty_seq", i);
jsonPoint.put("out_empty_seq", i);
jsonPoint.put("is_have_workder", "0");
jsonPoint.put("is_used", "1");
jsonPoint.put("source_id", json.get("struct_id"));
jsonPoint.put("is_delete", "0");
jsonPoint.put("create_id", "1");
jsonPoint.put("create_name", "管理员");
jsonPoint.put("create_time", DateUtil.now());
tab4.insert(jsonPoint);
}
}
}
/**
@@ -232,4 +346,5 @@ public class Init implements ApplicationRunner {
System.out.println("项目启动成功!");
}
}