From 5bee31b7e5fb3066a900f01ca80225e80a48312a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Thu, 22 Aug 2024 09:59:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=84=E5=B1=9E?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseProductAttachedController.java | 92 ++++++- .../op/mes/domain/BaseProductAttached.java | 260 ++++++++++-------- .../mes/mapper/BaseProductAttachedMapper.java | 5 + .../service/IBaseProductAttachedService.java | 5 + .../impl/BaseProductAttachedServiceImpl.java | 183 ++++++++++++ .../mapper/mes/BaseProductAttachedMapper.xml | 37 ++- 6 files changed, 466 insertions(+), 116 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/BaseProductAttachedController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/BaseProductAttachedController.java index 0849d568c..ddd5f97de 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/BaseProductAttachedController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/BaseProductAttachedController.java @@ -1,8 +1,13 @@ package com.op.mes.controller; +import java.io.IOException; +import java.util.ArrayList; import java.util.List; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import com.op.common.core.domain.ExcelCol; +import com.op.common.core.utils.poi.ExcelMapUtil; import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; @@ -12,6 +17,7 @@ import com.op.common.security.annotation.RequiresPermissions; import com.op.mes.domain.BaseProductAttached; import com.op.mes.service.IBaseProductAttachedService; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -22,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.op.common.log.annotation.Log; +import org.springframework.web.multipart.MultipartFile; /** * 物料附属信息Controller @@ -83,7 +90,12 @@ public class BaseProductAttachedController extends BaseController @PostMapping public AjaxResult add(@RequestBody BaseProductAttached baseProductAttached) { - return toAjax(baseProductAttachedService.insertBaseProductAttached(baseProductAttached)); + + if (baseProductAttachedService.checkSpareCodeUnique(baseProductAttached)) { + return AjaxResult.error("备品备件编码已存在！"); + } else { + return toAjax(baseProductAttachedService.insertBaseProductAttached(baseProductAttached)); + } } /** @@ -109,4 +121,82 @@ public class BaseProductAttachedController extends BaseController { return toAjax(baseProductAttachedService.deleteBaseProductAttachedByIds(ids)); } + + /** + * 生成物料附属信息模板 + * + * @param response + * @throws IOException + */ + @PostMapping("/importTemplate") + @Log(title = "生成备品备件信息模板", businessType = BusinessType.EXPORT) + public void importTemplate(HttpServletResponse response) throws IOException { + + ArrayList excelCols = new ArrayList<>(); + excelCols.add(new ExcelCol("产品编号", "productCode", 20)); + excelCols.add(new ExcelCol("品类", "category", 20)); + excelCols.add(new ExcelCol("每PC单圈", "pc", 20)); + excelCols.add(new ExcelCol("标准效率", "iei", 20)); + excelCols.add(new ExcelCol("标准用人", "manStandar", 20)); + excelCols.add(new ExcelCol("喷药方式", "sprayWay", 20)); + + excelCols.add(new ExcelCol("白坯直径", "blankDiameter", 20)); + excelCols.add(new ExcelCol("白坯物料号", "blankNo", 20)); + excelCols.add(new ExcelCol("标准喷药量", "sprayVolume", 20)); + + excelCols.add(new ExcelCol("药液料号", "liquidNo", 20)); + excelCols.add(new ExcelCol("标准内膜用量", "endometrialDosage", 20)); + excelCols.add(new ExcelCol("标准外模用量(KG/PC)", "outerFilmDosage", 20)); + + + excelCols.add(new ExcelCol("支架", "support", 20)); + excelCols.add(new ExcelCol("支架物料号", "supportNo", 20)); + excelCols.add(new ExcelCol("吸塑", "pvc", 20)); + + + excelCols.add(new ExcelCol("支架盘", "supportPlate", 20)); + + excelCols.add(new ExcelCol("创建人", "createBy", 20)); + excelCols.add(new ExcelCol("库检周期", "warehouseCycle", 20)); + excelCols.add(new ExcelCol("托盘上箱数", "palletNum", 20)); + excelCols.add(new ExcelCol("垛形", "packType", 20)); + + String titleName = "物料附属信息导入"; + SXSSFWorkbook workbook = null; + try { + //设置响应头 + response.setHeader("Content-disposition", + "attachment; filename=" + titleName); + response.setContentType("application/octet-stream;charset=UTF-8"); + ServletOutputStream outputStream = response.getOutputStream(); + //调用工具类 + workbook = ExcelMapUtil.initWorkbook(titleName, null, excelCols, null); + workbook.write(outputStream); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (workbook != null) { + workbook.dispose(); + } + } + } + + /** + * 导入物料附属信息基本信息接口 + * + * @param file + * @return + * @throws Exception + */ + @Log(title = "导入物料基本信息", businessType = BusinessType.IMPORT) + @PostMapping("/importFile") + @RequiresPermissions("mes:attached:import") + public AjaxResult importFile(MultipartFile file) throws Exception { + // 创建接收对象 + ExcelUtil util = new ExcelUtil<>(BaseProductAttached.class); + // 接收表格信息 + List orderList = util.importExcel(file.getInputStream()); + return baseProductAttachedService.importFile(orderList); + } + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/BaseProductAttached.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/BaseProductAttached.java index 730984fa8..9af6c2573 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/BaseProductAttached.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/BaseProductAttached.java @@ -54,7 +54,7 @@ public class BaseProductAttached extends BaseEntity private String blankNo; /** 标准喷药量（KG/PC） */ - @Excel(name = "标准喷药量", readConverterExp = "K=G/PC") + @Excel(name = "标准喷药量") private BigDecimal sprayVolume; /** 药液料号 */ @@ -62,7 +62,7 @@ public class BaseProductAttached extends BaseEntity private String liquidNo; /** 标准内膜用量（KG/PC） */ - @Excel(name = "标准内膜用量", readConverterExp = "K=G/PC") + @Excel(name = "标准内膜用量") private BigDecimal endometrialDosage; /** 标准外模用量(KG/PC) */ @@ -89,191 +89,225 @@ public class BaseProductAttached extends BaseEntity @Excel(name = "其它") private String other; - public void setId(String id) - { + /** 创建人 */ + @Excel(name = "创建人") + private String createBy; + + /** 库检周期 */ + @Excel(name = "库检周期") + private String warehouseCycle; + + /** 托盘上箱数 */ + @Excel(name = "托盘上箱数") + private BigDecimal palletNum; + + /** 垛形 */ + @Excel(name = "垛形") + private String packType; + + public String getId() { + return id; + } + + public void setId(String id) { this.id = id; } - public String getId() - { - return id; + public String getProductCode() { + return productCode; } - public void setProductCode(String productCode) - { + + public void setProductCode(String productCode) { this.productCode = productCode; } - public String getProductCode() - { - return productCode; + public String getCategory() { + return category; } - public void setCategory(String category) - { + + public void setCategory(String category) { this.category = category; } - public String getCategory() - { - return category; + public String getPc() { + return pc; } - public void setPc(String pc) - { + + public void setPc(String pc) { this.pc = pc; } - public String getPc() - { - return pc; + public BigDecimal getIei() { + return iei; } - public void setIei(BigDecimal iei) - { + + public void setIei(BigDecimal iei) { this.iei = iei; } - public BigDecimal getIei() - { - return iei; + public BigDecimal getManStandar() { + return manStandar; } - public void setManStandar(BigDecimal manStandar) - { + + public void setManStandar(BigDecimal manStandar) { this.manStandar = manStandar; } - public BigDecimal getManStandar() - { - return manStandar; + public String getSprayWay() { + return sprayWay; } - public void setSprayWay(String sprayWay) - { + + public void setSprayWay(String sprayWay) { this.sprayWay = sprayWay; } - public String getSprayWay() - { - return sprayWay; + public BigDecimal getBlankDiameter() { + return blankDiameter; } - public void setBlankDiameter(BigDecimal blankDiameter) - { + + public void setBlankDiameter(BigDecimal blankDiameter) { this.blankDiameter = blankDiameter; } - public BigDecimal getBlankDiameter() - { - return blankDiameter; + public String getBlankNo() { + return blankNo; } - public void setBlankNo(String blankNo) - { + + public void setBlankNo(String blankNo) { this.blankNo = blankNo; } - public String getBlankNo() - { - return blankNo; + public BigDecimal getSprayVolume() { + return sprayVolume; } - public void setSprayVolume(BigDecimal sprayVolume) - { + + public void setSprayVolume(BigDecimal sprayVolume) { this.sprayVolume = sprayVolume; } - public BigDecimal getSprayVolume() - { - return sprayVolume; + public String getLiquidNo() { + return liquidNo; } - public void setLiquidNo(String liquidNo) - { + + public void setLiquidNo(String liquidNo) { this.liquidNo = liquidNo; } - public String getLiquidNo() - { - return liquidNo; + public BigDecimal getEndometrialDosage() { + return endometrialDosage; } - public void setEndometrialDosage(BigDecimal endometrialDosage) - { + + public void setEndometrialDosage(BigDecimal endometrialDosage) { this.endometrialDosage = endometrialDosage; } - public BigDecimal getEndometrialDosage() - { - return endometrialDosage; + public BigDecimal getOuterFilmDosage() { + return outerFilmDosage; } - public void setOuterFilmDosage(BigDecimal outerFilmDosage) - { + + public void setOuterFilmDosage(BigDecimal outerFilmDosage) { this.outerFilmDosage = outerFilmDosage; } - public BigDecimal getOuterFilmDosage() - { - return outerFilmDosage; + public Long getSupport() { + return support; } - public void setSupport(Long support) - { + + public void setSupport(Long support) { this.support = support; } - public Long getSupport() - { - return support; + public String getSupportNo() { + return supportNo; } - public void setSupportNo(String supportNo) - { + + public void setSupportNo(String supportNo) { this.supportNo = supportNo; } - public String getSupportNo() - { - return supportNo; + public Long getPvc() { + return pvc; } - public void setPvc(Long pvc) - { + + public void setPvc(Long pvc) { this.pvc = pvc; } - public Long getPvc() - { - return pvc; + public Long getSupportPlate() { + return supportPlate; } - public void setSupportPlate(Long supportPlate) - { + + public void setSupportPlate(Long supportPlate) { this.supportPlate = supportPlate; } - public Long getSupportPlate() - { - return supportPlate; + public String getOther() { + return other; } - public void setOther(String other) - { + + public void setOther(String other) { this.other = other; } - public String getOther() - { - return other; + @Override + public String getCreateBy() { + return createBy; + } + + @Override + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public String getWarehouseCycle() { + return warehouseCycle; + } + + public void setWarehouseCycle(String warehouseCycle) { + this.warehouseCycle = warehouseCycle; + } + + public BigDecimal getPalletNum() { + return palletNum; + } + + public void setPalletNum(BigDecimal palletNum) { + this.palletNum = palletNum; + } + + public String getPackType() { + return packType; + } + + public void setPackType(String packType) { + this.packType = packType; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("productCode", getProductCode()) - .append("category", getCategory()) - .append("pc", getPc()) - .append("iei", getIei()) - .append("manStandar", getManStandar()) - .append("sprayWay", getSprayWay()) - .append("blankDiameter", getBlankDiameter()) - .append("blankNo", getBlankNo()) - .append("sprayVolume", getSprayVolume()) - .append("liquidNo", getLiquidNo()) - .append("endometrialDosage", getEndometrialDosage()) - .append("outerFilmDosage", getOuterFilmDosage()) - .append("support", getSupport()) - .append("supportNo", getSupportNo()) - .append("pvc", getPvc()) - .append("supportPlate", getSupportPlate()) - .append("other", getOther()) - .append("createBy", getCreateBy()) - .toString(); + return "BaseProductAttached{" + + "id='" + id + '\'' + + ", productCode='" + productCode + '\'' + + ", category='" + category + '\'' + + ", pc='" + pc + '\'' + + ", iei=" + iei + + ", manStandar=" + manStandar + + ", sprayWay='" + sprayWay + '\'' + + ", blankDiameter=" + blankDiameter + + ", blankNo='" + blankNo + '\'' + + ", sprayVolume=" + sprayVolume + + ", liquidNo='" + liquidNo + '\'' + + ", endometrialDosage=" + endometrialDosage + + ", outerFilmDosage=" + outerFilmDosage + + ", support=" + support + + ", supportNo='" + supportNo + '\'' + + ", pvc=" + pvc + + ", supportPlate=" + supportPlate + + ", other='" + other + '\'' + + ", createBy='" + createBy + '\'' + + ", warehouseCycle='" + warehouseCycle + '\'' + + ", palletNum=" + palletNum + + ", packType='" + packType + '\'' + + '}'; } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/BaseProductAttachedMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/BaseProductAttachedMapper.java index 1bea48073..098c9c6ef 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/BaseProductAttachedMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/BaseProductAttachedMapper.java @@ -59,4 +59,9 @@ public interface BaseProductAttachedMapper * @return 结果 */ public int deleteBaseProductAttachedByIds(String[] ids); + + BaseProductAttached selectBaseProductAttachedByProductCode(String productCode); + + //检查productCode + String checkSpareCodeUnique(BaseProductAttached baseProductAttached); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IBaseProductAttachedService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IBaseProductAttachedService.java index fd8afd075..301e0d441 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IBaseProductAttachedService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IBaseProductAttachedService.java @@ -3,6 +3,7 @@ package com.op.mes.service; import java.util.List; +import com.op.common.core.web.domain.AjaxResult; import com.op.mes.domain.BaseProductAttached; @@ -61,4 +62,8 @@ public interface IBaseProductAttachedService * @return 结果 */ public int deleteBaseProductAttachedById(String id); + + AjaxResult importFile(List list); + boolean checkSpareCodeUnique(BaseProductAttached baseProductAttached); + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/BaseProductAttachedServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/BaseProductAttachedServiceImpl.java index 46a917a7a..3c2e32f5d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/BaseProductAttachedServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/BaseProductAttachedServiceImpl.java @@ -4,12 +4,25 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.security.utils.SecurityUtils; import com.op.mes.domain.BaseProductAttached; import com.op.mes.mapper.BaseProductAttachedMapper; import com.op.mes.service.IBaseProductAttachedService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -24,6 +37,8 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi @Autowired private BaseProductAttachedMapper baseProductAttachedMapper; + protected Logger logger = LoggerFactory.getLogger(getClass()); + /** * 查询物料附属信息 * @@ -62,6 +77,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi { baseProductAttached.setId(IdUtils.fastSimpleUUID()); baseProductAttached.setCreateTime(DateUtils.getNowDate()); + baseProductAttached.setCreateBy(SecurityUtils.getUsername()); return baseProductAttachedMapper.insertBaseProductAttached(baseProductAttached); } @@ -104,4 +120,171 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi { return baseProductAttachedMapper.deleteBaseProductAttachedById(id); } + + + /** + * 导入 + * @param baseProductAttached + * @return + */ + @Override + @DS("#header.poolName") + @Transactional + public AjaxResult importFile(List baseProductAttached) { + BaseProductAttached example=null; + for (BaseProductAttached table : baseProductAttached) { + table.setId(IdUtils.fastSimpleUUID()); + table.setCreateBy(SecurityUtils.getUsername()); + } + + //数据校验 + // 数据校验 + AjaxResult checkResult = checkImportFile(baseProductAttached); + + // 如果数据校验成功 + if (checkResult.isSuccess()) { + String info = syncImportFunc(baseProductAttached); + return success("信息导入完成。其中导入失败的信息：" + info); + } + // 校验失败 + return checkResult; + } + + + + private String syncImportFunc(List baseProductAttached) { + String failEquipment = ""; + for (BaseProductAttached table : baseProductAttached) { + String msg = syncFunc(table); + if (StringUtils.isNotBlank(msg)) { + failEquipment += msg + ","; + } + } + return failEquipment; + } + + @Transactional(rollbackFor = Exception.class) + public String syncFunc(BaseProductAttached table) { + String failSpareParts = ""; + BaseProductAttached Exist = baseProductAttachedMapper.selectBaseProductAttachedByProductCode(table.getProductCode()); + //不存在就插入 + if (Exist == null) { + baseProductAttachedMapper.insertBaseProductAttached(table); + logger.info("=======物料附属信息" + table.getProductCode() + "=======导入成功"); + + //存在，不允许插入 + } else { + failSpareParts = table.getProductCode(); + logger.info("=======物料附属信息" + failSpareParts + "=======导入失败"); + } + return failSpareParts; + } + + + /** + * 校验导入信息 + */ + public AjaxResult checkImportFile(List baseProductAttached){ + // 传入对象不能为空 + if (baseProductAttached.size() == 0 || StringUtils.isNull(baseProductAttached)) { + return error(500, "导入的信息不能为空!信息导入失败！"); + } + + + for (BaseProductAttached productAttached : baseProductAttached) { + //产品编码 + if (productAttached.getProductCode().isEmpty() || productAttached.getProductCode()==null){ + return error(500, "产品编号不能为空！信息导入失败！"); + } + //品类 + if (productAttached.getCategory().isEmpty() || productAttached.getCategory()==null){ + return error(500, "品类不能为空！信息导入失败！"); + } + //每PC单圈 + if (productAttached.getPc().isEmpty() || productAttached.getPc()==null){ + return error(500, "每PC单圈不能为空！信息导入失败！"); + } + //标准效率 + if (productAttached.getIei().toString().isEmpty() || productAttached.getIei()==null){ + return error(500, "标准效率不能为空！信息导入失败！"); + } + //标准用人 + if (productAttached.getManStandar().toString().isEmpty() || productAttached.getManStandar()==null){ + return error(500, "标准用人不能为空！信息导入失败！"); + } + //喷药方式 +// if (productAttached.getSprayWay().isEmpty() || productAttached.getSprayWay()==null){ +// return error(500, "喷药方式不能为空！信息导入失败！"); +// } + //白坯直径 + if (productAttached.getBlankDiameter().toString().isEmpty() || productAttached.getBlankDiameter()==null){ + return error(500, "白坯直径不能为空！信息导入失败！"); + } + //白坯物料号 + if (productAttached.getBlankNo().isEmpty() || productAttached.getBlankNo()==null){ + return error(500, "白坯物料号不能为空！信息导入失败！"); + } + //标准喷药量 + if (productAttached.getSprayVolume().toString().isEmpty() || productAttached.getSprayVolume()==null){ + return error(500, "标准喷药量不能为空！信息导入失败！"); + } + //药液料号 + if (productAttached.getLiquidNo().isEmpty() || productAttached.getLiquidNo()==null){ + return error(500, "药液料号不能为空！信息导入失败！"); + } + //标准内膜用量 + if (productAttached.getEndometrialDosage().toString().isEmpty() || productAttached.getEndometrialDosage()==null){ + return error(500, "标准内膜用量不能为空！信息导入失败！"); + } + //标准外膜用量 + if (productAttached.getOuterFilmDosage().toString().isEmpty() || productAttached.getOuterFilmDosage()==null){ + return error(500, "标准外膜用量不能为空！信息导入失败！"); + } + //支架 + if (productAttached.getSupport().toString().isEmpty() || productAttached.getSupport()==null){ + return error(500, "支架不能为空！信息导入失败！"); + } + //支架物料号 + if (productAttached.getSupportNo().isEmpty() || productAttached.getSupportNo()==null){ + return error(500, "支架物料号不能为空！信息导入失败！"); + } + //吸塑 + if (productAttached.getPvc().toString().isEmpty() || productAttached.getPvc()==null){ + return error(500, "吸塑不能为空！信息导入失败！"); + } + //支架盘 + if (productAttached.getSupportPlate().toString().isEmpty() || productAttached.getSupportPlate()==null){ + return error(500, "支架盘不能为空！信息导入失败！"); + } + //库检周期 + if (productAttached.getWarehouseCycle().isEmpty() || productAttached.getSupportPlate()==null){ + return error(500, "库检周期不能为空！信息导入失败！"); + } + //库检周期 + if (productAttached.getWarehouseCycle().isEmpty() || productAttached.getWarehouseCycle()==null){ + return error(500, "库检周期不能为空！信息导入失败！"); + } + //托盘上箱数 + if (productAttached.getPalletNum().toString().isEmpty() || productAttached.getPalletNum()==null){ + return error(500, "托盘上箱数不能为空！信息导入失败！"); + } + //垛形 + if (productAttached.getPackType().isEmpty() || productAttached.getPackType()==null){ + return error(500, "垛形不能为空！信息导入失败！"); + } + } + return success(); + + } + + @Override + @DS("#header.poolName") + public boolean checkSpareCodeUnique(BaseProductAttached baseProductAttached) { + String spareCode = baseProductAttachedMapper.checkSpareCodeUnique(baseProductAttached); + if (spareCode == null) { + return false; + } else { + return true; + } + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/BaseProductAttachedMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/BaseProductAttachedMapper.xml index 887c5cea0..dc025030c 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/BaseProductAttachedMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/BaseProductAttachedMapper.xml @@ -24,10 +24,15 @@ + + + - select id, product_code, category, pc, iei, man_standar, spray_way, blank_diameter, blank_no, spray_volume, liquid_no, endometrial_dosage, outer_film_dosage, support, support_no, pvc, support_plate, other, create_by from base_product_attached + select id, product_code, category, pc, iei, man_standar, spray_way, blank_diameter, blank_no, spray_volume, liquid_no, endometrial_dosage, outer_film_dosage, support, support_no, pvc, + support_plate, + other, create_by, warehouse_cycle,pallet_num,pack_type from base_product_attached @@ -57,7 +67,18 @@ where id = #{id} - + + + + + insert into base_product_attached @@ -80,6 +101,10 @@ support_plate, other, create_by, + + warehouse_cycle, + pallet_num, + pack_type, #{id}, @@ -101,6 +126,9 @@ #{supportPlate}, #{other}, #{createBy}, + #{warehouseCycle}, + #{palletNum}, + #{packType}, @@ -125,6 +153,11 @@ support_plate = #{supportPlate}, other = #{other}, create_by = #{createBy}, + + + warehouse_cycle = #{warehouseCycle}, + pallet_num = #{palletNum}, + pack_type = #{packType}, where id = #{id} From c75289012a270b378130a2c36905b544bdcd0d94 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 22 Aug 2024 11:45:05 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E8=A1=A84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/domain/QcCheckTaskDefect.java | 8 ++ .../op/quality/domain/QcCheckTaskDetail.java | 9 ++ .../quality/mapper/QcStaticTableMapper.java | 2 + .../impl/QcCheckTaskIncomeServiceImpl.java | 19 +-- .../service/impl/QcProCheckServiceImpl.java | 2 + .../impl/QcStaticTableServiceImpl.java | 15 +- .../quality/QcCheckTaskDefectMapper.xml | 9 +- .../quality/QcCheckTaskIncomeMapper.xml | 4 +- .../mapper/quality/QcInterfaceMapper.xml | 33 ++--- .../mapper/quality/QcStaticTableMapper.xml | 131 ++++++++++++++---- 10 files changed, 170 insertions(+), 62 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java index 0bb070308..bc848b91c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDefect.java @@ -93,7 +93,15 @@ public class QcCheckTaskDefect extends BaseEntity { private String defectCodes; private String defectNames; private String defectQualitys; + private String classId; + public String getClassId() { + return classId; + } + + public void setClassId(String classId) { + this.classId = classId; + } public String getDefectCodes() { return defectCodes; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java index e1603e694..fd418b716 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -138,6 +138,7 @@ public class QcCheckTaskDetail extends BaseEntity { private String defectCodes; private String defectNames; private String defectQualitys; + private String classTypeCodes; private String itemType; private String judgeRate; private String samplePlan; @@ -147,6 +148,14 @@ public class QcCheckTaskDetail extends BaseEntity { private String sampleAql; private String checkLevel; + public String getClassTypeCodes() { + return classTypeCodes; + } + + public void setClassTypeCodes(String classTypeCodes) { + this.classTypeCodes = classTypeCodes; + } + public String getCheckLevel() { return checkLevel; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java index 3662d820d..02e1b577c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java @@ -91,4 +91,6 @@ public interface QcStaticTableMapper { Map getNoOkNum(QcStaticTable qcStaticTable); List getTableHzNoOkData(QcStaticTable qcStaticTable); + @MapKey("ymdms") + Map getNoOkRatioNum(QcStaticTable qcStaticTable); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 00e1bc590..0a8005d78 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -750,20 +750,17 @@ public class QcCheckTaskIncomeServiceImpl implements } } - + if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){ + qcCheckTask.setSampleQuality(sampleQuality); + }else{ + qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); + } /**qc_check_task_cg**/ List valiData = qcCheckTaskIncomeMapper.selectQcCheckTaskCgByRecordId(belongId); // 判断表中是否存在此条数据 if (valiData != null && valiData.size() > 0) { n = qcCheckTaskIncomeMapper.updateQcCheckTaskCg(qcCheckTask);//updateQcCheckTaskCG }else { - - if(qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){ - qcCheckTask.setSampleQuality(sampleQuality); - }else{ - qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); - } - qcCheckTask.setCheckNo(qcCheckTaskIncome.getCheckNo()); qcCheckTask.setOrderNo(qcCheckTaskIncome.getOrderNo()); qcCheckTask.setMaterialCode(qcCheckTaskIncome.getMaterialCode()); @@ -798,10 +795,12 @@ public class QcCheckTaskIncomeServiceImpl implements String[] defectCodes = detail.getDefectCodes().split(","); String[] defectNames = detail.getDefectNames().split(","); String[] defectQualitys = detail.getDefectQualitys().split(","); + String[] classIds = detail.getClassTypeCodes().split(","); for(int d=0;d implements } } - if(qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){ + if(qcCheckTaskIncome.getSampleQuality()!=null && qcCheckTaskIncome.getSampleQuality().equals(BigDecimal.ZERO)){ qcCheckTask.setSampleQuality(sampleQuality); }else{ qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); @@ -923,11 +922,13 @@ public class QcCheckTaskIncomeServiceImpl implements String[] defectCodes = detail.getDefectCodes().split(","); String[] defectNames = detail.getDefectNames().split(","); String[] defectQualitys = detail.getDefectQualitys().split(","); + String[] classIds = detail.getClassTypeCodes().split(","); for(int d=0;d cols1 = qcStaticTableMapper.getTableHzTitle(qcStaticTable); @@ -887,17 +887,19 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { @DS("#header.poolName") public List getTableHzData(QcStaticTable qcStaticTable) { List dtos = new ArrayList<>(); - qcStaticTable.setDataType("unqualified_remark"); + //qcStaticTable.setDataType("unqualified_remark"); qcStaticTable.setRemark(qcStaticTable.getCheckType()); List noOkTyps = qcStaticTableMapper.getTableHzTitle(qcStaticTable); //第一列日期 List days = this.getHzDays(qcStaticTable.getIncomeTimeStr(),qcStaticTable.getYmdms()); - //抽样数、不良数、不良率 + //抽样数 Map samples = qcStaticTableMapper.getSamplesNum(qcStaticTable); if(samples.isEmpty()){ return dtos; } - //不良数 + //不良数(折算后)、不良率 + Map noOkNumRs = qcStaticTableMapper.getNoOkRatioNum(qcStaticTable); + //不良数(不折算) Map noOks = qcStaticTableMapper.getNoOkNum(qcStaticTable); HashMap colMap = null; for(String col:days){ @@ -905,9 +907,10 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { colMap.put("timeCol",col); String samKey = col; QcStaticTable sampl = samples.get(samKey); - if(sampl!=null&&!sampl.getSampleQuality().equals("0.00")){ + QcStaticTable noOkNumR = noOkNumRs.get(samKey); + if(sampl!=null&&!sampl.getSampleQuality().equals("0.00")&&noOkNumR!=null && !noOkNumR.getNoOkQuality().equals("0.00")){ colMap.put("sampleQuality",sampl.getSampleQuality().replaceAll("\\..*", "")); - BigDecimal noOkRate = new BigDecimal(sampl.getNoOkQuality()).multiply(new BigDecimal("100.00")) + BigDecimal noOkRate = new BigDecimal(noOkNumR.getNoOkQuality()).multiply(new BigDecimal("100.00")) .divide(new BigDecimal(sampl.getSampleQuality()),2, BigDecimal.ROUND_HALF_UP); colMap.put("noOkRate",noOkRate); }else{ diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml index 251b177eb..d3051a871 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDefectMapper.xml @@ -158,7 +158,14 @@ WHERE belong_to_detail = qctd.belong_to_detail and belong_to = qctd.belong_to FOR xml path('') ),1,1,'' - ) defectQualitys + ) defectQualitys, + STUFF( + (SELECT ',' + CAST(class_id AS VARCHAR(40)) + FROM qc_check_task_defect + WHERE belong_to_detail = qctd.belong_to_detail and belong_to = qctd.belong_to + FOR xml path('') + ),1,1,'' + ) classId FROM qc_check_task_defect qctd where qctd.del_flag = '0' and belong_to= #{belongTo} and belong_to_detail is not null GROUP by qctd.belong_to,qctd.belong_to_detail diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index bcb892350..a1a6502c1 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -686,14 +686,14 @@ insert into qc_check_task_defect( record_id,belong_to,belong_to_detail, defect_code,defect_subclass, - noOk_quality, + noOk_quality,class_id, create_by,create_time,factory_code ) values ( #{item.recordId},#{item.belongTo},#{item.belongToDetail}, #{item.defectCode},#{item.defectSubclass}, - #{item.noOkQuality}, + #{item.noOkQuality},#{item.classId}, #{item.createBy},#{item.createTime},#{item.factoryCode} ) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml index 119013bbc..072c12706 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml @@ -40,7 +40,7 @@ select sum(sample_quality) sampleQuality, - sum(noOk_quality) noOkQuality, ymdms FROM( - select CONVERT(varchar(7),qct.create_time, 120) AS ymdms, qct.sample_quality, qct.noOk_quality + select CONVERT(varchar(7),qct.create_time, 120) AS ymdms, qct.sample_quality from qc_check_task qct where check_type = #{checkType} and CONVERT(varchar(4),qct.create_time, 120) = #{incomeTimeStr} @@ -514,10 +515,9 @@ select sum(sample_quality) sampleQuality, - sum(noOk_quality) noOkQuality, ymdms FROM( - select CONVERT(varchar(10),qct.create_time, 120) AS ymdms, qct.sample_quality, qct.noOk_quality + select CONVERT(varchar(10),qct.create_time, 120) AS ymdms, qct.sample_quality from qc_check_task qct where check_type = #{checkType} and CONVERT(varchar(7),qct.create_time, 120) = #{incomeTimeStr} @@ -527,10 +527,9 @@ select sum(sample_quality) sampleQuality, - sum(noOk_quality) noOkQuality, RIGHT('00' + CAST(ymdms AS VARCHAR(2)), 2) ymdms FROM( - select DATEPART(HOUR, qct.create_time) AS ymdms, qct.sample_quality, qct.noOk_quality + select DATEPART(HOUR, qct.create_time) AS ymdms, qct.sample_quality from qc_check_task qct where check_type = #{checkType} and CONVERT(varchar(10),qct.create_time, 120) = #{incomeTimeStr} @@ -539,55 +538,112 @@ group by ymdms + From 3a9b3e393ba07746e24449fe6a28fe939efe93b2 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 22 Aug 2024 12:43:24 +0800 Subject: [PATCH 3/8] =?UTF-8?q?2024-08-22=20wms=20-=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=20-=20=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/wms/domain/BaseEquipment.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java index 446e5a064..920c9462e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -63,10 +63,10 @@ public class BaseEquipment extends BaseEntity { private String attr2; @Excel(name = "预留字段3") - private Long attr3; + private String attr3; @Excel(name = "预留字段4") - private Long attr4; + private String attr4; @Excel(name = "单台能力工时") private String unitWorkingHours; @@ -677,19 +677,19 @@ public class BaseEquipment extends BaseEntity { return attr2; } - public void setAttr3(Long attr3) { + public void setAttr3(String attr3) { this.attr3 = attr3; } - public Long getAttr3() { + public String getAttr3() { return attr3; } - public void setAttr4(Long attr4) { + public void setAttr4(String attr4) { this.attr4 = attr4; } - public Long getAttr4() { + public String getAttr4() { return attr4; } From c1de5e8c1d3cece85bc58b325c3ecbae61da6be8 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 22 Aug 2024 12:46:22 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=92=8C=E6=89=93=E5=8D=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OdsProcureOrderController.java | 2 +- .../controller/WmsToWCSmissionController.java | 12 +- .../com/op/wms/domain/OdsProcureOrder.java | 10 + .../op/wms/mapper/OdsProcureOrderMapper.java | 3 + .../op/wms/mapper/WmsProductPutMapper.java | 5 + .../wms/service/IOdsProcureOrderService.java | 2 +- .../impl/OdsProcureOrderServiceImpl.java | 70 ++++++- .../impl/WmsProductPutServiceImpl.java | 19 +- .../mapper/wms/OdsProcureOrderMapper.xml | 181 +++++++++++++++++- .../mapper/wms/WmsProductPutMapper.xml | 28 +++ 10 files changed, 313 insertions(+), 19 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java index ed54e9e3a..ac695e1b0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java @@ -51,7 +51,7 @@ public class OdsProcureOrderController extends BaseController { } /**获取标识卡**/ @PostMapping("/getIdCardList") - public List getIdCardList(@RequestBody OdsProcureOrder odsProcureOrder) { + public List getIdCardList(@RequestBody OdsProcureOrder odsProcureOrder) { return odsProcureOrderService.getIdCardList(odsProcureOrder); } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 2f4196c10..ea4baa5a9 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -306,11 +306,15 @@ public class WmsToWCSmissionController { */ @PostMapping("/WmsProductPutByWorkOrderqueryBS") public AjaxResult WmsProductPutByWorkOrderqueryBS(@RequestBody WmsProductPut wmsProductPut) { - WmsProductPut wmsProductPut1= wmsProductPutService.WmsProductPutByWorkOrderqueryBS(wmsProductPut); - if (wmsProductPut1==null) { - return AjaxResult.error("标识卡未绑定"); + try { + // 调用服务层方法获取 WmsProductPut 对象 + WmsProductPut wmsProductPut1 = wmsProductPutService.WmsProductPutByWorkOrderqueryBS(wmsProductPut); + // 返回成功结果 + return AjaxResult.success(wmsProductPut1); + } catch (Exception e) { + // 捕捉到异常时，返回错误提示 + return AjaxResult.error("扫描标识卡异常，检查标识卡是否有问题：" + e.getMessage()); } - return AjaxResult.success(wmsProductPut1); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java index 77433d6a9..b75833448 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java @@ -71,6 +71,8 @@ public class OdsProcureOrder extends BaseEntity { */ @Excel(name = "工厂编码") private String siteCode; + private String cardNum; + /** * 仓库编码－－收货仓库 */ @@ -283,6 +285,14 @@ public class OdsProcureOrder extends BaseEntity { this.Remark = Remark; } + public String getCardNum() { + return cardNum; + } + + public void setCardNum(String cardNum) { + this.cardNum = cardNum; + } + /** * 供应商名称 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index 7c9cdaa14..09de2d8fa 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -3,6 +3,7 @@ package com.op.wms.mapper; import java.util.List; import com.op.wms.domain.OdsProcureOrder; +import org.apache.ibatis.annotations.Param; /** * 包材采购单Mapper接口 @@ -72,4 +73,6 @@ public interface OdsProcureOrderMapper { void updateOdsProcureOrderByProcureCode(OdsProcureOrder odsProcureOrder); List getIdCardList(OdsProcureOrder odsProcureOrder); + + void addBatchPallet(@Param("list")List dtos); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 6f378db43..68dea54f1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.op.system.api.domain.wms.wmsReportWork; +import com.op.wms.domain.ProOrderWorkorder; import com.op.wms.domain.WmsProductPut; import org.apache.ibatis.annotations.Param; @@ -81,6 +82,10 @@ public interface WmsProductPutMapper { WmsProductPut selectProOrderWorkorderBatchPallet(WmsProductPut wmsProductPut); + WmsProductPut selectProOrderWorkorderBatchPalletcode(WmsProductPut wmsProductPut); + + WmsProductPut selectProOrderWorkorderBatchPalletAtter(ProOrderWorkorder proOrderWorkorder); + // String selectWmsProductPutNum(wmsReportWork wmsReportWork); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index 4fb5c8f8a..19e19d677 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -112,5 +112,5 @@ public interface IOdsProcureOrderService { void OutboundPostingSAPfc(List orderList); - List getIdCardList(OdsProcureOrder odsProcureOrder); + List getIdCardList(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index bcf451688..ef625d195 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -15,6 +15,7 @@ import java.util.*; import com.op.common.core.domain.R; +import com.op.common.core.utils.DateUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.system.api.RemoteOpenService; @@ -41,6 +42,7 @@ import com.op.wms.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.service.IOdsProcureOrderService; +import org.springframework.util.CollectionUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -77,6 +79,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { private WmsRawOrderInMapper wmsRawOrderInMapper; @Autowired private RemoteOpenService remoteOpenService; + @Autowired + private BaseProductAttachedMapper baseProductAttachedMapper; + /** * 查询包材采购单 * @@ -1075,10 +1080,69 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Override - public List getIdCardList(OdsProcureOrder odsProcureOrder) { - List orderList= odsProcureOrderMapper.getIdCardList(odsProcureOrder); + @DS("#header.poolName") + public List getIdCardList(OdsProcureOrder odsProcureOrder) { +// DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + List dtos = new ArrayList<>(); + OdsProcureOrder order=odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder.getID()); + //根据采购单获取一托盘要装多少 + BaseProductAttached baseProductAttached=new BaseProductAttached(); + String trimmedMaterialCode = order.getMaterialCode().substring(7); + baseProductAttached.setProductCode(trimmedMaterialCode); + List baseProductAttacheds= baseProductAttachedMapper.selectBaseProductAttachedList(baseProductAttached); + if (baseProductAttacheds.size()==0){ + //没有配置附属信息 + return null; + } + String name = odsProcureOrderMapper.selectBaseSupplier(order); + order.setSupplierName(name); + List dtos0= odsProcureOrderMapper.getIdCardList(order); + if(dtos0.size()==0){ + //说明没生成过标识卡 + OdsProcureOrder pw = new OdsProcureOrder(); + int i = 1; + String palletNum = baseProductAttacheds.get(0).getPalletNum(); + Date nowDate = DateUtils.getNowDate(); - return null; + if(palletNum!=null){ + BigDecimal pall = order.getPlanNumber(); + BigDecimal pn = new BigDecimal(palletNum); + while(pall.compareTo(BigDecimal.ZERO)>0){ + pw = new OdsProcureOrder(); + pw.setSiteCode(order.getSiteCode()); + + pw.setProcureCode(order.getProcureCode()); + pw.setUserDefined3(order.getUserDefined3());//行项目 + pw.setMaterialCode(order.getMaterialCode()); + pw.setMaterialDesc(order.getMaterialDesc()); + pw.setPlanNumber(pn); + pw.setSupplierCode(order.getSupplierCode()); + pw.setSupplierName(order.getSupplierName()); + pw.setUserDefined8(order.getUserDefined8()); + pw.setUserDefined11(order.getUserDefined11()); + pw.setUnit(order.getUnit()); + if(pall.compareTo(pn)<0) {//最后一托盘 + pw.setPlanNumber(pall); + }else{ + pw.setPlanNumber(pn); + } + pw.setCardNum(String.valueOf(i++)); + String dateString = pw.getUserDefined11().replace("-", ""); + pw.setUserDefined1(pw.getProcureCode()+"-"+pw.getUserDefined3()+"-"+pw.getUserDefined8()+"-"+dateString+"-"+pw.getCardNum());//采购单+行项目+类型+日期+板次 + pw.setCreateTime(nowDate); + pw.setActive("1"); + dtos.add(pw); + pall = pall.subtract(pn); + } + } + + if(!CollectionUtils.isEmpty(dtos)){ + odsProcureOrderMapper.addBatchPallet(dtos); + } + }else{ + dtos.addAll(dtos0); + } + return dtos; } public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle) { diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 288d346a0..4281320d7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1032,11 +1032,11 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { public WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut) { // 使用 split 方法根据 '-' 分割字符串，结果是一个字符串数组 DynamicDataSourceContextHolder.push("ds_" + wmsProductPut.getFactoryCode()); - String[] attributes = wmsProductPut.getPallet().split("-"); - // 通过索引访问分割后的数组，获取所需的三个属性 - String attribute1 = attributes[0]; // 获取第一个属性 - String attribute2 = attributes[1]; // 获取第二个属性 - String attribute3 = attributes[2]; // 获取第三个属性 +// String[] attributes = wmsProductPut.getPallet().split("-"); + WmsProductPut wmsProductPutTEM= wmsProductPutMapper.selectProOrderWorkorderBatchPalletcode(wmsProductPut); + String attribute1 = wmsProductPutTEM.getAttribute1(); // 获取第一个属性 + String attribute2 = wmsProductPutTEM.getAttribute2(); // 获取第二个属性 + String attribute3 = wmsProductPutTEM.getAttribute3(); // 获取第三个属性 wmsProductPut.setAttribute1(attribute1); wmsProductPut.setAttribute2(attribute2); wmsProductPut.setAttribute3(attribute3); @@ -1091,11 +1091,12 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override public ProOrderWorkorder finishedProductProductionRecordscar(ProOrderWorkorder proOrderWorkorder) { DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode()); - String[] attributes = proOrderWorkorder.getAttr1().split("-"); + //String[] attributes = proOrderWorkorder.getAttr1().split("-"); // 通过索引访问分割后的数组，获取所需的三个属性 - String attribute1 = attributes[0]; // 获取第一个属性 - String attribute2 = attributes[1]; // 获取第二个属性 - String attribute3 = attributes[2]; // 获取第三个属性 + WmsProductPut wmsProductPutTEM= wmsProductPutMapper.selectProOrderWorkorderBatchPalletAtter(proOrderWorkorder); + String attribute1 = wmsProductPutTEM.getAttribute1(); // 获取第一个属性 + String attribute2 = wmsProductPutTEM.getAttribute2(); // 获取第二个属性 + String attribute3 = wmsProductPutTEM.getAttribute3(); // 获取第三个属性 proOrderWorkorder.setWorkorderCodeSap(attribute1); proOrderWorkorder.setBatchCode(attribute2); WmsProductPut wmsProductPut =new WmsProductPut(); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index ff983ecb5..5a84bf583 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -14,6 +14,7 @@ + @@ -250,7 +251,185 @@ and Active= #{Active} - + SELECT + Site_code, + ID, + Procure_Code, + Material_Code, + Material_Desc, + Plan_Date, + Plan_Number, + Unit, + COALESCE ( Reality_Number, 0 ) Reality_Number, + card_num cardNum, + User_Defined1, + User_Defined2, + User_Defined3, + User_Defined4, + User_Defined5, + User_Defined6, + User_Defined7, + User_Defined8, + User_Defined9, + User_Defined10, + User_Defined11, + Supplier_Code, + Supplier_Name, + Remark, + Create_By, + Create_Date, + Last_Update_By, + Last_Update_Date, + Active, + Enterprise_Id, + Enterprise_Code, + COALESCE ( Operation_Number, 0 ) Operation_Number + FROM + ods_procure_order_card + where Procure_Code=#{procureCode} and User_Defined3= #{userDefined3} and User_Defined8= #{userDefined8} and User_Defined11= #{userDefined11} + + + + + + insert into ods_procure_order_card + + + + Site_code, + + ID, + + card_num, + + Procure_Code, + + Material_Code, + + Material_Desc, + + Plan_Date, + + Plan_Number, + + Unit, + + Reality_Number, + + Order_Status, + + User_Defined1, + + User_Defined2, + + User_Defined3, + + User_Defined4, + + User_Defined5, + + User_Defined6, + + User_Defined7, + + User_Defined8, + + User_Defined9, + + User_Defined10, + + User_Defined11, + + Supplier_Code, + + Supplier_Name, + + Remark, + + Create_By, + + Create_Date, + + Last_Update_By, + + Last_Update_Date, + + Active, + + Enterprise_Id, + + Enterprise_Code, + + + + + #{dto.siteCode}, + + #{dto.ID}, + + #{dto.cardNum}, + + #{dto.procureCode}, + + #{dto.materialCode}, + + #{dto.materialDesc}, + + #{dto.planDate}, + + #{dto.planNumber}, + + #{dto.Unit}, + + #{dto.realityNumber}, + + #{dto.orderStatus}, + + #{dto.userDefined1}, + + #{dto.userDefined2}, + + #{dto.userDefined3}, + + #{dto.userDefined4}, + + #{dto.userDefined5}, + + #{dto.userDefined6}, + + #{dto.userDefined7}, + + #{dto.userDefined8}, + + #{dto.userDefined9}, + + #{dto.userDefined10}, + + #{dto.userDefined11}, + + #{dto.supplierCode}, + + #{dto.supplierName}, + + #{dto.Remark}, + + #{dto.createBy}, + + #{dto.createDate}, + + #{dto.lastUpdateBy}, + + #{dto.lastUpdateDate}, + + #{dto.Active}, + + #{dto.enterpriseId}, + + #{dto.enterpriseCode}, + + + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index c731dae69..ece6f4c01 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -39,6 +39,9 @@ + + + @@ -432,4 +435,29 @@ AND pro_order_workorder_batch_pallet.pallet_num= #{pallet} + + + From 63f07e88c6d57f0f793ebca22fa3b8d1c9bcd018 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 22 Aug 2024 13:23:48 +0800 Subject: [PATCH 5/8] =?UTF-8?q?2024-08-22=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E8=AE=BE=E5=A4=87-=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/device/domain/EquEquipment.java | 12 ++++++------ .../main/java/com/op/device/domain/Equipment.java | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java index 46647fcba..23e3d0ee6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java @@ -104,13 +104,13 @@ public class EquEquipment extends BaseEntity { * 预留字段3 */ @Excel(name = "预留字段3") - private Long attr3; + private String attr3; /** * 预留字段4 */ @Excel(name = "预留字段4") - private Long attr4; + private String attr4; /** * 工段 @@ -394,19 +394,19 @@ public class EquEquipment extends BaseEntity { return attr2; } - public void setAttr3(Long attr3) { + public void setAttr3(String attr3) { this.attr3 = attr3; } - public Long getAttr3() { + public String getAttr3() { return attr3; } - public void setAttr4(Long attr4) { + public void setAttr4(String attr4) { this.attr4 = attr4; } - public Long getAttr4() { + public String getAttr4() { return attr4; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java index ac49f6b14..c69693a80 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java @@ -96,13 +96,13 @@ public class Equipment extends BaseEntity { * 预留字段3 */ @Excel(name = "预留字段3") - private Long attr3; + private String attr3; /** * 预留字段4 */ @Excel(name = "预留字段4") - private Long attr4; + private String attr4; /** * 工段 @@ -347,19 +347,19 @@ public class Equipment extends BaseEntity { return attr2; } - public void setAttr3(Long attr3) { + public void setAttr3(String attr3) { this.attr3 = attr3; } - public Long getAttr3() { + public String getAttr3() { return attr3; } - public void setAttr4(Long attr4) { + public void setAttr4(String attr4) { this.attr4 = attr4; } - public Long getAttr4() { + public String getAttr4() { return attr4; } From e5adc98b7481d5189d08d8a243865bebe1c5d362 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 22 Aug 2024 15:47:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E8=A1=A84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ABAP_AS_WITH_POOL.jcoDestination | 11 - dev_jco_rfc.trc | 230 ++++++++++++++++++ op-auth/src/main/resources/bootstrap.yml | 12 +- op-gateway/src/main/resources/bootstrap.yml | 14 +- .../src/main/resources/bootstrap.yml | 14 +- .../op-file/src/main/resources/bootstrap.yml | 16 +- .../op-gen/src/main/resources/bootstrap.yml | 13 +- .../op-job/src/main/resources/bootstrap.yml | 14 +- .../op-mes/src/main/resources/bootstrap.yml | 12 +- .../op-open/src/main/resources/bootstrap.yml | 16 +- .../op-plan/src/main/resources/bootstrap.yml | 12 +- .../QcDefectTypeClassController.java | 107 ++++++++ .../op/quality/domain/QcDefectTypeClass.java | 143 +++++++++++ .../mapper/QcDefectTypeClassMapper.java | 64 +++++ .../service/IQcDefectTypeClassService.java | 65 +++++ .../impl/QcDefectTypeClassServiceImpl.java | 111 +++++++++ .../src/main/resources/bootstrap.yml | 8 +- .../quality/QcDefectTypeClassMapper.xml | 194 +++++++++++++++ .../op-sap/src/main/resources/bootstrap.yml | 12 +- .../src/main/resources/bootstrap.yml | 12 +- .../src/main/resources/bootstrap.yml | 12 +- .../op-wms/src/main/resources/bootstrap.yml | 12 +- 22 files changed, 1004 insertions(+), 100 deletions(-) delete mode 100644 ABAP_AS_WITH_POOL.jcoDestination create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java create mode 100644 op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java create mode 100644 op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination deleted file mode 100644 index 74ee2038a..000000000 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ /dev/null @@ -1,11 +0,0 @@ -#for test only! -#Fri Feb 02 11:11:00 CST 2024 -jco.destination.pool_capacity=true -jco.client.lang=zh -jco.client.ashost=192.168.0.130 -jco.client.saprouter= -jco.client.user=MES -jco.client.sysnr=0 -jco.destination.peak_limit=20 -jco.client.passwd=123456 -jco.client.client=800 diff --git a/dev_jco_rfc.trc b/dev_jco_rfc.trc index b255ea6ab..55598a5de 100644 --- a/dev_jco_rfc.trc +++ b/dev_jco_rfc.trc @@ -73,6 +73,185 @@ Caused by: java.lang.NullPointerException ... 63 more +**** Error file opened at 20240111 164451 China Standard Time Rel 3.0.8 (2011-11-28) [721.913] +Error: >Thu Jan 11 16:44:51,560< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:44:55,319< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:49:04,522< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:49:08,215< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:50:08,396< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:50:12,521< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:52:25,915< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:52:29,518< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:54:16,079< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:54:19,679< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:54:22,525< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:54:26,108< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:55:32,052< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:55:35,705< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:56:23,406< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:56:27,066< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:59:45,369< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 16:59:49,619< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:00:18,266< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:00:28,280< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:05:06,677< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:07:27,288< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:09:50,015< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:11:35,473< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:11:53,389< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:13:32,715< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:13:53,701< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:14:44,332< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:15:58,852< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:18:02,274< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:18:50,315< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:20:44,293< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:25:11,895< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:34:46,104< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:35:39,742< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:36:24,165< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:38:10,872< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:41:09,642< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:41:59,356< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:42:51,751< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:45:34,021< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:46:14,888< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:47:26,853< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:50:17,775< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:53:12,231< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:54:03,321< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:56:27,055< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:57:53,784< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:58:20,978< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 17:59:33,781< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:00:54,567< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:01:36,649< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:01:48,844< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:02:31,503< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:03:26,898< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:04:24,525< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:05:48,654< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:07:20,674< >RfcGetException rc (7) message: ## 800 ######## +Thu Jan 11 18:08:23,214< >RfcGetException rc (7) message: ## 800 ######## +Thu Dec 14 15:15:38,905< >RfcGetException rc (7) message: Invalid value in OPTION field of value table for IN itab operator. operator. Thu Jan 25 18:04:22,996< >RfcGetException rc (7) message: ## 600 ######## Wed Feb 28 09:51:23,384< >RfcGetException rc (7) message: ## 800 ######## +Wed Feb 28 09:55:24,676< >RfcGetException rc (7) message: ## 800 ######## +Wed Feb 28 09:56:02,286< >RfcGetException rc (7) message: ## 800 ######## +Mon Mar 11 16:16:17,464< >RfcGetException rc (3) message: CPIC-CALL: CMRCV on convId: 17090475 + +ERROR connection to partner '192.168.0.54:3300' broken +TIME Mon Mar 11 16:16:17 2024 +RELEASE 721 +COMPONENT NI (network interface) +VERSION 40 +RC -6 +MODULE nixxi.cpp +LINE 4851 +DETAIL NiIRead: P=192.168.0.54:3300; L=2.0.0.1:62053 +SYSTEM CALL recv +COUNTER 3 + +Mon Mar 11 16:16:17,467< RfcException: [QAS|erpqos] + message: CPIC-CALL: CMRCV on convId: 17090475 + +ERROR connection to partner '192.168.0.54:3300' broken +TIME Mon Mar 11 16:16:17 2024 +RELEASE 721 +COMPONENT NI (network interface) +VERSION 40 +RC -6 +MODULE nixxi.cpp +LINE 4851 +DETAIL NiIRead: P=192.168.0.54:3300; L=2.0.0.1:62053 +SYSTEM CALL recv +COUNTER 3 + + Return code: RFC_SYS_EXCEPTION(3) + error group: 102 + key: RFC_ERROR_COMMUNICATION +Exception raised by QAS|erpqos + diff --git a/op-auth/src/main/resources/bootstrap.yml b/op-auth/src/main/resources/bootstrap.yml index e4d188414..e0d5ba624 100644 --- a/op-auth/src/main/resources/bootstrap.yml +++ b/op-auth/src/main/resources/bootstrap.yml @@ -17,16 +17,16 @@ spring: # 服务注册地址 #--spring.cloud.nacos.discovery.namespace=chj --spring.cloud.nacos.config.namespace=chj # namespace: lanju-op-test - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: #命名空间 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-gateway/src/main/resources/bootstrap.yml b/op-gateway/src/main/resources/bootstrap.yml index 912fc831d..587efe918 100644 --- a/op-gateway/src/main/resources/bootstrap.yml +++ b/op-gateway/src/main/resources/bootstrap.yml @@ -15,16 +15,16 @@ spring: discovery: # username: nacos # password: sfnacos2023 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: #命名空间 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -40,7 +40,7 @@ spring: datasource: ds1: nacos: - server-addr: 140.249.53.142:8848 + server-addr: 175.27.215.92:8848 dataId: sentinel-op-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml index b3bf9ac16..2d1a795e3 100644 --- a/op-modules/op-device/src/main/resources/bootstrap.yml +++ b/op-modules/op-device/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-file/src/main/resources/bootstrap.yml b/op-modules/op-file/src/main/resources/bootstrap.yml index f1c1d493d..033cb8caa 100644 --- a/op-modules/op-file/src/main/resources/bootstrap.yml +++ b/op-modules/op-file/src/main/resources/bootstrap.yml @@ -12,17 +12,17 @@ spring: cloud: nacos: discovery: + namespace: lanju-op + group: zxl # 服务注册地址 - namespace: lanju-op-test - group: test - # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - # 配置中心地址 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-gen/src/main/resources/bootstrap.yml b/op-modules/op-gen/src/main/resources/bootstrap.yml index 4f69cfc2d..75c3c997a 100644 --- a/op-modules/op-gen/src/main/resources/bootstrap.yml +++ b/op-modules/op-gen/src/main/resources/bootstrap.yml @@ -13,17 +13,16 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: #命名空间 - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml index 9e64e0ffe..449112aad 100644 --- a/op-modules/op-job/src/main/resources/bootstrap.yml +++ b/op-modules/op-job/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + # server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index 1a148b145..63c4ede5d 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.yml @@ -13,16 +13,16 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 # server-addr: 192.168.202.20:8848 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-open/src/main/resources/bootstrap.yml b/op-modules/op-open/src/main/resources/bootstrap.yml index b9dd2cae6..29d71df08 100644 --- a/op-modules/op-open/src/main/resources/bootstrap.yml +++ b/op-modules/op-open/src/main/resources/bootstrap.yml @@ -13,17 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test - #命名空间 - #group: local - # 配置中心地址 - server-addr: 192.168.202.20:8848 + namespace: lanju-op + group: zxl + # 服务注册地址 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml index 89a3d22c2..39d689e46 100644 --- a/op-modules/op-plan/src/main/resources/bootstrap.yml +++ b/op-modules/op-plan/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java new file mode 100644 index 000000000..90f4db30a --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcDefectTypeClassController.java @@ -0,0 +1,107 @@ +package com.op.quality.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.quality.domain.QcDefectTypeClass; +import com.op.quality.service.IQcDefectTypeClassService; +import com.op.system.api.domain.SysDictData; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 故障类型-缺陷描述分类Controller + * + * @author Open Platform + * @date 2024-08-20 + */ +@RestController +@RequestMapping("/defectClass") +public class QcDefectTypeClassController extends BaseController { + @Autowired + private IQcDefectTypeClassService qcDefectTypeClassService; + +/** + * 查询故障类型-缺陷描述分类列表 + */ +@RequiresPermissions("system:class:list") +@GetMapping("/list") + public TableDataInfo list(QcDefectTypeClass qcDefectTypeClass) { + startPage(); + List list = qcDefectTypeClassService.selectQcDefectTypeClassList(qcDefectTypeClass); + return getDataTable(list); + } + + /** + * 导出故障类型-缺陷描述分类列表 + */ + @RequiresPermissions("system:class:export") + @Log(title = "故障类型-缺陷描述分类", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QcDefectTypeClass qcDefectTypeClass) { + List list = qcDefectTypeClassService.selectQcDefectTypeClassList(qcDefectTypeClass); + ExcelUtil util = new ExcelUtil(QcDefectTypeClass. class); + util.exportExcel(response, list, "故障类型-缺陷描述分类数据"); + } + + /** + * 获取故障类型-缺陷描述分类详细信息 + */ + @RequiresPermissions("system:class:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(qcDefectTypeClassService.selectQcDefectTypeClassById(id)); + } + + /** + * 新增故障类型-缺陷描述分类 + */ + @RequiresPermissions("system:class:add") + @Log(title = "故障类型-缺陷描述分类", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QcDefectTypeClass qcDefectTypeClass) { + return toAjax(qcDefectTypeClassService.insertQcDefectTypeClass(qcDefectTypeClass)); + } + + /** + * 修改故障类型-缺陷描述分类 + */ + @RequiresPermissions("system:class:edit") + @Log(title = "故障类型-缺陷描述分类", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QcDefectTypeClass qcDefectTypeClass) { + return toAjax(qcDefectTypeClassService.updateQcDefectTypeClass(qcDefectTypeClass)); + } + + /** + * 删除故障类型-缺陷描述分类 + */ + @RequiresPermissions("system:class:remove") + @Log(title = "故障类型-缺陷描述分类", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(qcDefectTypeClassService.deleteQcDefectTypeClassByIds(ids)); + } + + @GetMapping("/getClassInfoList") + @DS("#header.poolName") + public AjaxResult getClassInfoList(QcDefectTypeClass qcDefectTypeClass) { + List list = qcDefectTypeClassService.getClassInfoList(qcDefectTypeClass); + return success(list); + } +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java new file mode 100644 index 000000000..4d782302a --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcDefectTypeClass.java @@ -0,0 +1,143 @@ +package com.op.quality.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 故障类型-缺陷描述分类对象 qc_defect_type_class + * + * @author Open Platform + * @date 2024-08-20 + */ +public class QcDefectTypeClass extends BaseEntity { +private static final long serialVersionUID=1L; + + /** 主键 */ + private String id; + + /** 不良类型id */ + @Excel(name = "不良类型id") + private String defectId; + + /** 不良类型编码 */ + @Excel(name = "不良类型编码") + private String defectCode; + + /** 缺陷名称 */ + @Excel(name = "缺陷名称") + private String className; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + private String sort; + + public String getSort() { + return sort; + } + + public void setSort(String sort) { + this.sort = sort; + } + + public void setId(String id){ + this.id = id; + } + + public String getId(){ + return id; + } + public void setDefectId(String defectId){ + this.defectId = defectId; + } + + public String getDefectId(){ + return defectId; + } + public void setDefectCode(String defectCode){ + this.defectCode = defectCode; + } + + public String getDefectCode(){ + return defectCode; + } + public void setClassName(String className){ + this.className = className; + } + + public String getClassName(){ + return className; + } + public void setFactoryCode(String factoryCode){ + this.factoryCode = factoryCode; + } + + public String getFactoryCode(){ + return factoryCode; + } + public void setAttr1(String attr1){ + this.attr1 = attr1; + } + + public String getAttr1(){ + return attr1; + } + public void setAttr2(String attr2){ + this.attr2 = attr2; + } + + public String getAttr2(){ + return attr2; + } + public void setAttr3(String attr3){ + this.attr3 = attr3; + } + + public String getAttr3(){ + return attr3; + } + public void setDelFlag(String delFlag){ + this.delFlag = delFlag; + } + + public String getDelFlag(){ + return delFlag; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id",getId()) + .append("defectId",getDefectId()) + .append("defectCode",getDefectCode()) + .append("className",getClassName()) + .append("remark",getRemark()) + .append("factoryCode",getFactoryCode()) + .append("attr1",getAttr1()) + .append("attr2",getAttr2()) + .append("attr3",getAttr3()) + .append("delFlag",getDelFlag()) + .append("createBy",getCreateBy()) + .append("createTime",getCreateTime()) + .append("updateBy",getUpdateBy()) + .append("updateTime",getUpdateTime()) + .toString(); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java new file mode 100644 index 000000000..cf850f316 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcDefectTypeClassMapper.java @@ -0,0 +1,64 @@ +package com.op.quality.mapper; + +import com.op.quality.domain.QcDefectTypeClass; + +import java.util.List; + + +/** + * 故障类型-缺陷描述分类Mapper接口 + * + * @author Open Platform + * @date 2024-08-20 + */ +public interface QcDefectTypeClassMapper { + /** + * 查询故障类型-缺陷描述分类 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 故障类型-缺陷描述分类 + */ + public QcDefectTypeClass selectQcDefectTypeClassById(String id); + + /** + * 查询故障类型-缺陷描述分类列表 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 故障类型-缺陷描述分类集合 + */ + public List selectQcDefectTypeClassList(QcDefectTypeClass qcDefectTypeClass); + + /** + * 新增故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + public int insertQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass); + + /** + * 修改故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + public int updateQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass); + + /** + * 删除故障类型-缺陷描述分类 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 结果 + */ + public int deleteQcDefectTypeClassById(String id); + + /** + * 批量删除故障类型-缺陷描述分类 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQcDefectTypeClassByIds(String[] ids); + + List getClassInfoList(QcDefectTypeClass qcDefectTypeClass); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java new file mode 100644 index 000000000..2705f3fb4 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcDefectTypeClassService.java @@ -0,0 +1,65 @@ +package com.op.quality.service; + +import com.op.quality.domain.QcDefectTypeClass; + +import java.util.List; + + + +/** + * 故障类型-缺陷描述分类Service接口 + * + * @author Open Platform + * @date 2024-08-20 + */ +public interface IQcDefectTypeClassService { + /** + * 查询故障类型-缺陷描述分类 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 故障类型-缺陷描述分类 + */ + public QcDefectTypeClass selectQcDefectTypeClassById(String id); + + /** + * 查询故障类型-缺陷描述分类列表 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 故障类型-缺陷描述分类集合 + */ + public List selectQcDefectTypeClassList(QcDefectTypeClass qcDefectTypeClass); + + /** + * 新增故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + public int insertQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass); + + /** + * 修改故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + public int updateQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass); + + /** + * 批量删除故障类型-缺陷描述分类 + * + * @param ids 需要删除的故障类型-缺陷描述分类主键集合 + * @return 结果 + */ + public int deleteQcDefectTypeClassByIds(String[] ids); + + /** + * 删除故障类型-缺陷描述分类信息 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 结果 + */ + public int deleteQcDefectTypeClassById(String id); + + List getClassInfoList(QcDefectTypeClass qcDefectTypeClass); +} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java new file mode 100644 index 000000000..49bf3e062 --- /dev/null +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcDefectTypeClassServiceImpl.java @@ -0,0 +1,111 @@ +package com.op.quality.service.impl; + +import java.security.Security; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcDefectTypeClass; +import com.op.quality.mapper.QcDefectTypeClassMapper; +import com.op.quality.service.IQcDefectTypeClassService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * 故障类型-缺陷描述分类Service业务层处理 + * + * @author Open Platform + * @date 2024-08-20 + */ +@Service +public class QcDefectTypeClassServiceImpl implements IQcDefectTypeClassService { + @Autowired + private QcDefectTypeClassMapper qcDefectTypeClassMapper; + + /** + * 查询故障类型-缺陷描述分类 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 故障类型-缺陷描述分类 + */ + @Override + @DS("#header.poolName") + public QcDefectTypeClass selectQcDefectTypeClassById(String id) { + return qcDefectTypeClassMapper.selectQcDefectTypeClassById(id); + } + + /** + * 查询故障类型-缺陷描述分类列表 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 故障类型-缺陷描述分类 + */ + @Override + @DS("#header.poolName") + public List selectQcDefectTypeClassList(QcDefectTypeClass qcDefectTypeClass) { + return qcDefectTypeClassMapper.selectQcDefectTypeClassList(qcDefectTypeClass); + } + + /** + * 新增故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass) { + qcDefectTypeClass.setCreateTime(DateUtils.getNowDate()); + qcDefectTypeClass.setId(IdUtils.fastSimpleUUID()); + qcDefectTypeClass.setCreateBy(SecurityUtils.getUsername()); + return qcDefectTypeClassMapper.insertQcDefectTypeClass(qcDefectTypeClass); + } + + /** + * 修改故障类型-缺陷描述分类 + * + * @param qcDefectTypeClass 故障类型-缺陷描述分类 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateQcDefectTypeClass(QcDefectTypeClass qcDefectTypeClass) { + qcDefectTypeClass.setUpdateTime(DateUtils.getNowDate()); + qcDefectTypeClass.setUpdateBy(SecurityUtils.getUsername()); + return qcDefectTypeClassMapper.updateQcDefectTypeClass(qcDefectTypeClass); + } + + /** + * 批量删除故障类型-缺陷描述分类 + * + * @param ids 需要删除的故障类型-缺陷描述分类主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcDefectTypeClassByIds(String[] ids) { + return qcDefectTypeClassMapper.deleteQcDefectTypeClassByIds(ids); + } + + /** + * 删除故障类型-缺陷描述分类信息 + * + * @param id 故障类型-缺陷描述分类主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteQcDefectTypeClassById(String id) { + return qcDefectTypeClassMapper.deleteQcDefectTypeClassById(id); + } + + @Override + public List getClassInfoList(QcDefectTypeClass qcDefectTypeClass) { + return qcDefectTypeClassMapper.getClassInfoList(qcDefectTypeClass); + } + + +} diff --git a/op-modules/op-quality/src/main/resources/bootstrap.yml b/op-modules/op-quality/src/main/resources/bootstrap.yml index 27544deb6..b73385328 100644 --- a/op-modules/op-quality/src/main/resources/bootstrap.yml +++ b/op-modules/op-quality/src/main/resources/bootstrap.yml @@ -14,14 +14,14 @@ spring: nacos: discovery: namespace: lanju-op - group: chj + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: namespace: lanju-op - group: chj + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml new file mode 100644 index 000000000..720767d85 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcDefectTypeClassMapper.xml @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, defect_id, defect_code, class_name, remark, factory_code, attr1, + attr2, attr3, del_flag, create_by, create_time, update_by, update_time ,sort + from qc_defect_type_class + + + + + + + + + insert into qc_defect_type_class + + id, + + defect_id, + + defect_code, + + class_name, + + remark, + + factory_code, + + attr1, + + attr2, + + attr3, + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + + sort, + + + #{id}, + + #{defectId}, + + #{defectCode}, + + #{className}, + + #{remark}, + + #{factoryCode}, + + #{attr1}, + + #{attr2}, + + #{attr3}, + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + #{sort}, + + + + + update qc_defect_type_class + + defect_id = + #{defectId}, + + defect_code = + #{defectCode}, + + class_name = + #{className}, + + remark = + #{remark}, + + factory_code = + #{factoryCode}, + + attr1 = + #{attr1}, + + attr2 = + #{attr2}, + + attr3 = + #{attr3}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + sort = #{sort}, + + where id = #{id} + + + + delete from qc_defect_type_class where id = #{id} + + + + delete from qc_defect_type_class where id in + + #{id} + + + diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml index ce8e98df1..bd77cc0c0 100644 --- a/op-modules/op-sap/src/main/resources/bootstrap.yml +++ b/op-modules/op-sap/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml index 4763c75d9..f219da313 100644 --- a/op-modules/op-system/src/main/resources/bootstrap.yml +++ b/op-modules/op-system/src/main/resources/bootstrap.yml @@ -14,17 +14,17 @@ spring: nacos: discovery: # namespace: lanju-op-test - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 # server-addr: 192.168.202.20:8848 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 # server-addr: 192.168.202.20:8848 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-technology/src/main/resources/bootstrap.yml b/op-modules/op-technology/src/main/resources/bootstrap.yml index 62798ef14..8359972df 100644 --- a/op-modules/op-technology/src/main/resources/bootstrap.yml +++ b/op-modules/op-technology/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-wms/src/main/resources/bootstrap.yml b/op-modules/op-wms/src/main/resources/bootstrap.yml index b64379139..2aa5669a8 100644 --- a/op-modules/op-wms/src/main/resources/bootstrap.yml +++ b/op-modules/op-wms/src/main/resources/bootstrap.yml @@ -13,15 +13,15 @@ spring: cloud: nacos: discovery: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 config: - namespace: lanju-op-test - group: test + namespace: lanju-op + group: zxl # 服务注册地址 - server-addr: 192.168.202.20:8848 + server-addr: 175.27.215.92:8848 # 配置文件格式 file-extension: yml # 共享配置 From 8b77bd8751a48294bae84dfffde8465ecd60c34f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 22 Aug 2024 17:21:39 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E7=BA=BF=E4=BD=93bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/plan/service/impl/ProOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index af69dc4dc..938863718 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -1371,7 +1371,7 @@ public class ProOrderServiceImpl implements IProOrderService { if(CollectionUtils.isEmpty(proOrder.getChildren())){//1层订单 proOrder.setEndFlag(1); } - int endCode = getEndCode(proOrder.getId()); + int endCode = getEndCode(proOrder.getId())+i; String belongWorkOrder = proOrder.getOrderCode()+"-"+endCode; proOrder.setBelongWorkOrder(belongWorkOrder); proOrder.setWorkerOrder(belongWorkOrder); From 6af7ebdc92197f89e662c254e8fcb0f3e24514cc Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 22 Aug 2024 17:32:29 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=BC=80=E5=8F=91=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- op-auth/src/main/resources/bootstrap.yml | 18 +++++++++--------- op-gateway/src/main/resources/bootstrap.yml | 18 +++++++++--------- .../op-device/src/main/resources/bootstrap.yml | 16 ++++++++-------- .../op-energy/src/main/resources/bootstrap.yml | 2 ++ .../op-file/src/main/resources/bootstrap.yml | 16 ++++++++-------- .../op-job/src/main/resources/bootstrap.yml | 16 ++++++++-------- .../op-mes/src/main/resources/bootstrap.yml | 15 ++++++++------- .../op-open/src/main/resources/bootstrap.yml | 14 ++++++++------ .../op-plan/src/main/resources/bootstrap.yml | 14 ++++++++------ .../src/main/resources/bootstrap.yml | 14 ++++++++------ .../op-sap/src/main/resources/bootstrap.yml | 14 ++++++++------ .../src/main/resources/bootstrap.yml | 14 ++++++++------ .../op-system/src/main/resources/bootstrap.yml | 17 ++++++++--------- .../src/main/resources/bootstrap.yml | 14 ++++++++------ .../op-wms/src/main/resources/bootstrap.yml | 14 ++++++++------ 15 files changed, 116 insertions(+), 100 deletions(-) diff --git a/op-auth/src/main/resources/bootstrap.yml b/op-auth/src/main/resources/bootstrap.yml index e0d5ba624..c062389c2 100644 --- a/op-auth/src/main/resources/bootstrap.yml +++ b/op-auth/src/main/resources/bootstrap.yml @@ -12,21 +12,21 @@ spring: cloud: nacos: discovery: -# username: nacos -# password: sfnacos2023 + # username: nacos + # password: sfnacos2023 # 服务注册地址 #--spring.cloud.nacos.discovery.namespace=chj --spring.cloud.nacos.config.namespace=chj -# namespace: lanju-op-test - namespace: lanju-op - group: zxl + # namespace: lanju-op-test + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: #命名空间 - namespace: lanju-op - group: zxl + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-gateway/src/main/resources/bootstrap.yml b/op-gateway/src/main/resources/bootstrap.yml index 587efe918..de7b74c12 100644 --- a/op-gateway/src/main/resources/bootstrap.yml +++ b/op-gateway/src/main/resources/bootstrap.yml @@ -13,18 +13,18 @@ spring: cloud: nacos: discovery: -# username: nacos -# password: sfnacos2023 - namespace: lanju-op - group: zxl + # username: nacos + # password: sfnacos2023 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: #命名空间 - namespace: lanju-op - group: zxl + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -40,7 +40,7 @@ spring: datasource: ds1: nacos: - server-addr: 175.27.215.92:8848 + server-addr: 140.249.53.142:8848 dataId: sentinel-op-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml index 2d1a795e3..5d2f97a86 100644 --- a/op-modules/op-device/src/main/resources/bootstrap.yml +++ b/op-modules/op-device/src/main/resources/bootstrap.yml @@ -13,17 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-energy/src/main/resources/bootstrap.yml b/op-modules/op-energy/src/main/resources/bootstrap.yml index d2004e93c..82e9492a0 100644 --- a/op-modules/op-energy/src/main/resources/bootstrap.yml +++ b/op-modules/op-energy/src/main/resources/bootstrap.yml @@ -13,11 +13,13 @@ spring: cloud: nacos: discovery: + #命名空间 namespace: lanju-op-test group: test # 服务注册地址 server-addr: 192.168.202.20:8848 config: + #命名空间 namespace: lanju-op-test group: test # 服务注册地址 diff --git a/op-modules/op-file/src/main/resources/bootstrap.yml b/op-modules/op-file/src/main/resources/bootstrap.yml index 033cb8caa..c389fd948 100644 --- a/op-modules/op-file/src/main/resources/bootstrap.yml +++ b/op-modules/op-file/src/main/resources/bootstrap.yml @@ -12,17 +12,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-job/src/main/resources/bootstrap.yml b/op-modules/op-job/src/main/resources/bootstrap.yml index 449112aad..bba464405 100644 --- a/op-modules/op-job/src/main/resources/bootstrap.yml +++ b/op-modules/op-job/src/main/resources/bootstrap.yml @@ -13,17 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index 63c4ede5d..a0e1c0df2 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.yml @@ -13,16 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-open/src/main/resources/bootstrap.yml b/op-modules/op-open/src/main/resources/bootstrap.yml index 29d71df08..2f72dde4c 100644 --- a/op-modules/op-open/src/main/resources/bootstrap.yml +++ b/op-modules/op-open/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-plan/src/main/resources/bootstrap.yml b/op-modules/op-plan/src/main/resources/bootstrap.yml index 39d689e46..f18b4d216 100644 --- a/op-modules/op-plan/src/main/resources/bootstrap.yml +++ b/op-modules/op-plan/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-quality/src/main/resources/bootstrap.yml b/op-modules/op-quality/src/main/resources/bootstrap.yml index b73385328..e1e532ffd 100644 --- a/op-modules/op-quality/src/main/resources/bootstrap.yml +++ b/op-modules/op-quality/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml index bd77cc0c0..f3ebf4cb7 100644 --- a/op-modules/op-sap/src/main/resources/bootstrap.yml +++ b/op-modules/op-sap/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-security/src/main/resources/bootstrap.yml b/op-modules/op-security/src/main/resources/bootstrap.yml index 26eba7e2c..c384bfc13 100644 --- a/op-modules/op-security/src/main/resources/bootstrap.yml +++ b/op-modules/op-security/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml index f219da313..116003a6c 100644 --- a/op-modules/op-system/src/main/resources/bootstrap.yml +++ b/op-modules/op-system/src/main/resources/bootstrap.yml @@ -13,18 +13,17 @@ spring: cloud: nacos: discovery: - # namespace: lanju-op-test - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - # server-addr: 192.168.202.20:8848 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-technology/src/main/resources/bootstrap.yml b/op-modules/op-technology/src/main/resources/bootstrap.yml index 8359972df..c195551d7 100644 --- a/op-modules/op-technology/src/main/resources/bootstrap.yml +++ b/op-modules/op-technology/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/op-modules/op-wms/src/main/resources/bootstrap.yml b/op-modules/op-wms/src/main/resources/bootstrap.yml index 2aa5669a8..879feea76 100644 --- a/op-modules/op-wms/src/main/resources/bootstrap.yml +++ b/op-modules/op-wms/src/main/resources/bootstrap.yml @@ -13,15 +13,17 @@ spring: cloud: nacos: discovery: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 config: - namespace: lanju-op - group: zxl + #命名空间 + namespace: lanju-op-test + group: test # 服务注册地址 - server-addr: 175.27.215.92:8848 + server-addr: 192.168.202.20:8848 # 配置文件格式 file-extension: yml # 共享配置