From 30a0ac5c8d328403a8423d080a3b8f3fab07aadd Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 14 十一月 2023 17:40:38 +0800
Subject: [PATCH] 质量隐患确认，故障单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java | 97 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IQuanlityConfirmService.java | 20 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/QuanlityConfirmController.java | 211 ++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/QuanlityConfirmMapper.java | 28 +
lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14(lnl)/sys_dict_update.sql | 66 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 34 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml | 38 ++
lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14(lnl)/mom_eam_fault_info.sql | 329 +++++++++++++++++++
lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14(lnl)/mom_eam_quanlity_confirm.sql | 145 ++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java | 20
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/QuanlityConfirmServiceImpl.java | 24 +
12 files changed, 1,002 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
index f82e765..20fe37e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
@@ -14,12 +16,12 @@
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
import org.jeecg.modules.eam.entity.FaultDescription;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEquipmentReportRepairService;
-import org.jeecg.modules.eam.service.IFaultDescriptionService;
+import org.jeecg.modules.eam.entity.QuanlityConfirm;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,15 +48,20 @@
private IEquipmentReportRepairService equipmentReportRepairService;
@Autowired
private IEamEquipmentService equipmentService;
-
@Autowired
private ISysBaseAPI sysBaseApi;
@Autowired
private ISysUserService userService;
-
+ @Autowired
+ private IQuanlityConfirmService quanlityConfirmService;
@Autowired
@Lazy
private IFaultDescriptionService faultDescriptionService;
+ @Autowired
+ @Lazy
+ private IdentityService sysIdentityService;
+
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -95,14 +102,29 @@
@PostMapping(value = "/add")
@Transactional(rollbackFor = {Exception.class})
public Result<String> add(@RequestBody EquipmentReportRepair equipmentReportRepair) {
+ LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("1");
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepairService.save(equipmentReportRepair);
+ String IS_PRODUCT_YES = "yes";
+ if(IS_PRODUCT_YES.equals(equipmentReportRepair.getErrUda1())){
+ String num = sysIdentityService.getNumByTypeAndLength("QuanlityConfirm",4);
+ QuanlityConfirm quanlityConfirm = new QuanlityConfirm();
+ quanlityConfirm.setNum(num);
+ quanlityConfirm.setReportId(equipmentReportRepair.getId());
+ String IS_PRODUCT_NO = "no";
+ quanlityConfirm.setIsConfirm(IS_PRODUCT_NO);
+ quanlityConfirm.setBatchNo(equipmentReportRepair.getBatchNo());
+ quanlityConfirm.setPartNumber(equipmentReportRepair.getPartNumber());
+ quanlityConfirm.setQuantity(equipmentReportRepair.getQuantity());
+ quanlityConfirm.setOperator(curUser.getId());
+ quanlityConfirmService.save(quanlityConfirm);
+ }
Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
equipment.setEquipmentStatus("2");
String teamId = equipment.getTeamId();
- if(StringUtils.isNotBlank(teamId)){
+ if(ObjectUtils.isNotNull(teamId)){
List<SysUser> sysUsers = userService.list(new QueryWrapper<SysUser>()
.eq("team_id",teamId)
.eq("del_flag",0));
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/QuanlityConfirmController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/QuanlityConfirmController.java
new file mode 100644
index 0000000..4b87df4
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/QuanlityConfirmController.java
@@ -0,0 +1,211 @@
+package org.jeecg.modules.eam.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.Equipment;
+import org.jeecg.modules.eam.entity.EquipmentReportRepair;
+import org.jeecg.modules.eam.entity.FaultInfo;
+import org.jeecg.modules.eam.entity.QuanlityConfirm;
+import org.jeecg.modules.eam.service.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 浜у搧璐ㄩ噺闅愭偅纭
+ * @Author: jeecg-boot
+ * @Date: 2023-11-07
+ * @Version: V1.0
+ */
+@Api(tags="浜у搧璐ㄩ噺闅愭偅纭")
+@RestController
+@RequestMapping("/li/quanlityConfirm")
+@Slf4j
+public class QuanlityConfirmController extends JeecgController<QuanlityConfirm, IQuanlityConfirmService> {
+ @Autowired
+ private IQuanlityConfirmService quanlityConfirmService;
+ @Autowired
+ private IEquipmentReportRepairService equipmentReportRepairService;
+ @Autowired
+ private IEamEquipmentService equipmentService;
+ @Autowired
+ private IFaultInfoService faultInfoService;
+ @Autowired
+ private IdentityService sysIdentityService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param quanlityConfirm
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "浜у搧璐ㄩ噺闅愭偅纭-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="浜у搧璐ㄩ噺闅愭偅纭-鍒嗛〉鍒楄〃鏌ヨ", notes="浜у搧璐ㄩ噺闅愭偅纭-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<QuanlityConfirm>> queryPageList(QuanlityConfirm quanlityConfirm,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<QuanlityConfirm> queryWrapper = QueryGenerator.initQueryWrapper(quanlityConfirm, req.getParameterMap());
+ Page<QuanlityConfirm> page = new Page<QuanlityConfirm>(pageNo, pageSize);
+ IPage<QuanlityConfirm> pageList = quanlityConfirmService.myPage(page, quanlityConfirm);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param quanlityConfirm
+ * @return
+ */
+ @AutoLog(value = "浜у搧璐ㄩ噺闅愭偅纭-娣诲姞")
+ @ApiOperation(value="浜у搧璐ㄩ噺闅愭偅纭-娣诲姞", notes="浜у搧璐ㄩ噺闅愭偅纭-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_quanlity_confirm:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody QuanlityConfirm quanlityConfirm) {
+ quanlityConfirmService.save(quanlityConfirm);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param quanlityConfirm
+ * @return
+ */
+ @AutoLog(value = "浜у搧璐ㄩ噺闅愭偅纭-缂栬緫")
+ @ApiOperation(value="浜у搧璐ㄩ噺闅愭偅纭-缂栬緫", notes="浜у搧璐ㄩ噺闅愭偅纭-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_quanlity_confirm:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody QuanlityConfirm quanlityConfirm) {
+ LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ quanlityConfirm.setLeader(curUser.getId());
+ quanlityConfirm.setConfirmTime(new Date());
+ quanlityConfirmService.updateById(quanlityConfirm);
+ if(quanlityConfirm.getCondition().equals("yes")){
+ String num = sysIdentityService.getNumByTypeAndLength("FaultInfo",4);
+ FaultInfo faultInfo = new FaultInfo();
+ faultInfo.setNum(num);
+ faultInfo.setQuanlityId(quanlityConfirm.getId());
+ faultInfo.setOperater(quanlityConfirm.getOperator());
+ faultInfo.setIsConfirm("no");
+ String rId = quanlityConfirm.getReportId();
+ EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(rId);
+ String eId = equipmentReportRepair.getEquipmentId();
+ Equipment equipment = equipmentService.getById(eId);
+ faultInfo.setEquipModel(equipment.getModel());
+ faultInfo.setEquipName(equipment.getName());
+ faultInfo.setEquipNum(equipment.getNum());
+ faultInfoService.save(faultInfo);
+ }
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "浜у搧璐ㄩ噺闅愭偅纭-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="浜у搧璐ㄩ噺闅愭偅纭-閫氳繃id鍒犻櫎", notes="浜у搧璐ㄩ噺闅愭偅纭-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_quanlity_confirm:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ quanlityConfirmService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "浜у搧璐ㄩ噺闅愭偅纭-鎵归噺鍒犻櫎")
+ @ApiOperation(value="浜у搧璐ㄩ噺闅愭偅纭-鎵归噺鍒犻櫎", notes="浜у搧璐ㄩ噺闅愭偅纭-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_quanlity_confirm:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.quanlityConfirmService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "浜у搧璐ㄩ噺闅愭偅纭-閫氳繃id鏌ヨ")
+ @ApiOperation(value="浜у搧璐ㄩ噺闅愭偅纭-閫氳繃id鏌ヨ", notes="浜у搧璐ㄩ噺闅愭偅纭-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<QuanlityConfirm> queryById(@RequestParam(name="id",required=true) String id) {
+ QuanlityConfirm quanlityConfirm = quanlityConfirmService.getById(id);
+ if(quanlityConfirm==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(quanlityConfirm);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param quanlityConfirm
+ */
+ //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_quanlity_confirm:exportXls")
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, QuanlityConfirm quanlityConfirm) {
+ return super.exportXls(request, quanlityConfirm, QuanlityConfirm.class, "浜у搧璐ㄩ噺闅愭偅纭");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ //@RequiresPermissions("mom_eam_quanlity_confirm:importExcel")
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, QuanlityConfirm.class);
+ }
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
index 187628a..c200ca3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
@@ -94,27 +94,28 @@
* 澶囩敤瀛楁1
*/
@ApiModelProperty(value = "澶囩敤瀛楁1")
- private String err_uda1;
+ @Dict(dicCode = "is_product")
+ private String errUda1;
/**
* 澶囩敤瀛楁2
*/
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String err_uda2;
+ private String errUda2;
/**
* 澶囩敤瀛楁3
*/
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String err_uda3;
+ private String errUda3;
/**
* 澶囩敤瀛楁4
*/
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String err_uda4;
+ private String errUda4;
/**
* 澶囩敤瀛楁5
*/
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String err_uda5;
+ private String errUda5;
/**
* 鐘舵��
*/
@@ -159,7 +160,6 @@
*/
@TableField(exist = false)
private String equipmentName;
-
/**
* 璁惧鍨嬪彿
*/
@@ -171,13 +171,17 @@
*/
@TableField(exist = false)
private String equipmentSpecification;
-
/**
* 闄勪欢涓婁紶鍒楄〃
*/
@TableField(exist = false)
private List<SysUpload> sysUploadList;
-
@TableField(exist = false)
private String teamId;
+ @TableField(exist = false)
+ private String partNumber;
+ @TableField(exist = false)
+ private Integer quantity;
+ @TableField(exist = false)
+ private String batchNo;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java
new file mode 100644
index 0000000..ad6ef94
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java
@@ -0,0 +1,97 @@
+package org.jeecg.modules.eam.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 浜у搧璐ㄩ噺闅愭偅纭
+ * @Author: jeecg-boot
+ * @Date: 2023-11-07
+ * @Version: V1.0
+ */
+@Data
+@TableName("mom_eam_quanlity_confirm")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="mom_eam_quanlity_confirm瀵硅薄", description="浜у搧璐ㄩ噺闅愭偅纭")
+public class QuanlityConfirm implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**涓婚敭ID*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭ID")
+ private String id;
+ @ApiModelProperty(value = "鍗曟嵁鍙�")
+ private String num;
+ /**鏁呴殰鎶ヤ慨鍗旾D*/
+ @Excel(name = "鏁呴殰鎶ヤ慨鍗旾D", width = 15)
+ @ApiModelProperty(value = "鏁呴殰鎶ヤ慨鍗旾D")
+ private String reportId;
+ /**浜у搧鎹熷け鎯呭喌*/
+ @Excel(name = "浜у搧鎹熷け鎯呭喌", width = 15)
+ @ApiModelProperty(value = "浜у搧鎹熷け鎯呭喌")
+ private String condition;
+ /**鎹熷け鎯呭喌鍒嗘瀽*/
+ @Excel(name = "鎹熷け鎯呭喌鍒嗘瀽", width = 15)
+ @ApiModelProperty(value = "鎹熷け鎯呭喌鍒嗘瀽")
+ private String conditionAnalysis;
+ /**闆朵欢鍙�*/
+ @Excel(name = "闆朵欢鍙�", width = 15)
+ @ApiModelProperty(value = "闆朵欢鍙�")
+ private String partNumber;
+ /**鎵规鍙�*/
+ @Excel(name = "鎵规鍙�", width = 15)
+ @ApiModelProperty(value = "鎵规鍙�")
+ private String batchNo;
+ /**浠舵暟*/
+ @Excel(name = "浠舵暟", width = 15)
+ @ApiModelProperty(value = "浠舵暟")
+ private Integer quantity;
+ /**鎿嶄綔鍛�*/
+ @ApiModelProperty(value = "鎿嶄綔鍛�")
+ @Dict(dicCode = "id",dicText = "realname",dictTable = "sys_user")
+ private String operator;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**纭棰嗗*/
+ @Excel(name = "纭棰嗗", width = 15)
+ @Dict(dicCode = "id",dicText = "realname",dictTable = "sys_user")
+ @ApiModelProperty(value = "纭棰嗗")
+ private String leader;
+ /**棰嗗纭鏃堕棿*/
+ @Excel(name = "棰嗗纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "棰嗗纭鏃堕棿")
+ private Date confirmTime;
+ /**鏄惁宸茬‘璁�*/
+ @Excel(name = "鏄惁宸茬‘璁�", width = 15)
+ @ApiModelProperty(value = "鏄惁宸茬‘璁�")
+ @Dict(dicCode = "is_product")
+ private String isConfirm;
+ @TableField(exist = false)
+ private String equipmentNum;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
+ @TableField(exist = false)
+ private String reportNum;
+ @TableField(exist = false)
+ private String faultDescription;
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/QuanlityConfirmMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/QuanlityConfirmMapper.java
new file mode 100644
index 0000000..e8e36f5
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/QuanlityConfirmMapper.java
@@ -0,0 +1,28 @@
+package org.jeecg.modules.eam.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.QuanlityConfirm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 浜у搧璐ㄩ噺闅愭偅纭
+ * @Author: jeecg-boot
+ * @Date: 2023-11-07
+ * @Version: V1.0
+ */
+public interface QuanlityConfirmMapper extends BaseMapper<QuanlityConfirm> {
+ /**
+ *琛ㄦ暟鎹垎椤�
+ *
+ * @param num
+ * @param page
+ * @param equipmentNum
+ * @param reportNum
+ * @return
+ */
+ List<QuanlityConfirm> myPage(Page<QuanlityConfirm> page,@Param("num")String num,@Param("reportNum")String reportNum,@Param("equipmentNum") String equipmentNum);
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index 33585c7..6ca6931 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -4,6 +4,7 @@
<select id="getReportRepairList" parameterType="Map" resultType="Map">
SELECT
t1.id,
+ t1.err_uda1 errUda1,
t1.num num,
t1.equipment_id equipmentId,
t1.fault_reason faultReason,
@@ -31,7 +32,8 @@
t3.depart_name departName,
t4.item_text urgencyName,
t5.item_text statusName,
- t6.item_text isStopName
+ t6.item_text isStopName,
+ t7.item_text errUda1_dictText
FROM
mom_eam_equipment_report_repair t1
left join mom_eam_equipment t2 on t1.equipment_id = t2.id
@@ -39,6 +41,7 @@
left join (select * from v_sys_dict where dict_code='urgency') t4 on t1.urgency = t4.item_value
left join (select * from v_sys_dict where dict_code='equipment_report_repair_status') t5 on t1.status = t5.item_value
left join (select * from v_sys_dict where dict_code='is_stop') t6 on t1.is_stop = t6.item_value
+ left join (select * from v_sys_dict where dict_code='is_product') t7 on t1.err_uda1 = t7.item_value
WHERE t1.del_flag = 0
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml
new file mode 100644
index 0000000..4385f63
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.eam.mapper.QuanlityConfirmMapper">
+ <select id="myPage" resultType="org.jeecg.modules.eam.entity.QuanlityConfirm">
+ select
+ t1.id id,
+ t1.num num,
+ t1.report_id reportId,
+ t1.condition condition,
+ t1.condition_analysis conditionAnalysis,
+ t1.part_number partNumber,
+ t1.batch_no batchNo,
+ t1.quantity quantity,
+ t1.operator operator,
+ t1.create_time creatTime,
+ t1.leader leader,
+ t1.confirm_time confirmTime,
+ t1.is_confirm isConfirm,
+ t2.num reportNum,
+ t2.fault_description faultDescription,
+ t3.num equipmentNum,
+ t3.name equipmentName,
+ t3.model equipmentModel
+ from mom_eam_quanlity_confirm t1
+ left join (select * from mom_eam_equipment_report_repair where del_flag = 0) t2 on t2.id = t1.report_id
+ left join (select * from mom_eam_equipment where del_flag = 0) t3 on t3.id = t2.equipment_id
+ where 1=1
+ <if test="num != null and num != ''">
+ and t1.num like concat('%',#{num},'%')
+ </if>
+ <if test="reportNum != null and reportNum != ''">
+ and t2.num like concat('%',#{reportNum},'%')
+ </if>
+ <if test="equipmentNum != null and equipmentNum != ''">
+ and t3.num like concat('%',#{equipmentNum},'%')
+ </if>
+ </select>
+</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IQuanlityConfirmService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IQuanlityConfirmService.java
new file mode 100644
index 0000000..6f787aa
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IQuanlityConfirmService.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.eam.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.QuanlityConfirm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: 浜у搧璐ㄩ噺闅愭偅纭
+ * @Author: jeecg-boot
+ * @Date: 2023-11-07
+ * @Version: V1.0
+ */
+public interface IQuanlityConfirmService extends IService<QuanlityConfirm> {
+
+ Page<QuanlityConfirm> myPage(Page<QuanlityConfirm> page, QuanlityConfirm quanlityConfirm);
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/QuanlityConfirmServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/QuanlityConfirmServiceImpl.java
new file mode 100644
index 0000000..93469a0
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/QuanlityConfirmServiceImpl.java
@@ -0,0 +1,24 @@
+package org.jeecg.modules.eam.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.eam.entity.QuanlityConfirm;
+import org.jeecg.modules.eam.mapper.QuanlityConfirmMapper;
+import org.jeecg.modules.eam.service.IQuanlityConfirmService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 浜у搧璐ㄩ噺闅愭偅纭
+ * @Author: jeecg-boot
+ * @Date: 2023-11-07
+ * @Version: V1.0
+ */
+@Service
+public class QuanlityConfirmServiceImpl extends ServiceImpl<QuanlityConfirmMapper, QuanlityConfirm> implements IQuanlityConfirmService {
+
+ @Override
+ public Page<QuanlityConfirm> myPage(Page<QuanlityConfirm> page, QuanlityConfirm quanlityConfirm) {
+ return page.setRecords(baseMapper.myPage(page,quanlityConfirm.getNum(),quanlityConfirm.getReportNum(),quanlityConfirm.getEquipmentNum()));
+ }
+}
diff --git "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/mom_eam_fault_info.sql" "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/mom_eam_fault_info.sql"
new file mode 100644
index 0000000..0b1ed18
--- /dev/null
+++ "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/mom_eam_fault_info.sql"
@@ -0,0 +1,329 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server : sqlser
+ Source Server Type : SQL Server
+ Source Server Version : 13001601 (13.00.1601)
+ Source Host : 30036q420j.yicp.fun:11047
+ Source Catalog : LXZN_TEST_430
+ Source Schema : dbo
+
+ Target Server Type : SQL Server
+ Target Server Version : 13001601 (13.00.1601)
+ File Encoding : 65001
+
+ Date: 13/11/2023 13:48:04
+*/
+
+
+-- ----------------------------
+-- Table structure for mom_eam_fault_info
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[mom_eam_fault_info]') AND type IN ('U'))
+ DROP TABLE [dbo].[mom_eam_fault_info]
+GO
+
+CREATE TABLE [dbo].[mom_eam_fault_info] (
+ [id] nvarchar(32) COLLATE Chinese_PRC_CI_AS NOT NULL,
+ [num] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [q_id] int NULL,
+ [cost] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [is_certificate] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [is_outage] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [factor] text COLLATE Chinese_PRC_CI_AS NULL,
+ [modify_content] text COLLATE Chinese_PRC_CI_AS NULL,
+ [equipment_process] text COLLATE Chinese_PRC_CI_AS NULL,
+ [phenomenon] text COLLATE Chinese_PRC_CI_AS NULL,
+ [method1] text COLLATE Chinese_PRC_CI_AS NULL,
+ [method2] text COLLATE Chinese_PRC_CI_AS NULL,
+ [method3] text COLLATE Chinese_PRC_CI_AS NULL,
+ [result] text COLLATE Chinese_PRC_CI_AS NULL,
+ [start_check_time] datetime2(7) NULL,
+ [equipment_status] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [anlysis] text COLLATE Chinese_PRC_CI_AS NULL,
+ [check_result] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [active] text COLLATE Chinese_PRC_CI_AS NULL,
+ [suggest] text COLLATE Chinese_PRC_CI_AS NULL,
+ [judgment] text COLLATE Chinese_PRC_CI_AS NULL,
+ [different_judgment] text COLLATE Chinese_PRC_CI_AS NULL,
+ [update_method] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [final_result] text COLLATE Chinese_PRC_CI_AS NULL,
+ [operater] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [engineer] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [mechanic] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [work_leader] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [center_leader] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [team_leader] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [repair_leader] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [equip_leader] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [guarantee_leader] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [e_name] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [e_model] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [e_num] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL
+)
+GO
+
+ALTER TABLE [dbo].[mom_eam_fault_info] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'涓婚敭ID',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'缂栫爜',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'num'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'璐ㄩ噺闅愭偅纭鍗旾D',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'q_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'缁翠慨璐圭敤',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'cost'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鎿嶄綔鍛樻槸鍚︽湁鎿嶄綔璇�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'is_certificate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鏄惁鏂數閲嶅惎',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'is_outage'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍔犲伐杩囩▼涓殑鍙樺姩鍥犵礌',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'factor'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍏蜂綋鏇存敼鍐呭',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'modify_content'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍙戠敓浜嬫晠鏃惰澶囨墍鎵ц鐨勭▼搴�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'equipment_process'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍙戠敓浜嬫晠鏃剁殑鐜拌薄',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'phenomenon'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'閲囧彇鎺柦1',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'method1'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'閲囧彇鎺柦2',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'method2'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'閲囧彇鎺柦3',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'method3'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'浜嬫晠鎵�閫犳垚鐨勭粨鏋�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'result'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'寮�濮嬫鏌ユ椂闂�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'start_check_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍙戠敓浜嬫晠鍚庤澶囩殑鐘舵��',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'equipment_status'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'缁翠慨浜哄憳瀵逛簨鏁呯殑鍒嗘瀽',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'anlysis'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'缁翠慨浜哄憳妫�鏌ョ粨鏋�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'check_result'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'浜嬫晠鍘熷洜鍒嗘瀽杩囩▼涓墍閲囧彇鐨勭浉鍏宠涓�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'active'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'寤鸿閲囧彇鐨勬帾鏂藉強鏃堕棿鑺傜偣',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'suggest'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'judgment'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'涓嶅悓鐨勬剰瑙佸強鍒嗘瀽',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'different_judgment'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鏁存敼鎺柦',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'update_method'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'浜嬫晠缁撹',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'final_result'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鎿嶄綔鑰�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'operater'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'缁翠慨璐ｄ换浜�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'engineer'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鎶�鏈礋璐ｄ汉',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'mechanic'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'宸ラ暱',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'work_leader'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'涓績涓讳换',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'center_leader'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'缁勯暱',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'team_leader'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'缁翠慨绔欑珯闀�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'repair_leader'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'绠＄悊瀹や笟鍔＄粡鐞�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'equip_leader'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'杩愯淇濋殰閮ㄤ富绠￠瀵�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'guarantee_leader'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'璁惧鍚嶇О',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'e_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'璁惧鍨嬪彿',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'e_model'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'璁惧缂栫爜',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'e_num'
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table mom_eam_fault_info
+-- ----------------------------
+ALTER TABLE [dbo].[mom_eam_fault_info] ADD CONSTRAINT [PK__mom_eam___3213E83FB193087F] PRIMARY KEY CLUSTERED ([id])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
diff --git "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/mom_eam_quanlity_confirm.sql" "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/mom_eam_quanlity_confirm.sql"
new file mode 100644
index 0000000..df66363
--- /dev/null
+++ "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/mom_eam_quanlity_confirm.sql"
@@ -0,0 +1,145 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server : sqlser
+ Source Server Type : SQL Server
+ Source Server Version : 13001601 (13.00.1601)
+ Source Host : 30036q420j.yicp.fun:11047
+ Source Catalog : LXZN_TEST_430
+ Source Schema : dbo
+
+ Target Server Type : SQL Server
+ Target Server Version : 13001601 (13.00.1601)
+ File Encoding : 65001
+
+ Date: 13/11/2023 13:47:13
+*/
+
+
+-- ----------------------------
+-- Table structure for mom_eam_quanlity_confirm
+-- ----------------------------
+IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[mom_eam_quanlity_confirm]') AND type IN ('U'))
+ DROP TABLE [dbo].[mom_eam_quanlity_confirm]
+GO
+
+CREATE TABLE [dbo].[mom_eam_quanlity_confirm] (
+ [id] nvarchar(32) COLLATE Chinese_PRC_CI_AS NOT NULL,
+ [num] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [report_id] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [condition] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [condition_analysis] text COLLATE Chinese_PRC_CI_AS NULL,
+ [part_number] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [batch_no] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [quantity] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [operator] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [create_time] datetime NULL,
+ [leader] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL,
+ [confirm_time] datetime NULL,
+ [is_confirm] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL
+)
+GO
+
+ALTER TABLE [dbo].[mom_eam_quanlity_confirm] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'涓婚敭ID',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'缂栫爜',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'num'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鏁呴殰鎶ヤ慨鍗旾D',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'report_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'浜у搧鎹熷け鎯呭喌',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'condition'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鎹熷け鎯呭喌鍒嗘瀽',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'condition_analysis'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'闆朵欢鍙�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'part_number'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鎵规鍙�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'batch_no'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'浠舵暟',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'quantity'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鎿嶄綔鍛�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'operator'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鍒涘缓鏃堕棿',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'纭棰嗗',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'leader'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'棰嗗纭鏃堕棿',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'confirm_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鏄惁宸茬‘璁�',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_quanlity_confirm',
+'COLUMN', N'is_confirm'
+GO
+
+
+-- ----------------------------
+-- Primary Key structure for table mom_eam_quanlity_confirm
+-- ----------------------------
+ALTER TABLE [dbo].[mom_eam_quanlity_confirm] ADD CONSTRAINT [PK__mom_eam___3213E83FCD6C813D] PRIMARY KEY CLUSTERED ([id])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+ON [PRIMARY]
+GO
+
diff --git "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/sys_dict_update.sql" "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/sys_dict_update.sql"
new file mode 100644
index 0000000..9440a5c
--- /dev/null
+++ "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_14\050lnl\051/sys_dict_update.sql"
@@ -0,0 +1,66 @@
+INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1723954113436852225', N'鏁呴殰鎶ヤ慨鐢熶骇鐘舵��', N'is_product', '', 0, N'admin', '2023-11-13 14:41:04.8270000', NULL, NULL, NULL);
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1723954158332682241', N'1723954113436852225', N'鏄�', N'yes', '', 1, 1, N'admin', '2023-11-13 14:41:15.5280000', NULL, NULL);
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1723954211180912641', N'1723954113436852225', N'鍚�', N'no', '', 2, 1, N'admin', '2023-11-13 14:41:28.1250000', NULL, NULL);
+
+INSERT INTO [dbo].[mom_serial_number_map] ([id], [function_name], [begin_symbol], [enterprise_code], [year_format], [month_format], [day_format], [type], [identity_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724247078361333761', N'璐ㄩ噺闅愭偅纭缂栫爜', N'ZLYH', NULL, N'yyyy', N'MM', N'dd', N'QuanlityConfirm', NULL, N'admin', '2023-11-14 10:05:13', NULL, NULL);
+
+INSERT INTO [dbo].[mom_serial_number_map] ([id], [function_name], [begin_symbol], [enterprise_code], [year_format], [month_format], [day_format], [type], [identity_id], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724247645238296578', N'鏁呴殰鍗曠紪鐮�', N'GZD', NULL, N'yyyy', N'MM', N'dd', N'FaultInfo', NULL, N'admin', '2023-11-14 10:07:28', NULL, NULL);
+
+ALTER TABLE [dbo].[mom_eam_fault_info] ALTER COLUMN [q_id] nvarchar(32) NULL
+
+
+EXEC sp_rename '[dbo].[mom_eam_fault_info].[q_id]', 'quanlity_id', 'COLUMN'
+GO
+
+EXEC sp_rename '[dbo].[mom_eam_fault_info].[e_name]', 'equip_name', 'COLUMN'
+GO
+
+EXEC sp_rename '[dbo].[mom_eam_fault_info].[e_model]', 'equip_model', 'COLUMN'
+GO
+
+EXEC sp_rename '[dbo].[mom_eam_fault_info].[e_num]', 'equip_num', 'COLUMN'
+
+
+
+ALTER TABLE [dbo].[mom_eam_fault_info] ADD [area2] nvarchar NULL
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'宸ュ尯宸ユ',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'area2'
+
+ALTER TABLE [dbo].[mom_eam_fault_info] ADD [is_confirm] nvarchar(32) NULL
+GO
+
+ALTER TABLE [dbo].[mom_eam_fault_info] ALTER COLUMN [area2] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'鏄惁纭缁撴灉',
+'SCHEMA', N'dbo',
+'TABLE', N'mom_eam_fault_info',
+'COLUMN', N'is_confirm'
+
+INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1724336453128425473', N'鍙樺姩鍥犵礌', N'fault_change_factor', '', 0, N'admin', '2023-11-14 16:00:21.7040000', NULL, NULL, NULL);
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724336644833284098', N'1724336453128425473', N'鍒�鍏锋洿鎹�', N'knife', '', 1, 1, N'admin', '2023-11-14 16:01:07.4100000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724336717839339521', N'1724336453128425473', N'宸ヨ壓鏇存敼', N'route', '', 2, 1, N'admin', '2023-11-14 16:01:24.0000000', N'admin', '2023-11-14 16:04:32.8520000');
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724336939080486914', N'1724336453128425473', N'鍔犲伐绋嬪簭鏇存敼', N'working', '', 3, 1, N'admin', '2023-11-14 16:02:17.0000000', N'admin', '2023-11-14 16:04:42.7430000');
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724337178042568705', N'1724336453128425473', N'鍒�鍏疯ˉ鍋挎洿鏀�', N'compensate', '', 4, 1, N'admin', '2023-11-14 16:03:14.0000000', N'admin', '2023-11-14 16:04:58.1120000');
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724337287635537922', N'1724336453128425473', N'闆剁偣鍋忓�兼洿鏀�', N'zero', '', 5, 1, N'admin', '2023-11-14 16:03:40.0000000', N'admin', '2023-11-14 16:05:50.2990000');
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724337353716797441', N'1724336453128425473', N'鍙傛暟淇敼', N'num', '', 6, 1, N'admin', '2023-11-14 16:03:56.0000000', N'admin', '2023-11-14 16:06:06.9790000');
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724337433375019009', N'1724336453128425473', N'鍏朵粬鍥犵礌', N'other', '', 7, 1, N'admin', '2023-11-14 16:04:15.0000000', N'admin', '2023-11-14 16:06:02.7960000');
+
+INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1724340707398389762', N'浜嬫晠鍙戠敓鍘熷洜鍒嗘瀽鐨勬牳瀵�', N'opinion', '', 0, N'admin', '2023-11-14 16:17:16.0000000', N'admin', '2023-11-14 16:48:53.6570000', NULL);
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724340762796756993', N'1724340707398389762', N'鍚屾剰', N'yes', '', 1, 1, N'admin', '2023-11-14 16:17:29.2180000', NULL, NULL);
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1724340811664592897', N'1724340707398389762', N'涓嶅悓鎰�', N'no', '', 2, 1, N'admin', '2023-11-14 16:17:40.8600000', NULL, NULL);
+
+INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1723878256194232322', N'1647845086853693442', N'鏁呴殰纭鍗�', N'/eam/FaultInfoList', N'eam/FaultInfoList', NULL, NULL, 1, NULL, N'1', 2.1, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-11-13 09:39:39.0470000', NULL, NULL, 0, NULL, N'1', 0);
+
+INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1723876722224013314', N'1647845086853693442', N'浜у搧璐ㄩ噺闅愭偅纭', N'/eam/QuanlityConfirmList', N'eam/QuanlityConfirmList', NULL, NULL, 1, NULL, N'1', 2, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-11-13 09:33:33.0000000', N'admin', '2023-11-13 09:35:44.5750000', 0, NULL, N'1', 0);
+
--
Gitblit v1.9.3