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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-28 20:40:43 +08:00
parent 740e75aae9
commit 5085bee846
5 changed files with 68 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/eum/RegionTypeEnum.java Normal file
View File

@@ -0,0 +1,40 @@
package org.nl.wms.pda.mps.eum;
public enum RegionTypeEnum {
A_SB("01","A生箔区","1578627451293143040"),
B_SB("02","B生箔区",""),
C_SB("03","C生箔区",""),
D_SB("04","D生箔区",""),
A_FQ("05","A分切区","1578628922277498880"),
B_FQ("06","B分切区",""),
C_FQ("07","C分切区",""),
D_FQ("08","D分切区",""),
A_HKZC("09","A烘烤暂存区","1578657813205487616"),
B_HKZC("10","B烘烤暂存区",""),
C_HKZC("11","C烘烤暂存区",""),
D_HKZC("12","D烘烤暂存区","");
private String name;
private String code;
private String id;
private RegionTypeEnum(String code, String name, String id) {
this.code = code;
this.name = name;
this.id = id;
}
public String getName() {
return name;
}
public String getCode() {
return code;
}
public String getId() {
return id;
}
}

7
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -13,6 +13,7 @@ import org.nl.modules.common.utils.SecurityUtils;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.nl.wms.pda.mps.service.BakingService;
import org.nl.wms.sch.tasks.InCoolIvtTask;
import org.nl.wms.sch.tasks.InHotTask;
@@ -121,7 +122,7 @@ public class BakingServiceImpl implements BakingService {
String point_location = jsonCoolIvt.getString("point_location"); // 位置
String reging_id = "";
/*switch (product_area) {
switch (product_area) {
case "A":
reging_id = RegionTypeEnum.A_HKZC.getId();
break;
@@ -134,7 +135,7 @@ public class BakingServiceImpl implements BakingService {
case "D":
reging_id = RegionTypeEnum.D_HKZC.getId();
break;
}*/
}
JSONObject map = new JSONObject();
map.put("flag", "1");
map.put("reging_id", reging_id);
@@ -167,7 +168,7 @@ public class BakingServiceImpl implements BakingService {
if (ObjectUtil.isEmpty(point_code2)) throw new BadRequestException("没有空暂存位");
// 查询烘箱对应的空位
JSONObject jsonHotIvt = hosIvtTab.query("product_area = '" + product_area + "' and temperature = '" + temperature + "' and point_location = '"+map.getString("point_location")+"' and is_used = '1' and point_status = '01' order by point_code ASC").uniqueResult(0);
JSONObject jsonHotIvt = hosIvtTab.query("product_area = '" + product_area + "' and temperature = '" + temperature + "' and point_location = '"+map.getString("point_location")+"' and is_used = '1' and point_status = '00' order by point_code ASC").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("烘烤区没有对应空位");
// 3.创建冷却区 --> 烘烤区任务

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
View File

@@ -178,11 +178,11 @@ public class RawFoilServiceImpl implements RawFoilService {
// 起点和终点确定 生成任务
JSONObject param = new JSONObject();
param.put("point_code1", start_pint_code);
param.put("point_code2", raw_jo.getString("point_code"));
param.put("point_code3", raw_jo.getString("point_code"));
param.put("point_code2", jsonRaw.getString("point_code"));
param.put("point_code3", jsonRaw.getString("point_code"));
param.put("point_code4", point_code4);
param.put("task_type", "010101");
param.put("material_code", raw_jo.getString("container_name"));
param.put("material_code", jsonRaw.getString("container_name"));
CallEmpReelTask callEmpReelTask = new CallEmpReelTask();
String task_id = callEmpReelTask.createTask(param);
@@ -212,6 +212,8 @@ public class RawFoilServiceImpl implements RawFoilService {
//下发ACS，执行取满放空的AGV动作
// 更新工单状态为确认下卷
jsonRaw.put("status","03");
rawTab.update(jsonRaw);
}
@Override

28
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -27,7 +27,7 @@
size="mini"
placeholder="区域类型"
class="filter-item"
@change="getPointStatusAndTypeList"
@change="getPointStatusAndTypeList(query.region_id, 1)"
>
<el-option
v-for="item in regionList"
@@ -209,7 +209,7 @@
v-model="form.region_id"
placeholder="请选择"
style="width: 370px;"
@change="getPointStatusAndTypeList"
@change="getPointStatusAndTypeList(form.region_id, 2)"
>
<el-option
v-for="item in regionList"
@@ -372,7 +372,9 @@ export default {
syncLoading: false,
invtypelist: [],
pointStatusList: [],
pointStatusDialogList: [],
pointTypesList: [],
pointTypesDialogList: [],
options: [],
regionList: [],
permission: {},
@@ -408,7 +410,7 @@ export default {
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_id) {
this.getPointStatusAndTypeList(this.form.region_id)
this.getPointStatusAndTypeList(this.form.region_id, 2)
}
},
hand(value) {
@@ -436,21 +438,25 @@ export default {
}).catch(() => {
})
},
getPointStatusAndTypeList(id) {
getPointStatusAndTypeList(id, flag) {
if (id) {
this.getPointStatusList(id)
this.getPointTypeList(id)
this.crud.toQuery()
this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag)
}
if (flag === 1) { this.crud.toQuery() }
},
getPointStatusList(id) {
getPointStatusList(id, flag) {
crudRegion.getPointStatusSelectById(id).then(res => {
this.pointStatusList = res
if (flag === 1) {
this.pointStatusList = res
} else {
this.pointStatusDialogList = res
}
})
},
getPointTypeList(id) {
getPointTypeList(id, flag) {
crudRegion.getPointTypeSelectById(id).then(res => {
this.pointTypesList = res
if (flag === 1) { this.pointTypesList = res } else { this.pointTypesDialogList = res }
})
},
changeUsed(data, flag) { // 更改启用状态

2
lms/nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -93,6 +93,8 @@ const defaultForm = {
region_code: null,
region_name: null,
remark: null,
point_type_explain: null,
point_status_explain: null,
create_id: null,
create_name: null,
create_time: null,