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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-09-05 11:26:53 +08:00
parent d6a253c55e
commit ab4f712f48
19 changed files with 80 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
View File

@@ -12,9 +12,12 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.exception.BadRequestException;
import org.nl.ext.lk.service.impl.WmsToLkServiceImpl;
import org.nl.modules.security.service.dto.JwtUserDto;
import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SecurityUtils;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
import org.nl.wms.basedata.master.service.MaterialbaseService;
import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
@@ -546,6 +549,30 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
}
inspectionsheetmstService.confirm(jsonSheeGutDtl);
}
/*
* 发送质检结果给立库 PG粉
*/
String is_sendLK = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_SENDLK").getValue();
if (StrUtil.equals(is_sendLK, "1")) {
WmsToLkServiceImpl wmsToLkService = new WmsToLkServiceImpl();
JSONObject jsonMater = materTab.query("material_id ='" + jsonPhyMst.getString("material_id") + "'").uniqueResult(0);
JSONObject param = new JSONObject();
param.put("material_uuid", jsonMater.getString("ext_id"));
param.put("material_id", jsonMater.getString("material_id"));
param.put("material_code", jsonMater.getString("material_code"));
param.put("material_name", jsonMater.getString("material_name"));
param.put("pcsn", jsonPhyMst.getString("pcsn"));
param.put("status", jsonPhyMst.getString("result"));
param.put("remark", "");
JSONObject resultJson = wmsToLkService.qualityResult(param);
if (StrUtil.equals(resultJson.getString("result"), "2")) {
throw new BadRequestException("发送立库失败："+resultJson.getString("messsage"));
}
}
} else if (StrUtil.equals(inspection_type, "10") || StrUtil.equals(inspection_type, "20")) {
// 原料碳化钨、原料钴粉
/*
@@ -956,7 +983,7 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
if (ObjectUtil.isNotEmpty(search_material_code)) map.put("search_material_code",search_material_code+"%");
if (ObjectUtil.isNotEmpty(search_pcsn)) map.put("search_pcsn",search_pcsn+"%");
JSONObject json = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "biz_date");
JSONObject json = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").pageQuery(WqlUtil.getHttpContext(page), "biz_date DESC");
return json;
}

19
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
View File

@@ -58,6 +58,25 @@
pcsn like 输入.search_pcsn
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "2"
PAGEQUERY
SELECT
*
FROM
QL_TEST_PHYSICAL
OPTION 输入.search_material_code <> ""
'material_code' like 输入.search_material_code
ENDOPTION
OPTION 输入.search_pcsn <> ""
'pcsn' like 输入.search_pcsn
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
View File

@@ -57,7 +57,8 @@
mst.*,
class.class_name,
file.device_code,
file.device_name
file.device_name,
file.extend_code
FROM
EM_BI_DeviceRepairMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
@@ -106,7 +107,8 @@
mst.*,
class.class_name,
file.device_code,
file.device_name
file.device_name,
file.extend_code
FROM
EM_BI_DeviceRepairMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
View File

@@ -52,7 +52,8 @@
mst.*,
class.class_name,
file.device_code,
file.device_name
file.device_name,
file.extend_code
FROM
EM_BI_DeviceRepairPlanMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
View File

@@ -51,6 +51,7 @@
class.class_name,
file.device_code,
file.device_name,
file.extend_code,
class2.device_faultclass_name
FROM
EM_BI_DeviceRepairRequest mst

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
View File

@@ -194,6 +194,8 @@
mst.is_delete = '0'
AND (mst.invstatus <> '99' or (mst.invstatus = '99' and mst.audit_time like 输入.today))
order by input_time DESC
ENDSELECT
ENDQUERY
ENDIF

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
View File

@@ -52,7 +52,8 @@
mst.*,
class.class_name,
file.device_code,
file.device_name
file.device_name,
file.extend_code
FROM
EM_BI_DeviceMaintenanceMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
@@ -101,7 +102,8 @@
mst.*,
class.class_name,
file.device_code,
file.device_name
file.device_name,
file.extend_code
FROM
EM_BI_DeviceMaintenanceMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql
View File

@@ -52,7 +52,8 @@
mst.*,
class.class_name,
file.device_code,
file.device_name
file.device_name,
file.extend_code
FROM
EM_BI_DeviceMaintenancePlanMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id

2
mes/qd/src/views/wms/ql/physicalMstConfirm/PhySyncDialog.vue
View File

@@ -81,7 +81,7 @@ export default {
optShow: {},
url: 'api/physicalMst/erpPhyQuery',
idField: 'inspection_id',
sort: '',
sort: 'biz_date DESC',
crudMethod: { ...crudPhysicalMst }
})
},

1
mes/qd/src/views/wms/sb/repair/devicerepair/index.vue
View File

@@ -97,6 +97,7 @@
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/>
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/>
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/>

3
mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
View File

@@ -152,6 +152,7 @@
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/>
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/>
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/>
@@ -160,7 +161,7 @@
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column prop="input_optname" label="制单人" />
<el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip />
<el-table-column prop="update_optname" label="维修人" />
<el-table-column prop="update_optname" label="维修人" show-overflow-tooltip />
<el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip />
<el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip />
<el-table-column prop="confirm_optname" label="确认人" />

1
mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
View File

@@ -109,6 +109,7 @@
<el-table-column prop="class_name" label="设备类型" />
<el-table-column prop="device_code" label="设备编号" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="maintenancecycle" label="维修周期" :formatter="formatMainName" />
<el-table-column prop="plan_start_date" label="计划开始日期" width="120px" />
<el-table-column prop="real_start_date" label="实际开始日期" width="120px" />

1
mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
View File

@@ -97,6 +97,7 @@
</el-table-column>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="device_faultclass_name" label="故障分类" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formaLevelName" />
<el-table-column prop="status" label="状态" :formatter="formatStatusName"/>

3
mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
View File

@@ -123,6 +123,7 @@
</el-table-column>
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/>
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/>
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/>
@@ -131,7 +132,7 @@
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column prop="input_optname" label="制单人" />
<el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip />
<el-table-column prop="update_optname" label="维修人" />
<el-table-column prop="update_optname" label="维修人" show-overflow-tooltip />
<el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip />
<el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip />
<el-table-column prop="confirm_optname" label="确认人" />

1
mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
View File

@@ -108,6 +108,7 @@
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/>
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/>
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/>

1
mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue
View File

@@ -108,6 +108,7 @@
<el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" />

1
mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue
View File

@@ -97,6 +97,7 @@
<el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" />

1
mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue
View File

@@ -130,6 +130,7 @@
<el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" />

11
mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
View File

@@ -106,17 +106,18 @@
</el-table-column>
<el-table-column prop="maint_plan_code" label="保养计划单号" width="120px" show-overflow-tooltip />
<el-table-column prop="maint_plan_name" label="保养计划名称" width="120px" show-overflow-tooltip />
<el-table-column prop="class_name" label="设备类型" />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="device_name" label="设备名称" />
<el-table-column prop="class_name" label="设备类型" width="120px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName"/>
<el-table-column prop="plan_start_date" label="计划开始日期" width="150px" />
<el-table-column prop="real_start_date" label="实际开始日期" width="150px" />
<el-table-column prop="real_end_date" label="实际结束日期" width="150px" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人姓名" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150px" />
<el-table-column prop="confirm_optname" label="审核人姓名" />
<el-table-column prop="confirm_optname" label="审核人" />
<el-table-column prop="confirm_time" label="审核时间" width="150px" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">