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

opt:刻字输送线任务下发控制

Browse Source
This commit is contained in:
zhangzhiqiang
2023-09-13 18:33:59 +08:00
parent aae00c55c4
commit 88c6ad2d37
16 changed files with 234 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/xml/EmBiStructivtMapper.xml
View File

@@ -22,8 +22,6 @@
LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
<where>
ivt.canuse_qty > 0
AND
sa.lock_type = '0'
<if test="query.material_search != null and query.material_search != ''">
and (mb.material_code like '%${query.material_search}%' OR
mb.material_name like '%${query.material_search}%' OR

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
View File

@@ -293,20 +293,6 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
map.put("useIds", useIds);
}
// 如果班组为空 则默认当前用户部门
/* if (ObjectUtil.isEmpty(use_id) && ObjectUtil.isEmpty(dept_id)) {
// 获取当前登陆用户
Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId());
JSONObject jsonUser = WQLObject.getWQLObject("sys_user").query("user_id = '" + currentUserId + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonUser)) {
String dept_str = deptService.getChildIdStr(jsonUser.getLong("dept_id"));
if (ObjectUtil.isNotEmpty(dept_str)) {
map.put("dept_str",dept_str);
}
}
}*/
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "file.update_time DESC");
return json;

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java
View File

@@ -14,6 +14,7 @@ import org.nl.wms.quality_manage.service.report.IQlTestInspectionsheetmstService
import org.nl.wms.quality_manage.service.report.dao.QlTestInspectionsheetdtl;
import org.nl.wms.quality_manage.service.report.dao.QlTestInspectionsheetmst;
import org.nl.wms.quality_manage.service.report.dto.SheetQuery;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -36,6 +37,7 @@ public class QlTestInspectionsheetmstController {
@Autowired
private IQlTestInspectionsheetdtlService inspectionsheetdtlService;
@PostMapping
@Log("新增质检单")
//("新增质检单")
@@ -89,11 +91,8 @@ public class QlTestInspectionsheetmstController {
@Log("确认质检单")
//("确认质检单")
public ResponseEntity<Object> confirm(@RequestBody QlTestInspectionsheetmst mst) {
mst.setBill_status(TCEnum.BILL_STATUS.code("完成"));
mst.setConfirm_optid(SecurityUtils.getCurrentUserId());
mst.setConfirm_optname(SecurityUtils.getCurrentNickName());
mst.setConfirm_time(DateUtil.now());
inspectionsheetmstService.updateById(mst);
inspectionsheetmstService.confirm(mst);
return new ResponseEntity<>(HttpStatus.OK);
}
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/TCEnum.java
View File

@@ -18,7 +18,7 @@ public enum TCEnum {
//出入库类型
RESULT_TYPE(MapOf.of("合格", "1", "不合格", "2","紧急放行","3")),
//生成方式
CREATE_MODE(MapOf.of("PC生成", "1", "终端生成", "2","外部借口产生","3")),
CREATE_MODE(MapOf.of("PC生成", "01", "终端生成", "02","外部借口产生","03")),
//是否
GRADE_TYPE(MapOf.of("一级", "1", "二级", "2", "三级", "3")),
//单据状态

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/IQlTestInspectionsheetmstService.java
View File

@@ -24,6 +24,8 @@ public interface IQlTestInspectionsheetmstService extends IService<QlTestInspect
void update(JSONObject jo);
void confirm(QlTestInspectionsheetmst jo);
Object pageQuery(SheetQuery query, PageQuery page);
JSONObject getResult(JSONObject whereJson);

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetmst.java
View File

@@ -158,12 +158,12 @@ public class QlTestInspectionsheetmst implements Serializable {
/**
* 修改人
*/
private String update_optid;
private String update_id;
/**
* 修改人姓名
*/
private String update_optname;
private String update_name;
/**
* 修改时间
@@ -173,12 +173,12 @@ public class QlTestInspectionsheetmst implements Serializable {
/**
* 确认人
*/
private String confirm_optid;
private String confirm_id;
/**
* 确认人姓名
*/
private String confirm_optname;
private String confirm_name;
/**
* 确认时间
@@ -208,7 +208,7 @@ public class QlTestInspectionsheetmst implements Serializable {
/**
* 车间标识
*/
private String workshop_id;
private String product_area;
}

79
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java
View File

@@ -27,8 +27,13 @@ import org.nl.wms.quality_manage.service.report.dao.mapper.QlTestInspectionsheet
import org.nl.wms.quality_manage.service.report.IQlTestInspectionsheetmstService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.quality_manage.service.report.dto.SheetQuery;
import org.nl.wms.storage_manage.IOSEnum;
import org.nl.wms.storage_manage.IVTEnum;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.IStIvtIostorinvYlService;
import org.nl.wms.storage_manage.rawmanage.service.iostorInv.dao.StIvtIostorinvYl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -49,7 +54,11 @@ public class QlTestInspectionsheetmstServiceImpl extends ServiceImpl<QlTestInspe
@Autowired
private IMdMeMaterialbaseService meMaterialbaseService;
@Autowired
private IStIvtIostorinvYlService iostorinvYlService;
@Override
@Transactional
public void create(JSONObject jo) {
// 调用主表 插入/更新方法
QlTestInspectionsheetmst mst = packageMstForm(new QlTestInspectionsheetmst(), jo);
@@ -60,11 +69,12 @@ public class QlTestInspectionsheetmstServiceImpl extends ServiceImpl<QlTestInspe
}
@Override
@Transactional
public void update(JSONObject form) {
Assert.notNull(form.get("inspection_id"), "请求参数不能为空");
QlTestInspectionsheetmst mst = form.toJavaObject(QlTestInspectionsheetmst.class);
mst.setUpdate_optid(SecurityUtils.getCurrentUserId());
mst.setUpdate_optname(SecurityUtils.getCurrentNickName());
mst.setUpdate_id(SecurityUtils.getCurrentUserId());
mst.setUpdate_name(SecurityUtils.getCurrentNickName());
mst.setUpdate_time(DateUtil.now());
this.updateById(mst);
@@ -72,6 +82,66 @@ public class QlTestInspectionsheetmstServiceImpl extends ServiceImpl<QlTestInspe
inspectionsheetdtlService.create(mst);
}
@Override
@Transactional
public void confirm(QlTestInspectionsheetmst mst) {
//生成原材料入库单据
String now = DateUtil.now();
mst.setBill_status(TCEnum.BILL_STATUS.code("完成"));
mst.setConfirm_id(SecurityUtils.getCurrentUserId());
mst.setConfirm_name(SecurityUtils.getCurrentNickName());
mst.setConfirm_time(now);
this.updateById(mst);
JSONArray tableData = new JSONArray();
{
JSONObject item = new JSONObject();
item.put("agree_time", DateUtil.today());
item.put("syscompanyid", "111");
item.put("sysdeptid", "111");
item.put("audit_id", SecurityUtils.getCurrentUserId());
item.put("audit_time", now);
item.put("need_qty", mst.getQty());
item.put("create_id", SecurityUtils.getCurrentUserId());
item.put("create_time", now);
item.put("create_name", SecurityUtils.getCurrentUsername());
item.put("create_mode", TCEnum.CREATE_MODE.code("PC生成"));
item.put("purchase_time", now);
item.put("purchase_id", SecurityUtils.getCurrentUserId());
item.put("purchase_name", SecurityUtils.getCurrentUsername());
item.put("qty_unit_name", "KG");
item.put("qty_unit_id", "1");
item.put("sect_id", "1528631043903590400");
item.put("struct_id", "1528636861080276992");
item.put("source_bill_code", mst.getInspection_code());
item.put("po_code", mst.getInspection_code());
item.put("source_bill_type_name", "质检单");
item.put("total_qty", 0);
item.put("safe_qty", 0);
item.put("instor_qty", 0);
item.put("plan_qty", mst.getQty());
item.put("is_delete", false);
item.put("workshop_id", mst.getProduct_area());
item.put("material_id", mst.getMaterial_id());
item.put("status", mst.getProduct_area());
item.put("ivt_level", IVTEnum.IVT_LEVEL.code("一级"));
item.put("quality_scode", IVTEnum.QUALITY_SCODE.code("合格品"));
item.put("is_active", "1");
tableData.add(item);
}
JSONObject ylmst = new JSONObject();
// 新增
ylmst.put("bill_status",IOSEnum.BILL_STATUS.code("生成"));
ylmst.put("total_qty",mst.getQty());
ylmst.put("detail_count",1);
ylmst.put("stor_id",IOSEnum.STOR_CODE.code("原材料仓"));
ylmst.put("bill_type",IOSEnum.BILL_TYPE.code("手工入库"));
ylmst.put("buss_type",IOSEnum.BILL_TYPE.code("手工入库"));
ylmst.put("biz_date",DateUtil.today());
ylmst.put("tableData",tableData);
iostorinvYlService.create(ylmst);
}
@Override
public Object pageQuery(SheetQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
@@ -88,6 +158,7 @@ public class QlTestInspectionsheetmstServiceImpl extends ServiceImpl<QlTestInspe
mst.setBiz_date(DateUtil.today());
mst.setMaterial_id(whereJson.getString("material_id"));
mst.setPcsn(DateUtil.today());
mst.setQty(whereJson.getBigDecimal("qty"));
mst.setQty_unit_id(whereJson.getString("qty_unit_id"));
mst.setQty_unit_name(whereJson.getString("qty_unit_name"));
mst.setSource_bill_id(whereJson.getString("source_bill_id"));
@@ -106,8 +177,8 @@ public class QlTestInspectionsheetmstServiceImpl extends ServiceImpl<QlTestInspe
@Override
public void saveResult(JSONObject whereJson) {
QlTestInspectionsheetmst mst = whereJson.toJavaObject(QlTestInspectionsheetmst.class);
mst.setUpdate_optid(SecurityUtils.getCurrentUserId());
mst.setUpdate_optname(SecurityUtils.getCurrentNickName());
mst.setUpdate_id(SecurityUtils.getCurrentUserId());
mst.setUpdate_name(SecurityUtils.getCurrentNickName());
mst.setUpdate_time(DateUtil.now());
mst.setBill_status(TCEnum.BILL_STATUS.code("确认"));
this.updateById(mst);

27
mes/hd/nladmin-system/src/main/resources/sql/0901维护.sql
View File

@@ -32,5 +32,32 @@ INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`,
INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1701563798009286656', 'ST_INV_BCP_IN_OUT_TYPE', '半成品出入库类型', '出库', '1', 1, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-12 19:49:57', '1694303357524643840', '管理员', '2023-09-12 19:49:57');
INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1701558260970164224', 'ST_INV_BCP_IN_OUT_TYPE', '半成品出入库类型', '入库', '0', 0, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-12 19:27:57', '1694303357524643840', '管理员', '2023-09-12 19:27:57');
-- ql_test_inspectionsheetmst表更新
-- 质检相关
INSERT INTO `hl_one_mes`.`sys_code_rule`(`id`, `code`, `name`, `current_value`, `remark`, `is_active`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('c9674fd7ef1e4511111b32a05ba511cd', 'F_CODE', '移库单编码', NULL, NULL, '1', '0', 0, NULL, '2022-01-06 08:51:50', NULL, NULL, NULL);
INSERT INTO `hl_one_mes`.`sys_code_rule_detail`(`id`, `type`, `init_value`, `current_value`, `max_value`, `step`, `fillchar`, `format`, `length`, `sort_num`, `remark`, `code_rule_id`, `is_active`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('af1de297e11111159f74b7dc1c462c67', '02', '20230912', '20230912', '', '', '', 'yyyyMMdd', NULL, 2, '', 'c9674fd7ef1e4511111b32a05ba511cd', '1', '0', 0, '', '2022-01-06 08:55:31', 0, '', '');
INSERT INTO `hl_one_mes`.`sys_code_rule_detail`(`id`, `type`, `init_value`, `current_value`, `max_value`, `step`, `fillchar`, `format`, `length`, `sort_num`, `remark`, `code_rule_id`, `is_active`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('bbadbd46d11111191213d35c7f99c5f', '01', 'F', 'F', '', '', '', '', NULL, 1, '', 'c9674fd7ef1e4511111b32a05ba511cd', '1', '0', 0, '', '2022-01-06 08:54:58', 0, '', '2022-01-06 08:55:25');
INSERT INTO `hl_one_mes`.`sys_code_rule_detail`(`id`, `type`, `init_value`, `current_value`, `max_value`, `step`, `fillchar`, `format`, `length`, `sort_num`, `remark`, `code_rule_id`, `is_active`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('eb7f7e7bf3754f1111110b202def07b9', '03', '0', '19', '999', '1', '0', '', 3, 3, '', 'c9674fd7ef1e4511111b32a05ba511cd', '1', '0', 0, '', '2022-01-06 08:56:01', 0, '', '');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1670995728920612864', 'QL_TEST_POINTTYPE', '项点类别', '质保项', '01', 10, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-20 11:23:22', '1', '管理员', '2023-06-20 11:23:22');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1670995948370792448', 'QL_TEST_POINTTYPE', '项点类别', '自检项', '02', 20, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-20 11:24:14', '1', '管理员', '2023-06-20 11:24:14');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1670996008391282688', 'QL_TEST_POINTTYPE', '项点类别', '检验项', '03', 30, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-20 11:24:28', '1', '管理员', '2023-06-20 11:24:28');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1670996155804291072', 'QC_INSPECTION_TYPE', '检验方式', '定性', '01', 10, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-20 11:25:03', '1', '管理员', '2023-06-20 11:25:03');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1670996281528553472', 'QC_INSPECTION_TYPE', '检验方式', '定量', '02', 20, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-20 11:25:33', '1', '管理员', '2023-06-20 11:25:33');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1671347090304929792', 'QC_INSPECTION_SCHEME_TYPE', '方案类别', '原料', '01', 10, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-21 10:39:33', '1', '管理员', '2023-06-21 10:39:33');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1671347233536217088', 'QC_INSPECTION_SCHEME_TYPE', '方案类别', '半成品', '02', 20, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-21 10:40:07', '1', '管理员', '2023-06-21 10:40:21');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1671347339761160192', 'QC_INSPECTION_SCHEME_TYPE', '方案类别', '成品', '03', 30, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-21 10:40:32', '1', '管理员', '2023-06-21 10:40:32');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672926997413761024', 'QC_BILL_STATUS', '检测单单据状态', '生成', '10', 1, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 19:17:32', '1', '管理员', '2023-06-25 19:17:32');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672927171125055488', 'QC_BILL_STATUS', '检测单单据状态', '提交', '20', 2, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 19:18:13', '1', '管理员', '2023-06-25 19:18:13');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672927218428416000', 'QC_BILL_STATUS', '检测单单据状态', '检测中', '30', 3, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 19:18:25', '1', '管理员', '2023-06-25 19:18:25');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672927268667789312', 'QC_BILL_STATUS', '检测单单据状态', '确认', '50', 4, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 19:18:37', '1', '管理员', '2023-06-25 19:18:37');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672927310661160960', 'QC_BILL_STATUS', '检测单单据状态', '完成', '99', 5, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 19:18:47', '1', '管理员', '2023-06-25 19:18:47');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672928867851046912', 'qc_result', '检测结果', '合格', '1', 1, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 19:24:58', '1', '管理员', '2023-06-25 19:24:58');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672929052471726080', 'qc_result', '检测结果', '不合格', '2', 2, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 19:25:42', '1', '管理员', '2023-06-25 19:25:42');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672929090488897536', 'qc_result', '检测结果', '紧急放行', '3', 3, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 19:25:51', '1', '管理员', '2023-06-25 19:25:51');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672939722785296384', 'qc_grade', '质检等级', '一级', '1', 1, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 20:08:06', '1', '管理员', '2023-06-25 20:08:31');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672939937948897280', 'qc_grade', '质检等级', '二级', '2', 2, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 20:08:57', '1', '管理员', '2023-06-25 20:08:57');
INSERT INTO `sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1672939964830191616', 'qc_grade', '质检等级', '三级', '3', 3, NULL, NULL, NULL, NULL, '1', '管理员', '2023-06-25 20:09:04', '1', '管理员', '2023-06-25 20:09:04');

4
mes/qd/src/views/wms/analysis_manage/inspection/inspectionpoint.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/mdQlInspectionpoint/create',
url: '/api/inspectionItemPoint/create',
method: 'post',
data
})
@@ -10,7 +10,7 @@ export function add(data) {
export function del(ids) {
return request({
url: '/api/mdQlInspectionpoint/delete',
url: '/api/inspectionItemPoint/delete',
method: 'post',
data: ids
})

4
mes/qd/src/views/wms/masterdata_manage/master/materialParameters/index.vue
View File

@@ -69,7 +69,7 @@
<el-table-column prop="is_need_plan_name" label="是否参与需求计划计算" width="150px" />
<el-table-column prop="stock_is_need_move" label="原料是否配粉移库" width="150px" :formatter="stockIsNeedMove" />
<el-table-column prop="stock_standard_weight" label="原料标准桶重" width="100px" :formatter="crud.formatNum3" />
<el-table-column prop="stock_is_report_name" label="原料是否生成理化报告" width="150px" />
<el-table-column prop="stock_is_report_name" label="原料是否生成原料质检" width="150px" />
<el-table-column prop="wc_seqno" label="原料碳化钨顺序号" width="120px" />
<el-table-column prop="old_mark" label="原牌号" />
<el-table-column prop="product_mode_name" label="生产方式" />
@@ -78,7 +78,7 @@
<el-table-column prop="waste_limit_up" label="软废添加比列上限" width="120px" />
<el-table-column prop="standard_weight_pft" label="工令标准桶重" width="100px" :formatter="crud.formatNum3" />
<el-table-column prop="report_time" label="产品理化时间" width="100px" />
<el-table-column prop="produc_is_report_name" label="产品是否生成理化报告" width="150px" />
<el-table-column prop="produc_is_report_name" label="产品是否生成原料质检" width="150px" />
<el-table-column prop="product_is_need_move" label="产品是否配粉移库" width="150px" :formatter="productIsNeedMove" />
<el-table-column prop="is_again_put_name" label="是否二次投料" width="100px" />
<el-table-column prop="produc_standard_weight" label="产品标准桶重" width="100px" :formatter="crud.formatNum3" />

2
mes/qd/src/views/wms/masterdata_manage/master/materialParameters/view/CpDialog.vue
View File

@@ -214,7 +214,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否生成理化报告" prop="is_report">
<el-form-item label="是否生成原料质检" prop="is_report">
<el-radio v-model="formData.is_report" label="0">否</el-radio>
<el-radio v-model="formData.is_report" label="1">是</el-radio>
</el-form-item>

2
mes/qd/src/views/wms/masterdata_manage/master/materialParameters/view/YflDialog.vue
View File

@@ -88,7 +88,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否生成理化报告" prop="is_report">
<el-form-item label="是否生成原料质检" prop="is_report">
<el-radio v-model="formData.is_report" label="0">否</el-radio>
<el-radio v-model="formData.is_report" label="1">是</el-radio>
</el-form-item>

52
mes/qd/src/views/wms/pcs/purchaseorder/AddDialog.vue
View File

@@ -12,7 +12,7 @@
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span/>
<span />
</el-col>
<el-col :span="4">
<span>
@@ -57,16 +57,16 @@
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input v-model.trim="form.material_code" disabled class="input-with-select" style="width: 370px;">
<el-button slot="append" icon="el-icon-search" @click="insertEvent"/>
<el-button slot="append" icon="el-icon-search" @click="insertEvent" />
</el-input>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<label slot="label">物料名称:</label>
<el-input v-model="form.material_name" size="mini" disabled style="width: 210px"/>
<el-input v-model="form.material_name" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px"/>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -95,13 +95,13 @@
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<slot name="left" />
<el-button
v-if="crud.status.add > 0"
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
v-if="crud.status.add > 0"
size="mini"
@click="add"
>
@@ -118,10 +118,10 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center"/>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码"/>
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称"/>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="ask_time" label="要求到货日期" style="width: 250px">
<template slot-scope="scope">
<el-date-picker
@@ -147,9 +147,13 @@
/>
</template>
</el-table-column>
<!-- <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
<!-- <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="数量单位"/>
<!-- <el-table-column show-overflow-tooltip prop="safe_qty" label="安全库存"/>-->
<!-- <el-table-column show-overflow-tooltip prop="remark" label="总需求数量"/>-->
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="数量单位">
<template scope="scope">
KG
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="100" fixed="right">
<template scope="scope">
<el-button
@@ -173,7 +177,7 @@
</template>
<script>
import CRUD, {crud, form} from '@crud/crud'
import CRUD, { crud, form } from '@crud/crud'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudPurchase from '@/views/wms/pcs/purchaseorder/purchase'
@@ -183,8 +187,8 @@ const defaultForm = {
create_mode: '01',
material_code: '',
material_name: '',
qty_unit_id: '',
qty_unit_name: '',
qty_unit_id: '1',
qty_unit_name: 'KG',
total_qty: 0,
detail_count: '0',
workshop_id: '',
@@ -193,7 +197,7 @@ const defaultForm = {
export default {
name: 'AddDialog',
components: {MaterDtl},
components: { MaterDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_RAW_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
data() {
@@ -207,13 +211,13 @@ export default {
sects: [],
rules: {
product_code: [
{required: true, message: '生产车间不能为空', trigger: 'blur'}
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{required: true, message: '业务类型不能为空', trigger: 'blur'}
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
],
biz_date: [
{required: true, message: '业务日期不能为空', trigger: 'blur'}
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
]
}
}
@@ -268,15 +272,15 @@ export default {
}
},
tableChanged(item) {
this.form.qty_unit_id = item.base_unit_id
this.form.qty_unit_name = item.base_unit_name
this.form.qty_unit_id = '1'
this.form.qty_unit_name = 'KG'
this.form.material_code = item.material_code
this.form.material_name = item.material_name
this.form.material_id = item.material_id
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(row.plan_qty)
},
add() {
if (!this.form.material_code){
if (!this.form.material_code) {
this.crud.notify('请选择一种物料进行新增！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
@@ -284,8 +288,8 @@ export default {
row.material_code = this.form.material_code
row.material_name = this.form.material_name
row.qty_unit_name = this.form.qty_unit_name
this.$set(row,'ask_time',null)
this.$set(row,'qty',null)
this.$set(row, 'ask_time', null)
this.$set(row, 'qty', null)
this.form.tableData.splice(-1, 0, row)
},
insertEvent() {

69
mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue
View File

@@ -11,7 +11,7 @@
>
<el-row :gutter="20">
<el-col :span="18" style="border: 1px solid white">
<span/>
<span />
</el-col>
<el-col :span="6">
<span>
@@ -150,7 +150,7 @@
label="序号"
>
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
<span>{{ scope.$index+1 }}</span>
</template>
</el-table-column>
<el-table-column
@@ -167,6 +167,12 @@
label="项点类别"
:formatter="format_inspection_item_type"
/>
<el-table-column
width="100"
prop="inspection_type"
label="检测方式"
:formatter="typeFormat"
/>
<el-table-column
prop="down_limit"
label="合格下限(≥)"
@@ -187,6 +193,7 @@
>
<template slot-scope="scope">
<el-input-number
v-if="scope.row.inspection_type=='02'"
v-model="form1.tableData[scope.$index].value"
:controls="false"
size="mini"
@@ -194,6 +201,20 @@
:disabled="form1.bill_status === '99'"
:precision="4"
/>
<el-select
v-if="scope.row.inspection_type=='01'"
v-model="form1.tableData[scope.$index].value"
size="mini"
placeholder="请选择"
class="filter-item"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
@@ -214,19 +235,19 @@
</el-table>
</el-dialog>
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code="'05'" @tableChanged2="tableChanged2"/>
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code="'05'" @tableChanged2="tableChanged2" />
</div>
</template>
<script>
import CRUD, {crud} from '@crud/crud'
import CRUD, { crud } from '@crud/crud'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst/physicalMst'
export default {
name: 'Dialog1',
dicts: ['QL_TEST_POINTTYPE', 'qc_grade', 'qc_result'],
components: {MaterDtl},
dicts: ['QL_TEST_POINTTYPE', 'qc_grade', 'qc_result', 'QC_INSPECTION_TYPE', 'IS_OR_NOT'],
components: { MaterDtl },
mixins: [crud()],
props: {
visiable1: {
@@ -286,10 +307,7 @@ export default {
}
})
},
cellStyle({row, column, rowIndex, columnIndex}) {
// https://blog.csdn.net/qq_41648113/article/details/109337781
// https://blog.csdn.net/Akatsuki233/article/details/100311040
// https://blog.csdn.net/qq_45414633/article/details/107795124
cellStyle({ row, column, rowIndex, columnIndex }) {
const inspection_type = row.inspection_type
const is_limit_remark = row.is_limit_remark
const value = parseFloat(row.value)
@@ -326,6 +344,18 @@ export default {
}
}
}
if (inspection_type == '01') {
if (column.property === 'value') {
if (value == 1) {
row.is_ok = '1'
row.form_remark = ''
} else {
return 'background: red'
row.is_ok = '0'
row.value = '0'
}
}
}
},
computerResult() {
const rows = this.form1.tableData
@@ -340,13 +370,18 @@ export default {
this.$set(this.form1, 'result', '1')
var remark = ''
for (var row of rows) {
if (row.is_ok === '0') {
this.$set(this.form1, 'result', '2')
} else {
if (row.is_limit_remark === '1' && row.form_remark) {
remark += row.form_remark.replace('\n', '') + ','
console.log(row.is_ok + '_' + row.value)
if (row.is_ok == '1') {
if (row.inspection_type == '01') {
if (row.value == '0') {
this.$set(this.form1, 'result', '2')
break
}
}
}
if (row.is_ok == '0') {
this.$set(this.form1, 'result', '2')
}
}
this.$set(this.form1, 'remark', remark)
@@ -356,9 +391,11 @@ export default {
format_inspection_item_type(row, column) {
return this.dict.label.QL_TEST_POINTTYPE[row.inspection_item_type]
},
typeFormat(row, column) {
return this.dict.label.QC_INSPECTION_TYPE[row.inspection_type]
},
onSubmit() {
debugger
const msg = '是否继续！'
const data = this.form1.tableData
var flag = 0

2
mes/qd/src/views/wms/ql_manage/physicalMst/RelevancyDialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="理化报告单"
title="原料质检单"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close

64
mes/qd/src/views/wms/ql_manage/physicalMst/index.vue
View File

@@ -73,7 +73,7 @@
/>
</el-select>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
</div>
@@ -111,10 +111,10 @@
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<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.trim="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;"/>
<el-input v-model.trim="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="单据类型" prop="inspection_type">
<el-select
@@ -133,17 +133,17 @@
</el-form-item>
<el-form-item label="源单号" prop="source_bill_code">
<el-input v-model.trim="form.source_bill_code" disabled class="input-with-select" style="width: 370px;">
<el-button slot="append" icon="el-icon-search" @click="querySale"/>
<el-button slot="append" icon="el-icon-search" @click="querySale" />
</el-input>
</el-form-item>
<el-form-item label="物料" prop="material_name">
<el-input v-model.trim="form.material_name" style="width: 370px;"/>
<el-input v-model.trim="form.material_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="数量（KG）" prop="qty">
<el-input v-model.trim="form.qty" style="width: 370px;"/>
<el-input v-model.trim="form.qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model.trim="form.remark" style="width: 370px;" rows="2" type="textarea"/>
<el-input v-model.trim="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -160,19 +160,19 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="inspection_code" label="质检单号" width="135"/>
<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="qty" label="数量" min-width="100" show-overflow-tooltip/>
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus"/>
<el-table-column prop="result" label="结果" :formatter="format_result"/>
<el-table-column prop="remark" show-overflow-tooltip label="备注"/>
<el-table-column prop="source_bill_code" show-overflow-tooltip label="源单号"/>
<el-table-column prop="create_name" label="创建人"/>
<el-table-column prop="create_time" label="创建时间" width="135"/>
<el-table-column prop="confirm_optname" label="确认人" min-width="100"/>
<el-table-column prop="confirm_time" label="确认时间" width="135"/>
<el-table-column type="selection" width="55" />
<el-table-column prop="inspection_code" label="质检单号" width="135" />
<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="qty" label="数量" min-width="100" show-overflow-tooltip />
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus" />
<el-table-column prop="result" label="结果" :formatter="format_result" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
<el-table-column prop="source_bill_code" show-overflow-tooltip label="源单号" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<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">
<udOperation
@@ -185,18 +185,18 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<BillDtl :dialog-show.sync="materShow" @setMaterValue="tableChanged2"/>
<Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id"/>
<BillDtl :dialog-show.sync="materShow" @setMaterValue="tableChanged2" />
<Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id" />
</div>
</template>
<script>
import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst/physicalMst'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -219,12 +219,12 @@ const defaultForm = {
}
export default {
name: 'QualityTest',
dicts: [ 'qc_result', 'QC_INSPECTION_SCHEME_TYPE', 'QC_BILL_STATUS'],
components: {pagination, crudOperation, rrOperation, udOperation, BillDtl, DateRangePicker, Dialog1 },
dicts: ['qc_result', 'QC_INSPECTION_SCHEME_TYPE', 'QC_BILL_STATUS'],
components: { pagination, crudOperation, rrOperation, udOperation, BillDtl, DateRangePicker, Dialog1 },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '理化报告单',
title: '原料质检单',
url: 'api/physicalMst',
idField: 'inspection_id',
sort: 'inspection_id desc',
@@ -235,7 +235,7 @@ export default {
download: false,
reset: true
},
crudMethod: {...crudPhysicalMst}
crudMethod: { ...crudPhysicalMst }
})
},
data() {
@@ -252,13 +252,13 @@ export default {
},
rules: {
inspection_type: [
{required: true, message: '质检单类型不能为空', trigger: 'blur'}
{ required: true, message: '质检单类型不能为空', trigger: 'blur' }
],
biz_date: [
{required: true, message: '业务日期不能为空', trigger: 'blur'}
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
],
pcsn: [
{required: true, message: '批号不能为空', trigger: 'blur'}
{ required: true, message: '批号不能为空', trigger: 'blur' }
]
}
}
@@ -298,11 +298,11 @@ export default {
},
tableChanged2(rows) {
const row = rows[0]
debugger
// 新增一行物料时，给行进行赋值
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_name = row.material_name
this.form.qty = row.qty
this.form.source_bill_id = row.id
this.form.source_bill_code = row.po_code
},