root/longdianningxing
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/lanzhouhailiang_one

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-03-08 11:06:48 +08:00
parent 3722f70737 d6aec316c1
commit cf97e02e8b
13 changed files with 142 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -219,9 +219,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
throw new BadRequestException("该生箔工单对应的状态不为准备就绪，不允许确认下卷！");
}
// 下发ACS更改任务状态
JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '" + containerName + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0);
JSONArray paramArr = new JSONArray();
JSONObject json = new JSONObject();
json.put("device_code", jsonSb.getString("point_code"));
json.put("task_code", task_jo.getString("task_code"));
json.put("option ", "2");
paramArr.add(json);
@@ -301,7 +303,13 @@ public class MesToLmsServiceImpl implements MesToLmsService {
} else {
point_code = jsonCoolIvt.getString("full_point_code");
}
if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("母卷不存在或已烘烤完成");
if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("该母卷现在不存在暂存位或对接点位上，不能进行入烘箱操作！");
//更新生箔工单的是否下发烘烤为是
HashMap<String,String> map = new HashMap<>();
map.put("is_baking","1");
WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(map,"container_name = '"+ContainerName+"'");
log.info("母卷："+ContainerName+"被决策入烘箱，请求烘烤标识改为1");
// 调用接口输入参数
jsonParam.put("option", "1");
@@ -317,8 +325,14 @@ public class MesToLmsServiceImpl implements MesToLmsService {
/*
* 入冷却区
*/
//更新生箔工单的是否下发烘烤为是
HashMap<String,String> map = new HashMap<>();
map.put("is_instor","1");
WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(map,"container_name = '"+ContainerName+"'");
log.info("母卷："+ContainerName+"被决策入半成品库，请求入半成品库标识改为1");
JSONObject jsonPoint = pointTab.query("material_code = '" + containerName + "' and is_delete = '0' and is_used = '1'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("母卷不存在");
if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("母卷不存在烘箱对接位上！");
// 调用接口输入参数
jsonParam.put("point_code", jsonPoint.getString("point_code"));
@@ -1255,7 +1269,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
throw new BadRequestException("子卷号不能为空！");
}
JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + ContainerName + "'").uniqueResult(0);
JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + ContainerName + "' AND is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(plan_jo)) {
throw new BadRequestException("系统中不存在子卷号为：" + ContainerName + "的分切计划！");
}

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

@@ -71,6 +71,24 @@ public class BakingServiceImpl implements BakingService {
String hours = whereJson.getString("hours"); // 时间
String point_code1 = whereJson.getString("point_code"); // 点位
//校验该设备是否启用，且母卷MES是否请求烘烤
//查询该母卷号、设备号对应的生箔工单
JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + container_name + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(raw_jo)) {
throw new BadRequestException("未查询到对应的生箔工单！");
}
String resource_name = raw_jo.getString("resource_name");
JSONObject sb_jo = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code ='" + resource_name + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(sb_jo)) {
throw new BadRequestException("未查询到母卷号：" + container_name + "对应的生箔机台编号！");
}
if (StrUtil.equals("1", sb_jo.getString("is_used")) && !raw_jo.getString("is_baking").equals("1")) {
throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！");
}
if (ObjectUtil.isEmpty(container_name)) throw new BadRequestException("母卷号不能为空");
if (ObjectUtil.isEmpty(temperature)) throw new BadRequestException("温度不能为空");
if (ObjectUtil.isEmpty(hours)) throw new BadRequestException("时间不能为空");
@@ -354,6 +372,23 @@ public class BakingServiceImpl implements BakingService {
if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("点位不能为空");
if (ObjectUtil.isEmpty(container_name)) throw new BadRequestException("母卷号不能为空");
//校验该设备是否启用，且母卷MES是否请求烘烤
//查询该母卷号、设备号对应的生箔工单
JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + container_name + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(raw_jo)) {
throw new BadRequestException("未查询到对应的生箔工单！");
}
String resource_name = raw_jo.getString("resource_name");
JSONObject sb_jo = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code ='" + resource_name + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(sb_jo)) {
throw new BadRequestException("未查询到母卷号：" + container_name + "对应的生箔机台编号！");
}
if (StrUtil.equals("1", sb_jo.getString("is_used")) && !raw_jo.getString("is_instor").equals("1")) {
throw new BadRequestException("该母卷在MES上未进行决策入半成品库，不允许进行入冷却操作！");
}
// 1.获取此暂存位的生产区域和上下位置
JSONObject jsonPoint = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("冷却区内此点位不存在！");

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

@@ -57,6 +57,10 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
point_jo.put("empty_point_status", "01");
}
if (option.equals("1")) {
//绑定的时候判断点位上是否存在母卷存在母卷不允许进行绑定
if (point_jo.getString("full_point_status").equals("02")) {
throw new BadRequestException("该点位上存在母卷，不能进行绑定空轴！");
}
point_jo.put("empty_vehicle_code", vehicle_code);
point_jo.put("empty_point_status", "02");
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -92,7 +92,7 @@
FROM
sch_base_task
WHERE
( point_code1 = full_point_code OR point_code2 = full_point_code )
( point_code1 = empty_point_code OR point_code2 = empty_point_code )
AND task_status < '07'
AND is_delete = '0'
)

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

Binary file not shown.

1
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
View File

