root/wuHanXinRui
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/wuHanXinRui

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-07-20 19:37:52 +08:00
parent 78b220f2ca 1b326afa4c
commit 144960a348
21 changed files with 1173 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/pom.xml
View File

@@ -44,12 +44,12 @@
<artifactId>easyword</artifactId>
<version>1.1.4</version>
</dependency>
<!-- 线性代数矩阵求解-->
<!-- 线性代数矩阵求解
<dependency>
<groupId>gov.nist.math</groupId>
<artifactId>jama</artifactId>
<version>1.0.3</version>
</dependency>
</dependency>-->
<!-- ip地址解析-->
<dependency>
<groupId>net.dreamlu</groupId>

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/service/impl/EquipmentfileServiceImpl.java
View File

@@ -172,6 +172,9 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
String nowStatus = jsonMst.getString("status");
HashMap<String, String> map = new HashMap<>();
if ("10".equals(status)) {//启用
if (!"11,00".contains(nowStatus)) {
throw new BadRequestException("只有停用、生成状态才可启用！");
}
if (StrUtil.isEmpty(jsonMst.getString("device_bom_id"))) {
throw new BadRequestException("设备BOM不能为空！");
}
@@ -200,7 +203,9 @@ public class EquipmentfileServiceImpl implements EquipmentfileService {
EM_BI_DeviceLifeCycle.insert(jo2);
} else if ("11".equals(status)) {//禁用
map.put("status", "11");
if (!"10".contains(nowStatus)) {
throw new BadRequestException("只有启用状态才可停用！");
}
JSONObject jo2 = new JSONObject();
jo2.put("devicechangedtl_id", IdUtil.getSnowflake(1, 1).nextId());
jo2.put("devicerecord_id", jsonMst.getString("devicerecord_id"));

1579
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AutoformulaServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/rest/DeviceScrapController.java
View File

@@ -14,6 +14,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -43,4 +44,12 @@ public class DeviceScrapController {
deviceScrapService.scrap(whereJson);
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping("/downloadWord")
@Log("下载word")
@ApiOperation("下载word")
public ResponseEntity<Object> downloadWord(@RequestParam Map whereJson, HttpServletResponse response) {
deviceScrapService.downloadWord(whereJson,response);
return new ResponseEntity<>(HttpStatus.OK);
}
}

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/DeviceScrapService.java
View File

@@ -4,6 +4,7 @@ package org.nl.wms.sb.run.service;
import com.alibaba.fastjson.JSONObject;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -27,4 +28,10 @@ public interface DeviceScrapService {
* @param whereJson 参数
*/
void scrap(JSONObject whereJson);
/**
* 下载word
* @param whereJson 参数
*/
void downloadWord(Map whereJson, HttpServletResponse response);
}

44
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/dto/DownloadWordDto.java Normal file
View File

@@ -0,0 +1,44 @@
package org.nl.wms.sb.run.service.dto;
import com.sushengren.easyword.annotation.WordProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DownloadWordDto implements Serializable {
@WordProperty("资产名称")
private String assets_name;
@WordProperty("资产编码")
private String assets_code;
@WordProperty("规格型号")
private String device_spec;
@WordProperty("出厂编码")
private String leavefactory_number;
@WordProperty("出厂日期")
private String leavefactory_date;
@WordProperty("原值")
private String oraginal_value;
@WordProperty("净额")
private String net_amount;
@WordProperty("资产所在单位")
private String belong_dept;
@WordProperty("资产使用人")
private String user_name;
}

62
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DeviceScrapServiceImpl.java
View File

@@ -8,17 +8,26 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.sushengren.easyword.EasyWord;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.utils.SecurityUtils;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.basedata.master.service.ClassstandardService;
import org.nl.wms.sb.run.service.DeviceScrapService;
import org.nl.wms.sb.run.service.dto.DownloadWordDto;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.nl.wql.util.WqlUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
@@ -74,11 +83,22 @@ public class DeviceScrapServiceImpl implements DeviceScrapService {
WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile");
WQLObject lifeTab = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle");
WQLObject mainTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceMst"); // 设备保养单
WQLObject reTab = WQLObject.getWQLObject("EM_BI_DeviceRepairMst"); // 设备维修单
// 更新设备档案表状态为报废
JSONObject json = fileTab.query("devicerecord_id ='" + devicerecord_id + "' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(json)) throw new BootstrapMethodError("档案已被删除");
String status = json.getString("status");
if (StrUtil.equals(status, "11")) {
// 需完成保养单或者维修单
JSONObject jsonMain = mainTab.query("devicerecord_id = '" + devicerecord_id + "' and is_delete = '0' and invstatus = '99'").uniqueResult(0);
JSONObject jsonRe = reTab.query("devicerecord_id = '" + devicerecord_id + "' and is_delete = '0' and invstatus = '99'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonMain) || ObjectUtil.isEmpty(jsonRe)) {
throw new BadRequestException("保养单或维修单未完成");
}
}
json.put("status", "90");
json.put("update_optid", currentUserId);
json.put("update_optname", nickName);
@@ -98,4 +118,46 @@ public class DeviceScrapServiceImpl implements DeviceScrapService {
jsonLife.put("create_time",DateUtil.now());
lifeTab.insert(jsonLife);
}
@Override
public void downloadWord(Map whereJson, HttpServletResponse response) {
try {
WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile");
WQLObject deptTab = WQLObject.getWQLObject("sys_dept");
String devicerecord_id = MapUtil.getStr(whereJson, "devicerecord_id");
JSONObject jsonFile = fileTab.query("devicerecord_id = '" + devicerecord_id + "'").uniqueResult(0);
String belong_deptid = jsonFile.getString("belong_deptid");
JSONObject jsonDept = new JSONObject();
if (ObjectUtil.isNotEmpty(belong_deptid)) {
jsonDept = deptTab.query("dept_id = '"+belong_deptid+"'").uniqueResult(0);
}
// 设置浏览器导出word格式文件
response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
// 设置文件名和字符集
String fileName = URLEncoder.encode(jsonFile.getString("device_name")+"报废表", "UTF-8");
response.setHeader("Content-Disposition", "attachment; filename*=UTf-8''"+fileName+".docx");
// 处理数据
DownloadWordDto data = DownloadWordDto.builder()
.assets_name(jsonFile.getString("assets_name"))
.assets_code(jsonFile.getString("assets_code"))
.device_spec(jsonFile.getString("device_spec"))
.leavefactory_number(jsonFile.getString("leavefactory_number"))
.leavefactory_date(jsonFile.getString("leavefactory_date"))
.oraginal_value(jsonFile.getString("oraginal_value"))
.net_amount(jsonFile.getString("net_amount"))
.belong_dept(jsonDept.getString("name"))
.user_name(jsonFile.getString("user_name")).build();
// 获取本地模板
String path = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("DEVICE_WORD_PATH").getValue();
// 下载
File file = new File(path);
EasyWord.of(file).doWrite(data).toOutputStream(response.getOutputStream());
} catch (Exception e) {
System.out.println(e.getMessage());
throw new BadRequestException("下载异常");
}
}
}

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/run/service/impl/DevicerunrecordServiceImpl.java
View File

@@ -111,6 +111,10 @@ public class DevicerunrecordServiceImpl implements DevicerunrecordService {
String run_date = whereJson.getString("run_date");
JSONObject jsonFile = WQLObject.getWQLObject("EM_BI_EquipmentFile").query("devicerecord_id = '" + devicerecord_id + "'").uniqueResult(0);
String status = jsonFile.getString("status");
if (!"10,11,20,30,40".contains(status)) {
throw new BadRequestException("此设备不能填报");
}
double run_times = whereJson.getDoubleValue("run_times"); //生产时间
double prepare_times = whereJson.getDoubleValue("prepare_times");//准备时间
@@ -185,6 +189,9 @@ public class DevicerunrecordServiceImpl implements DevicerunrecordService {
json.put("oee_value", 0);
}
tab.update(json);
String run_date = json.getString("run_date");
JSONArray jsonMst = tab.query("devicerecord_id = '" + devicerecord_id + "' and run_date = '" + run_date + "'").getResultJSONArray(0);
if (jsonMst.size() > 1) throw new BadRequestException("填报信息已存在");
}
@Override

20
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java
View File

@@ -47,10 +47,12 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ
String class_idStr = (String) whereJson.get("class_idStr");
String material_code = MapUtil.getStr(whereJson, "material_code");
String type = MapUtil.getStr(whereJson, "type");
String is_all = MapUtil.getStr(whereJson, "is_all");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("type",type);
map.put("is_all",is_all);
if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%"+material_code+"%");
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {
@@ -61,15 +63,7 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
JSONObject json = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.material_id DESC");
JSONArray content = json.getJSONArray("content");
for (int i = 0; i < content.size(); i++) {
JSONObject jsonObject = content.getJSONObject(i);
if (ObjectUtil.isEmpty(jsonObject.getString("safe_ivt_up"))) jsonObject.put("safe_ivt_up","99999999");
if (ObjectUtil.isEmpty(jsonObject.getString("safe_ivt_down"))) jsonObject.put("safe_ivt_down","0");
}
json.put("content",content);
JSONObject json = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "a.material_id DESC");
return json;
}
@@ -156,10 +150,12 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ
String class_idStr = (String) whereJson.get("class_idStr");
String material_code = MapUtil.getStr(whereJson, "material_code");
String type = MapUtil.getStr(whereJson, "type");
String is_all = MapUtil.getStr(whereJson, "is_all");
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("type",type);
map.put("is_all",is_all);
if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%"+material_code+"%");
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {
@@ -172,12 +168,6 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ
}
JSONArray rows = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).process().getResultJSONArray(0);
for (int i = 0; i < rows.size(); i++) {
JSONObject jsonObject = rows.getJSONObject(i);
if (ObjectUtil.isEmpty(jsonObject.getString("safe_ivt_up"))) jsonObject.put("safe_ivt_up","99999999");
if (ObjectUtil.isEmpty(jsonObject.getString("safe_ivt_down"))) jsonObject.put("safe_ivt_down","0");
}
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < rows.size(); i++) {
JSONObject jo = rows.getJSONObject(i);

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

@@ -17,6 +17,7 @@
输入.classIds TYPEAS f_string
输入.material_code TYPEAS s_string
输入.type TYPEAS s_string
输入.is_all TYPEAS s_string
[临时表]
@@ -43,43 +44,72 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT
mater.material_code,
mater.material_name,
MAX( class.class_name ) AS class_name,
MAX( saivt.safe_ivt_up ) AS safe_ivt_up,
MAX( saivt.safe_ivt_down ) AS safe_ivt_down,
sum(ivt.ivt_qty) AS ivt_qty,
MAX(ivt.qty_unit_name) AS qty_unit_name
FROM
EM_BI_DeviceSparePartIvt ivt
LEFT JOIN ST_IVT_MaterialSafeIvt saivt ON saivt.material_id = ivt.material_id
LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id
LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id
WHERE
1=1
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
SELECT
a.material_id,
a.material_code,
a.material_name,
a.class_name,
a.safe_ivt_up,
a.safe_ivt_down,
a.ivt_qty,
a.qty_unit_name
FROM
(
SELECT
mater.material_id,
mater.material_code,
mater.material_name,
class.class_name,
(
CASE
WHEN fivt.safe_ivt_up is null THEN 99999999 ELSE fivt.safe_ivt_up
END
) AS safe_ivt_up,
(
CASE
WHEN fivt.safe_ivt_down is null THEN 0 ELSE fivt.safe_ivt_down
END
) AS safe_ivt_down,
(
CASE
WHEN pivt.ivt_qty is null THEN 0 ELSE pivt.ivt_qty
END
) AS ivt_qty,
unit.unit_name AS qty_unit_name
FROM
md_me_materialbase mater
LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id
LEFT JOIN ST_IVT_MaterialSafeIvt fivt ON fivt.material_id = mater.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id
LEFT JOIN (
SELECT
SUM(ivt.ivt_qty) AS ivt_qty,
ivt.material_id
FROM
EM_BI_DeviceSparePartIvt ivt
WHERE
1=1
group by ivt.material_id
) pivt ON pivt.material_id = mater.material_id
WHERE
1=1
OPTION 输入.material_code <> ""
(mater.material_code like 输入.material_code or
mater.material_name like 输入.material_code)
ENDOPTION
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
OPTION 输入.type = "01"
ivt.ivt_qty > saivt.safe_ivt_up
ENDOPTION
OPTION 输入.material_code <> ""
(mater.material_code like 输入.material_code or
mater.material_name like 输入.material_code)
ENDOPTION
) AS a
OPTION 输入.type = "02"
ivt.ivt_qty < saivt.safe_ivt_down
ENDOPTION
WHERE
1=1
OPTION 输入.type = "03"
saivt.safe_ivt_up <= ivt.ivt_qty <= saivt.safe_ivt_up
ENDOPTION
group by ivt.material_id
OPTION 输入.is_all <> "0"
a.safe_ivt_down > a.ivt_qty or a.ivt_qty > a.safe_ivt_up
ENDOPTION
ENDSELECT
ENDPAGEQUERY

12
mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
View File

@@ -407,7 +407,7 @@ export default {
if (!'00,11'.includes(rows[i].status)) {
this.sub_flag = true
}
if (!'00,10'.includes(rows[i].status)) {
if (!'10'.includes(rows[i].status)) {
this.dissub_flag = true
}
if (rows.length !== 1) {
@@ -477,12 +477,12 @@ export default {
LODOP.PRINT_INIT('')
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 9)
LODOP.SET_PRINT_STYLE('FontSize', 12)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('10mm', '15mm', '60mm', '20mm', '128A', data.device_code)
LODOP.ADD_PRINT_TEXT('35mm', '15mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
LODOP.ADD_PRINT_TEXT('40mm', '15mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
LODOP.ADD_PRINT_TEXT('45mm', '15mm', '80mm', '15mm', '型号：' + data.device_model + '')
LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '20mm', '128A', data.device_code)
LODOP.ADD_PRINT_TEXT('34mm', '12mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
LODOP.ADD_PRINT_TEXT('42mm', '12mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
LODOP.ADD_PRINT_TEXT('49mm', '12mm', '80mm', '15mm', '设备型号：' + data.device_model + '')
LODOP.PRINT()// 打印
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()

6
mes/qd/src/views/wms/ql/factorywarranty/index.vue
View File

@@ -120,7 +120,7 @@
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.inspection_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="path" label="质保书列表" width="80px">
<el-table-column prop="path" label="质保书列表" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
<el-button type="primary" icon="el-icon-folder-opened" circle @click="Picconfirm(scope.$index, scope.row)" />
</template>
@@ -136,9 +136,9 @@
<el-table-column prop="source_bill_code" label="源单据编号" width="150px" />
<el-table-column prop="input_optname" label="创建人" />
<el-table-column prop="input_time" label="创建时间" width="150px" />
<el-table-column prop="check_optname" label="检验人姓名" />
<el-table-column prop="check_optname" label="检验人" />
<el-table-column prop="check_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">

12
mes/qd/src/views/wms/ql/physicalMst/index.vue
View File

@@ -138,7 +138,7 @@
<el-input v-model="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料" prop="material_name">
<el-input v-model="form.material_name" disabled class="input-with-select">
<el-input v-model="form.material_name" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater" />
</el-input>
</el-form-item>
@@ -186,13 +186,13 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="inspection_id" label="理化质检单标识" />
<el-table-column prop="inspection_code" label="质检单号" width="135" />
<el-table-column prop="inspection_type" label="单据类型" :formatter="format_inspection_type" />
<el-table-column min-width="100" show-overflow-tooltip prop="inspection_type" label="单据类型" :formatter="format_inspection_type" />
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus" />
<el-table-column v-if="false" prop="biz_date" label="业务日期" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="pcsn" label="批号" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_effective" label="是否有效" :formatter="format_is_active" />
<el-table-column prop="result" label="结果" :formatter="format_result" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
@@ -200,7 +200,7 @@
<el-table-column prop="input_time" label="创建时间" width="135" />
<el-table-column prop="check_optname" label="检验人" />
<el-table-column prop="check_time" label="检验时间" width="135" />
<el-table-column prop="confirm_optname" label="结论判定人" />
<el-table-column prop="confirm_optname" label="结论判定人" min-width="100" />
<el-table-column prop="confirm_time" label="结论判定时间" width="135" />
<el-table-column label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
@@ -217,7 +217,7 @@
<pagination />
</div>
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
<Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id" />
<RelevancyDialog :dialog-show.sync="RelevancyShow" @RelevancyChanged="RelevancyChanged" />
@@ -318,7 +318,7 @@ export default {
this.crud.toQuery()
})
},
queryMater(){
queryMater() {
this.materShow = true
},
resultEnter(data) {

60
mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue
View File

@@ -94,7 +94,7 @@
/>
</el-select>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
</div>
@@ -154,18 +154,18 @@
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-input v-if="false" v-model="form.material_id"/>
<el-input v-if="false" v-model="form.material_id" />
<el-form-item label="质检单号" prop="inspection_code">
<el-input v-model="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;"/>
<el-input v-model="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料" prop="material_name">
<el-input v-model="form.material_name" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater"/>
<el-button slot="append" icon="el-icon-search" @click="queryMater" />
</el-input>
</el-form-item>
<el-form-item label="批号" prop="pcsn">
<el-input v-model="form.pcsn" style="width: 370px;"/>
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="单据类型" prop="inspection_type">
<el-select
@@ -184,11 +184,11 @@
</el-select>
</el-form-item>
<el-form-item v-if="form.inspection_type==='30'" label="关联单号" prop="inspection_id_gu">
<el-input v-model="form.inspection_id_gu" clearable style="width: 370px;" @focus="RelevancyShow=true"/>
<el-input v-model="form.inspection_id_gu" clearable style="width: 370px;" @focus="RelevancyShow=true" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -205,25 +205,25 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="inspection_id" label="理化质检单标识"/>
<el-table-column prop="inspection_code" label="质检单号" width="135"/>
<el-table-column prop="inspection_type" label="单据类型" :formatter="format_inspection_type"/>
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus"/>
<el-table-column v-if="false" prop="biz_date" label="业务日期"/>
<el-table-column v-if="false" prop="material_id" label="物料标识"/>
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip/>
<el-table-column min-width="110" show-overflow-tooltip prop="pcsn" label="批号"/>
<el-table-column prop="is_effective" label="是否有效" :formatter="format_is_active"/>
<el-table-column prop="result" label="结果" :formatter="format_result"/>
<el-table-column prop="remark" show-overflow-tooltip label="备注"/>
<el-table-column prop="input_optname" label="创建人"/>
<el-table-column prop="input_time" label="创建时间" width="135"/>
<el-table-column prop="check_optname" label="检验人"/>
<el-table-column prop="check_time" label="检验时间" width="135"/>
<el-table-column prop="confirm_optname" label="结论判定人"/>
<el-table-column prop="confirm_time" label="结论判定时间" width="135"/>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="inspection_id" label="理化质检单标识" />
<el-table-column prop="inspection_code" label="质检单号" width="135" />
<el-table-column min-width="100" show-overflow-tooltip prop="inspection_type" label="单据类型" :formatter="format_inspection_type" />
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus" />
<el-table-column v-if="false" prop="biz_date" label="业务日期" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip />
<el-table-column min-width="110" show-overflow-tooltip prop="pcsn" label="批号" />
<el-table-column prop="is_effective" label="是否有效" :formatter="format_is_active" />
<el-table-column prop="result" label="结果" :formatter="format_result" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
<el-table-column prop="input_optname" label="创建人" />
<el-table-column prop="input_time" label="创建时间" width="135" />
<el-table-column prop="check_optname" label="检验人" />
<el-table-column prop="check_time" label="检验时间" width="135" />
<el-table-column prop="confirm_optname" label="结论判定人" min-width="100" show-overflow-tooltip />
<el-table-column prop="confirm_time" label="结论判定时间" width="135" />
<el-table-column label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -236,12 +236,12 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2"/>
<Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id"/>
<RelevancyDialog :dialog-show.sync="RelevancyShow" @RelevancyChanged="RelevancyChanged"/>
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
<Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id" />
<RelevancyDialog :dialog-show.sync="RelevancyShow" @RelevancyChanged="RelevancyChanged" />
</div>
</template>

6
mes/qd/src/views/wms/ql/workprocedureQl/index.vue
View File

@@ -181,12 +181,12 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="inspection_id" label="工序质检单标识" />
<el-table-column prop="inspection_code" label="质检单号" width="120px" />
<el-table-column prop="workordercard_id" label="工艺指令卡" />
<el-table-column prop="workordercard_id" label="工艺指令卡" min-width="90" show-overflow-tooltip />
<el-table-column prop="workprocedure_name" label="工序名称" />
<el-table-column prop="device_name" label="设备名称" />
<el-table-column prop="bucketunique" label="桶号" min-width="120" show-overflow-tooltip/>
<el-table-column prop="bucketunique" label="桶号" min-width="120" show-overflow-tooltip />
<el-table-column prop="record_order" label="桶顺序号" />
<el-table-column prop="material_code" label="产品编码" width="120px" show-overflow-tooltip/>
<el-table-column prop="material_code" label="产品编码" width="120px" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus" />
<el-table-column prop="result" label="处理结果" :formatter="formatResultName" />

2
mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue
View File

@@ -12,7 +12,7 @@
label-suffix=":"
>
<el-form-item label="填报日期">
<date-range-picker v-model="query.createTime" class="date-item" />
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd" />
</el-form-item>
<el-form-item label="设备类别">
<treeselect

30
mes/qd/src/views/wms/sb/run/devicescrap/index.vue
View File

@@ -12,7 +12,7 @@
label-suffix=":"
>
<el-form-item label="启用日期">
<date-range-picker v-model="query.createTime" class="date-item" />
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="设备类别">
<treeselect
@@ -114,6 +114,17 @@
>
报废
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length !== 1"
@click="downloadWord"
>
下载Word
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
@@ -161,6 +172,8 @@ import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import DateRangePicker from '@/components/DateRangePicker'
import {download} from "@/api/data";
import {downloadFile} from "@/utils";
const defaultForm = { status: null }
export default {
@@ -253,9 +266,9 @@ export default {
scrap() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
if (data.is_active !== '1') {
return this.crud.notify('设备未启用或不存在', CRUD.NOTIFICATION_TYPE.INFO)
}
// if (data.status !== '10') {
// return this.crud.notify('设备未启用或不存在', CRUD.NOTIFICATION_TYPE.INFO)
// }
if (data.device_is_delete === '1') {
return this.crud.notify('设备不存在或被删除', CRUD.NOTIFICATION_TYPE.INFO)
}
@@ -267,6 +280,15 @@ export default {
} else {
return this.crud.notify('设备状态不为正常或者闲置', CRUD.NOTIFICATION_TYPE.INFO)
}
},
downloadWord() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
download('/api/devicescrap/downloadWord', { 'devicerecord_id': data.devicerecord_id }).then(result => {
const name = data.device_name + '报废档案'
this.crud.toQuery()
downloadFile(result, name, 'docx')
})
}
}
}

5
mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue
View File

@@ -55,8 +55,9 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="sect_code" label="库区编码" />
<el-table-column prop="sect_name" label="库区名称" />
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="名称" />
<el-table-column prop="material_code" label="物料编码" show-overflow-tooltip/>
<el-table-column prop="material_name" label="名称" show-overflow-tooltip/>
<el-table-column prop="sparepart_only_id" label="备件唯一码" show-overflow-tooltip/>
<el-table-column prop="material_model" label="型号" />
<el-table-column prop="material_spec" label="技术规格" />
<el-table-column prop="pcsn" label="批次" />

35
mes/qd/src/views/wms/sb/stat/devicesafetyqtyquery/index.vue
View File

@@ -28,23 +28,10 @@
placeholder="编码、名称"
/>
</el-form-item>
<el-form-item label="仅显示预警" label-width="120px">
<el-switch v-model="query.is_all" active-value="1" inactive-value="0" @change="crud.toQuery()"/>
</el-form-item>
<!-- <el-form-item label="库存类型">
<el-select
v-model="query.type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in deviceTypeList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>-->
<rrOperation />
</el-form>
@@ -68,9 +55,9 @@
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="class_name" label="物料分类" />
<el-table-column prop="safe_ivt_up" label="安全库存上限" />
<el-table-column prop="safe_ivt_down" label="安全库存下限" />
<el-table-column prop="ivt_qty" label="库存" />
<el-table-column prop="safe_ivt_up" label="安全库存上限" :formatter="crud.formatNum2" />
<el-table-column prop="safe_ivt_down" label="安全库存下限" :formatter="crud.formatNum2" />
<el-table-column prop="ivt_qty" label="库存" :formatter="crud.formatNum2" />
<el-table-column prop="qty_unit_name" label="单位" />
</el-table>
<!--分页组件-->
@@ -186,16 +173,6 @@ export default {
})
}
},
formatUp(row, cloum) {
if (row.safe_ivt_up === '') {
return '999999'
}
},
formatDown(row, cloum) {
if (row.safe_ivt_down === '') {
return '0'
}
},
cellStyle({ row, column, rowIndex, columnIndex }) {
const safe_ivt_down = parseInt(row.safe_ivt_down)
const safe_ivt_up = parseInt(row.safe_ivt_up)

4
mes/qd/src/views/wms/st/core/inbill/rawassist/index.vue
View File

@@ -167,7 +167,7 @@
@select-all="onSelectAll"
>
<el-table-column type="selection" width="55" />
<!-- <el-table-column
<!-- <el-table-column
label="操作"
width="115"
align="center"
@@ -184,7 +184,7 @@
</el-table-column>-->
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />

8
mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
View File

@@ -200,8 +200,8 @@
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码" />
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column prop="io_type" label="出入库类型" :formatter="ioFormat" width="80" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" width="100" label="业务类型" />
<el-table-column prop="io_type" label="出入库类型" :formatter="ioFormat" min-width="100" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" width="100" />
@@ -239,7 +239,7 @@ import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
export default {
name: 'ioStorQuery',
name: 'IoStorQuery',
components: { crudOperation, rrOperation, pagination, TaskDialog, DivDialog },
cruds() {
return CRUD({ title: '出入库单报表', idField: 'iostorinv_id', url: 'api/checkoutbill', crudMethod: { ...checkoutbill },
@@ -253,7 +253,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['ST_QUALITY_SCODE','io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload'],
dicts: ['ST_QUALITY_SCODE', 'io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',