@@ -209,6 +209,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
jsonIvt2.put("container_name", jsonRaw.getString("container_name"));
jsonIvt2.put("workorder_id", jsonRaw.getString("workorder_id"));
jsonIvt2.put("ivt_qty", jsonRaw.getString("productin_qty"));
jsonIvt2.put("cool_ivt_status", "01");
ivtTab.update(jsonIvt2);
// 插入入库单

9
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java
View File

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@Service
@@ -153,6 +154,13 @@ public class InCoolIvtTask extends AbstractAcsTask {
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param);
}
//将该母卷的入烘箱标识改为0
HashMap<String, String> map = new HashMap<>();
map.put("is_instor", "0");
WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(map, "container_name = '" + jsonTask.getString("material_code") + "'");
log.info("母卷：" + jsonTask.getString("material_code") + "对应的入冷却任务完成，请求入半成品库标识改为0");
}
}
@@ -221,7 +229,6 @@ public class InCoolIvtTask extends AbstractAcsTask {
}
@Override
public void cancel(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);

7
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
View File

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@Service
@@ -205,6 +206,12 @@ public class InHotTask extends AbstractAcsTask {
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
new LmsToMesServiceImpl().momRollBakeInBound(param);
}
//将该母卷的入烘箱标识改为0
HashMap<String,String> map = new HashMap<>();
map.put("is_baking","0");
WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(map,"container_name = '"+jsonHotMst.getString("container_name")+"'");
log.info("母卷："+jsonHotMst.getString("container_name")+"对应的入烘箱任务完成，请求烘烤标识改为0");
}
}

5
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java
View File

@@ -231,6 +231,9 @@ public class InchargeServiceImpl implements InchargeService {
jsonOutMst.put("dis_optid", currentUserId);
jsonOutMst.put("dis_optname", nickName);
jsonOutMst.put("dis_time", DateUtil.now());
jsonOutMst.put("confirm_optid", "");
jsonOutMst.put("confirm_optname", "");
jsonOutMst.put("confirm_time", "");
jsonOutMst.put("sysdeptid", deptId);
jsonOutMst.put("syscompanyid", deptId);
mstTab.insert(jsonOutMst);
@@ -277,6 +280,8 @@ public class InchargeServiceImpl implements InchargeService {
jsonOutDis.put("material_id", json2.getLongValue("material_id"));
jsonOutDis.put("pcsn", json2.getString("pcsn"));
jsonOutDis.put("box_no", json2.getString("box_no"));
jsonOutDis.put("point_id", "");
jsonOutDis.put("task_id", "");
jsonOutDis.put("quality_scode", "01");
// 如果是虚拟库区则将执行状态改为生成：01
JSONObject jsonSect = wo_sect.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);

6
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
View File

@@ -122,8 +122,8 @@ public class OutChargeServiceImpl implements OutChargeService {
whereJson.put("dis_optname", nickName);
whereJson.put("dis_time", now);
whereJson.put("confirm_optid", "");
whereJson.put("confirm_optid", "");
whereJson.put("confirm_optid", "");
whereJson.put("confirm_optname", "");
whereJson.put("confirm_time", "");
whereJson.put("is_upload", "");
whereJson.put("upload_optid", "");
whereJson.put("upload_time", "");
@@ -166,6 +166,8 @@ public class OutChargeServiceImpl implements OutChargeService {
dis_row.put("struct_name", "");
dis_row.put("work_status", "00");
dis_row.put("real_qty", "0");
dis_row.put("point_id", "");
dis_row.put("task_id", "");
//插入分配表
dis_wql.insert(dis_row);

4
lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
View File

@@ -102,6 +102,9 @@
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴编码">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>
@@ -153,7 +156,6 @@
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip />
<el-table-column prop="empty_point_code" label="空轴位" width="120px" show-overflow-tooltip />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}

10
lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
View File

@@ -232,6 +232,8 @@
<el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量')" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
<el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="is_baking" label="请求烘烤" :min-width="flexWidth('is_baking',crud.data,'请求烘烤')" :formatter="formatBakeIsOrNot"/>
<el-table-column prop="is_instor" label="请求入半成品库" :min-width="flexWidth('is_instor',crud.data,'请求入半成品库')" :formatter="formatStorIsOrNot"/>
<el-table-column prop="update_time" label="更新时间" :min-width="flexWidth('update_time',crud.data,'更新时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
@@ -288,7 +290,7 @@ const defaultForm = {
}
export default {
name: 'Rawfoilworkorder',
dicts: ['product_area', 'product_status'],
dicts: ['product_area', 'product_status', 'IS_OR_NOT'],
components: { pagination, crudOperation, rrOperation, udOperation, Dialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -351,6 +353,12 @@ export default {
formatStatusName(row) {
return this.dict.label.product_status[row.status]
},
formatBakeIsOrNot(row) {
return this.dict.label.IS_OR_NOT[row.is_baking]
},
formatStorIsOrNot(row) {
return this.dict.label.IS_OR_NOT[row.is_instor]
},
compelEnd() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]

1
lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
View File

@@ -457,7 +457,6 @@
<el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName"/>
<el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName"/>
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
<el-table-column prop="is_call" label="是否呼叫" width="100px" :formatter="formatChildCallName"/>
<el-table-column prop="qzzno" label="气涨轴编码" width="100px"/>
<el-table-column prop="start_time" label="开始时间" width="150px"/>