From 78593150388548c6f332aca7521f42851ace848d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 9 Apr 2024 14:23:51 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/sap/service/impl/SapOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index e6abf465..22030e79 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -242,7 +242,7 @@ public class SapOrderServiceImpl implements SapOrderService { for (String orderCode : sapCloseOrderQuery.getOrderCodes()) { jCoParameterList.setValue("P_AUFNR", orderCode); func.execute(dest);//执行调用函数 - String L_MSG1 = func.getExportParameterList().getString("L_MSG"); + String L_MSG1 = func.getExportParameterList().getString("MSG"); Msg.append(orderCode + "-" + L_MSG1 + ";"); } From b5cd9e76f250a50e07883f3b48b439851d5ce6ab Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 9 Apr 2024 14:27:19 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/service/impl/QcUserMaterialServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java index cd499ab8..461ae50d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java @@ -201,6 +201,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { String[] userNames = qcUserMaterial.getUserNames(); String materialCode = qcUserMaterial.getMaterialCode(); String materialName = qcUserMaterial.getMaterialName(); + String attr1 = qcUserMaterial.getAttr1(); String user = SecurityUtils.getUsername(); //插入数据 for (int i = 0; i < userCodes.length; i++) { @@ -212,6 +213,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { qcUserMaterialDto.setUserName(userNames[i]); qcUserMaterialDto.setMaterialCode(materialCode); qcUserMaterialDto.setMaterialName(materialName); + qcUserMaterialDto.setAttr1(attr1); qcUserMaterialDto.setFactoryCode(factoryCode); count += qcUserMaterialMapper.insertQcUserMaterial(qcUserMaterialDto); } From 3dd63e2288a990b0d923bc2a16516c963be79263 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 9 Apr 2024 14:34:34 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E7=BA=BF=E4=BD=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/MesLineController.java | 109 +++++++++ .../main/java/com/op/mes/domain/MesLine.java | 202 ++++++++++++++++ .../com/op/mes/domain/MesLineProcess.java | 182 ++++++++++++++ .../java/com/op/mes/mapper/MesLineMapper.java | 67 ++++++ .../op/mes/mapper/MesLineProcessMapper.java | 67 ++++++ .../mes/service/IMesLineProcessService.java | 64 +++++ .../com/op/mes/service/IMesLineService.java | 66 +++++ .../impl/MesLineProcessServiceImpl.java | 110 +++++++++ .../mes/service/impl/MesLineServiceImpl.java | 164 +++++++++++++ .../resources/mapper/mes/MesLineMapper.xml | 150 ++++++++++++ .../mapper/mes/MesLineProcessMapper.xml | 226 ++++++++++++++++++ 11 files changed, 1407 insertions(+) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/domain/MesLineProcess.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineProcessMapper.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineProcessService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineProcessServiceImpl.java create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java create mode 100644 op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml create mode 100644 op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java new file mode 100644 index 00000000..55951d6f --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java @@ -0,0 +1,109 @@ +package com.op.mes.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.alibaba.nacos.shaded.com.google.protobuf.Internal; +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.mes.domain.MesLine; +import com.op.mes.service.IMesLineService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 线体管理Controller + * + * @author Open Platform + * @date 2024-04-02 + */ +@RestController +@RequestMapping("/mesLine") +public class MesLineController extends BaseController { + @Autowired + private IMesLineService mesLineService; + +/** + * 查询线体管理列表 + */ +@RequiresPermissions("mes:mesLine:list") +@GetMapping("/list") + public TableDataInfo list(MesLine mesLine) { + startPage(); + List list = mesLineService.selectMesLineList(mesLine); + return getDataTable(list); + } + + /** + * 导出线体管理列表 + */ + @RequiresPermissions("mes:mesLine:export") + @Log(title = "线体管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MesLine mesLine) { + List list = mesLineService.selectMesLineList(mesLine); + ExcelUtil util = new ExcelUtil(MesLine. class); + util.exportExcel(response, list, "线体管理数据"); + } + + /** + * 获取线体管理详细信息 + */ + @RequiresPermissions("mes:mesLine:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(mesLineService.selectMesLineById(id)); + } + + /** + * 新增线体管理 + */ + @RequiresPermissions("mes:mesLine:add") + @Log(title = "线体管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody MesLine mesLine) { + return toAjax(mesLineService.insertMesLine(mesLine)); + } + + /** + * 修改线体管理 + */ + @RequiresPermissions("mes:mesLine:edit") + @Log(title = "线体管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody MesLine mesLine) { + return toAjax(mesLineService.updateMesLine(mesLine)); + } + + /** + * 删除线体管理 + */ + @RequiresPermissions("mes:mesLine:remove") + @Log(title = "线体管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(mesLineService.deleteMesLineByIds(ids)); + } + /** + * 选择线体 + */ + @GetMapping("/selectLineBody") + public TableDataInfo selectLineBody(MesLine mesLine) { + startPage(); + List list = mesLineService.selectLineBody(mesLine); + return getDataTable(list); + } +} + diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java new file mode 100644 index 00000000..498fc898 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java @@ -0,0 +1,202 @@ +package com.op.mes.domain; + +import java.math.BigDecimal; +import java.util.List; + +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; + +/** + * 线体管理对象 mes_line + * + * @author Open Platform + * @date 2024-04-02 + */ +public class MesLine extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 线体编码 + */ + @Excel(name = "线体编码") + private String lineCode; + + /** + * 线体名称 + */ + @Excel(name = "线体名称") + private String lineName; + + /** + * 标准用人 + */ + @Excel(name = "标准用人") + private Long useMan; + + /** + * 标准效率 + */ + @Excel(name = "标准效率") + private BigDecimal efficiency; + + /** + * 检验工具 + */ + @Excel(name = "检验工具") + private String attr1; + + /** + * $column.columnComment + */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr2; + + /** + * $column.columnComment + */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr3; + + /** + * 预留字段1 + */ + @Excel(name = "预留字段1") + private String attr4; + + /** + * 工厂编码 + */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** + * 删除标识1删除0正常 + */ + private String delFlag; + + private List processList; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + + public String getLineCode() { + return lineCode; + } + + public void setLineName(String lineName) { + this.lineName = lineName; + } + + public String getLineName() { + return lineName; + } + + public void setUseMan(Long useMan) { + this.useMan = useMan; + } + + public Long getUseMan() { + return useMan; + } + + public void setEfficiency(BigDecimal efficiency) { + this.efficiency = efficiency; + } + + public BigDecimal getEfficiency() { + return efficiency; + } + + 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 setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public List getProcessList() { + return processList; + } + + public void setProcessList(List processList) { + this.processList = processList; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("lineCode", getLineCode()) + .append("lineName", getLineName()) + .append("useMan", getUseMan()) + .append("efficiency", getEfficiency()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLineProcess.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLineProcess.java new file mode 100644 index 00000000..7679fe84 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLineProcess.java @@ -0,0 +1,182 @@ +package com.op.mes.domain; + +import java.math.BigDecimal; +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; + +/** + * 线体管理对象 mes_line_process + * + * @author Open Platform + * @date 2024-04-07 + */ +public class MesLineProcess extends BaseEntity { +private static final long serialVersionUID=1L; + + /** id */ + private String id; + + /** 父级id */ + @Excel(name = "父级id") + private String belongTo; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String processCode; + + /** 工艺名称 */ + @Excel(name = "工艺名称") + private String processName; + + /** 数量 */ + @Excel(name = "数量") + private BigDecimal quality; + + /** 检验工具 */ + @Excel(name = "检验工具") + private String attr1; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr2; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String attr3; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + /** 所属线体编码 */ + @Excel(name = "所属线体编码") + private String lineCode; + + /** 所属线体名称 */ + @Excel(name = "所属线体名称") + private String lineName; + + public void setId(String id){ + this.id = id; + } + + public String getId(){ + return id; + } + public void setBelongTo(String belongTo){ + this.belongTo = belongTo; + } + + public String getBelongTo(){ + return belongTo; + } + public void setProcessCode(String processCode){ + this.processCode = processCode; + } + + public String getProcessCode(){ + return processCode; + } + public void setProcessName(String processName){ + this.processName = processName; + } + + public String getProcessName(){ + return processName; + } + public void setQuality(BigDecimal quality){ + this.quality = quality; + } + + public BigDecimal getQuality(){ + return quality; + } + 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 setAttr4(String attr4){ + this.attr4 = attr4; + } + + public String getAttr4(){ + return attr4; + } + public void setFactoryCode(String factoryCode){ + this.factoryCode = factoryCode; + } + + public String getFactoryCode(){ + return factoryCode; + } + public void setDelFlag(String delFlag){ + this.delFlag = delFlag; + } + + public String getDelFlag(){ + return delFlag; + } + public void setLineCode(String lineCode){ + this.lineCode = lineCode; + } + + public String getLineCode(){ + return lineCode; + } + public void setLineName(String lineName){ + this.lineName = lineName; + } + + public String getLineName(){ + return lineName; + } + +@Override +public String toString(){ + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id",getId()) + .append("belongTo",getBelongTo()) + .append("processCode",getProcessCode()) + .append("processName",getProcessName()) + .append("quality",getQuality()) + .append("attr1",getAttr1()) + .append("attr2",getAttr2()) + .append("attr3",getAttr3()) + .append("attr4",getAttr4()) + .append("createBy",getCreateBy()) + .append("createTime",getCreateTime()) + .append("updateBy",getUpdateBy()) + .append("updateTime",getUpdateTime()) + .append("factoryCode",getFactoryCode()) + .append("delFlag",getDelFlag()) + .append("lineCode",getLineCode()) + .append("lineName",getLineName()) + .toString(); + } + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java new file mode 100644 index 00000000..97da4096 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java @@ -0,0 +1,67 @@ +package com.op.mes.mapper; + +import java.util.List; + +import com.op.mes.domain.MesLine; +import org.apache.ibatis.annotations.Mapper; + +/** + * 线体管理Mapper接口 + * + * @author Open Platform + * @date 2024-04-02 + */ +@Mapper +public interface MesLineMapper { + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + public MesLine selectMesLineById(String id); + + /** + * 查询线体管理列表 + * + * @param mesLine 线体管理 + * @return 线体管理集合 + */ + public List selectMesLineList(MesLine mesLine); + + /** + * 新增线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + public int insertMesLine(MesLine mesLine); + + /** + * 修改线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + public int updateMesLine(MesLine mesLine); + + /** + * 删除线体管理 + * + * @param id 线体管理主键 + * @return 结果 + */ + public int deleteMesLineById(String id); + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesLineByIds(String[] ids); + /** + * 选择线体 + */ + public List selectLineBody(MesLine mesLine); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineProcessMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineProcessMapper.java new file mode 100644 index 00000000..74d67f63 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineProcessMapper.java @@ -0,0 +1,67 @@ +package com.op.mes.mapper; + +import java.util.List; + +import com.op.mes.domain.MesLineProcess; +import org.apache.ibatis.annotations.Mapper; + +/** + * 线体管理Mapper接口 + * + * @author Open Platform + * @date 2024-04-07 + */ +@Mapper +public interface MesLineProcessMapper { + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + public MesLineProcess selectMesLineProcessById(String id); + + public List selectMesLineProcessByBelongTo(String belongTo); + + /** + * 查询线体管理列表 + * + * @param mesLineProcess 线体管理 + * @return 线体管理集合 + */ + public List selectMesLineProcessList(MesLineProcess mesLineProcess); + + /** + * 新增线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + public int insertMesLineProcess(MesLineProcess mesLineProcess); + + /** + * 修改线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + public int updateMesLineProcess(MesLineProcess mesLineProcess); + + /** + * 删除线体管理 + * + * @param id 线体管理主键 + * @return 结果 + */ + public int deleteMesLineProcessById(String id); + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesLineProcessByIds(String[] ids); + + public int deleteMesLineProcessByBelongTo(String belongTo); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineProcessService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineProcessService.java new file mode 100644 index 00000000..9fc677f8 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineProcessService.java @@ -0,0 +1,64 @@ +package com.op.mes.service; + +import java.util.List; + +import com.op.mes.domain.MesLineProcess; + +/** + * 线体管理Service接口 + * + * @author Open Platform + * @date 2024-04-07 + */ +public interface IMesLineProcessService { + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + public MesLineProcess selectMesLineProcessById(String id); + public List selectMesLineProcessByBelongTo(String belongTo); + + /** + * 查询线体管理列表 + * + * @param mesLineProcess 线体管理 + * @return 线体管理集合 + */ + public List selectMesLineProcessList(MesLineProcess mesLineProcess); + + /** + * 新增线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + public int insertMesLineProcess(MesLineProcess mesLineProcess); + + /** + * 修改线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + public int updateMesLineProcess(MesLineProcess mesLineProcess); + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的线体管理主键集合 + * @return 结果 + */ + public int deleteMesLineProcessByIds(String[] ids); + + /** + * 删除线体管理信息 + * + * @param id 线体管理主键 + * @return 结果 + */ + public int deleteMesLineProcessById(String id); + + public int deleteMesLineProcessByBelongTo(String belongTo); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java new file mode 100644 index 00000000..7c8cd0fe --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java @@ -0,0 +1,66 @@ +package com.op.mes.service; + +import java.util.List; + +import com.op.mes.domain.MesLine; + +/** + * 线体管理Service接口 + * + * @author Open Platform + * @date 2024-04-02 + */ +public interface IMesLineService { + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + public MesLine selectMesLineById(String id); + + /** + * 查询线体管理列表 + * + * @param mesLine 线体管理 + * @return 线体管理集合 + */ + public List selectMesLineList(MesLine mesLine); + + /** + * 新增线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + public int insertMesLine(MesLine mesLine); + + /** + * 修改线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + public int updateMesLine(MesLine mesLine); + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的线体管理主键集合 + * @return 结果 + */ + public int deleteMesLineByIds(String[] ids); + + /** + * 删除线体管理信息 + * + * @param id 线体管理主键 + * @return 结果 + */ + public int deleteMesLineById(String id); + + /** + * 选择线体 + */ + public List selectLineBody(MesLine mesLine); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineProcessServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineProcessServiceImpl.java new file mode 100644 index 00000000..b6480efb --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineProcessServiceImpl.java @@ -0,0 +1,110 @@ +package com.op.mes.service.impl; + +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.mes.mapper.MesLineProcessMapper; +import com.op.mes.domain.MesLineProcess; +import com.op.mes.service.IMesLineProcessService; + +/** + * 线体管理Service业务层处理 + * + * @author Open Platform + * @date 2024-04-07 + */ +@Service +public class MesLineProcessServiceImpl implements IMesLineProcessService { + @Autowired + private MesLineProcessMapper mesLineProcessMapper; + + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + @Override + @DS("#header.poolName") + public MesLineProcess selectMesLineProcessById(String id) { + return mesLineProcessMapper.selectMesLineProcessById(id); + } + + @Override + public List selectMesLineProcessByBelongTo(String belongTo) { + return mesLineProcessMapper.selectMesLineProcessByBelongTo(belongTo); + } + + /** + * 查询线体管理列表 + * + * @param mesLineProcess 线体管理 + * @return 线体管理 + */ + @Override + @DS("#header.poolName") + public List selectMesLineProcessList(MesLineProcess mesLineProcess) { + return mesLineProcessMapper.selectMesLineProcessList(mesLineProcess); + } + + /** + * 新增线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertMesLineProcess(MesLineProcess mesLineProcess) { + mesLineProcess.setId(IdUtils.fastSimpleUUID()); + mesLineProcess.setCreateTime(DateUtils.getNowDate()); + mesLineProcess.setCreateBy(SecurityUtils.getUsername()); + return mesLineProcessMapper.insertMesLineProcess(mesLineProcess); + } + + /** + * 修改线体管理 + * + * @param mesLineProcess 线体管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateMesLineProcess(MesLineProcess mesLineProcess) { + mesLineProcess.setUpdateTime(DateUtils.getNowDate()); + return mesLineProcessMapper.updateMesLineProcess(mesLineProcess); + } + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的线体管理主键 + * @return 结果 + */ + @Override + public int deleteMesLineProcessByIds(String[] ids) { + return mesLineProcessMapper.deleteMesLineProcessByIds(ids); + } + + /** + * 删除线体管理信息 + * + * @param id 线体管理主键 + * @return 结果 + */ + @Override + public int deleteMesLineProcessById(String id) { + return mesLineProcessMapper.deleteMesLineProcessById(id); + } + + @Override + @DS("#header.poolName") + public int deleteMesLineProcessByBelongTo(String belongTo) { + return mesLineProcessMapper.deleteMesLineProcessByBelongTo(belongTo); + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java new file mode 100644 index 00000000..862e8220 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java @@ -0,0 +1,164 @@ +package com.op.mes.service.impl; + +import java.util.List; +import java.util.stream.Collectors; + +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.mes.domain.MesLineProcess; +import com.op.mes.service.IMesLineProcessService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.mes.mapper.MesLineMapper; +import com.op.mes.domain.MesLine; +import com.op.mes.service.IMesLineService; +import org.springframework.transaction.annotation.Propagation; +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; + +/** + * 线体管理Service业务层处理 + * + * @author Open Platform + * @date 2024-04-02 + */ +@Service +public class MesLineServiceImpl implements IMesLineService { + @Autowired + private MesLineMapper mesLineMapper; + + @Autowired + private IMesLineProcessService mesLineProcessService; + + /** + * 查询线体管理 + * + * @param id 线体管理主键 + * @return 线体管理 + */ + @Override + @DS("#header.poolName") + public MesLine selectMesLineById(String id) { + //查询时回显线体工艺数据 + List mesList = mesLineProcessService.selectMesLineProcessByBelongTo(id); + List processList = mesList.stream().map(MesLineProcess::getProcessName).collect(Collectors.toList()); + MesLine mesLine = mesLineMapper.selectMesLineById(id); + //设置线体数据 + if (!CollectionUtils.isEmpty(processList)) { + mesLine.setProcessList(processList); + } + return mesLine; + } + + /** + * 查询线体管理列表 + * + * @param mesLine 线体管理 + * @return 线体管理 + */ + @Override + @DS("#header.poolName") + public List selectMesLineList(MesLine mesLine) { + return mesLineMapper.selectMesLineList(mesLine); + } + + /** + * 新增线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertMesLine(MesLine mesLine) { + mesLine.setCreateTime(DateUtils.getNowDate()); + mesLine.setCreateBy(SecurityUtils.getUsername()); + mesLine.setId(IdUtils.fastSimpleUUID()); + // 获取工厂编码 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + mesLine.setFactoryCode(factoryCode); + return mesLineMapper.insertMesLine(mesLine); + } + + /** + * 修改线体管理 + * + * @param mesLine 线体管理 + * @return 结果 + */ + @Override + @DS("#header.poolName") + @Transactional(propagation = Propagation.REQUIRED) + public int updateMesLine(MesLine mesLine) { + mesLine.setUpdateTime(DateUtils.getNowDate()); + mesLine.setUpdateBy(SecurityUtils.getUsername()); + List processList = mesLine.getProcessList(); + int flag = 0; + if (!CollectionUtils.isEmpty(processList)) { + //删除旧的工艺项 + mesLineProcessService.deleteMesLineProcessByBelongTo(mesLine.getId()); + + String belongTo = mesLine.getId(); + String lineCode = mesLine.getLineCode(); + String lineName = mesLine.getLineName(); + // 获取工厂编码 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + + for (String processName : processList ) { + MesLineProcess mesLineProcess = new MesLineProcess(); + mesLineProcess.setBelongTo(belongTo); + mesLineProcess.setProcessName(processName); + mesLineProcess.setLineCode(lineCode); + mesLineProcess.setLineName(lineName); + mesLineProcess.setFactoryCode(factoryCode); + flag += mesLineProcessService.insertMesLineProcess(mesLineProcess); + } + }else { + return 0; + } + if (flag > 0){ + return mesLineMapper.updateMesLine(mesLine); + }else { + return 0; + } + } + + /** + * 批量删除线体管理 + * + * @param ids 需要删除的线体管理主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteMesLineByIds(String[] ids) { + return mesLineMapper.deleteMesLineByIds(ids); + } + + /** + * 删除线体管理信息 + * + * @param id 线体管理主键 + * @return 结果 + */ + @Override + public int deleteMesLineById(String id) { + return mesLineMapper.deleteMesLineById(id); + } + + @Override + @DS("#header.poolName") + public List selectLineBody(MesLine mesLine) { + return mesLineMapper.selectLineBody(mesLine); + } +} diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml new file mode 100644 index 00000000..4f75e67d --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, line_code, line_name, use_man, efficiency, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from mes_line + + + + + + + + insert into mes_line + + id, + line_code, + line_name, + use_man, + efficiency, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + factory_code, + del_flag, + + + #{id}, + #{lineCode}, + #{lineName}, + #{useMan}, + #{efficiency}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{factoryCode}, + #{delFlag}, + + + + + update mes_line + + line_code = #{lineCode}, + line_name = #{lineName}, + use_man = #{useMan}, + efficiency = #{efficiency}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + factory_code = #{factoryCode}, + del_flag =#{delFlag}, + + where id = #{id} + + + + update mes_line set del_flag = '1' where id = #{id} + + + + update mes_line set del_flag = '1' where id in + + #{id} + + + + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml new file mode 100644 index 00000000..ebda3ea3 --- /dev/null +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, belong_to, process_code, process_name, quality, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag, line_code, line_name from mes_line_process + + + + + + + + + insert into mes_line_process + + id, + + belong_to, + + process_code, + + process_name, + + quality, + + attr1, + + attr2, + + attr3, + + attr4, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + line_code, + + line_name, + + + + #{id}, + + #{belongTo}, + + #{processCode}, + + #{processName}, + + #{quality}, + + #{attr1}, + + #{attr2}, + + #{attr3}, + + #{attr4}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + #{lineCode}, + + #{lineName}, + + + + + + update mes_line_process + + belong_to = + #{belongTo}, + + process_code = + #{processCode}, + + process_name = + #{processName}, + + quality = + #{quality}, + + attr1 = + #{attr1}, + + attr2 = + #{attr2}, + + attr3 = + #{attr3}, + + attr4 = + #{attr4}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + line_code = + #{lineCode}, + + line_name = + #{lineName}, + + + where id = #{id} + + + + delete from mes_line_process where id = #{id} + + + + delete from mes_line_process where id in + + #{id} + + + + delete from mes_line_process where belong_to = #{belongTo} + + + From f2d0e12e62b920ea49376e7f014996c35dbd37b9 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 9 Apr 2024 16:42:17 +0800 Subject: [PATCH 04/21] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsRuturnPutEmbryoController.java | 99 +++++++++++++++++++ .../wms/mapper/WmsRuturnPutEmbryoMapper.java | 7 ++ .../op/wms/service/IWmsProductPutService.java | 2 + .../impl/WmsProductPutServiceImpl.java | 11 +++ .../mapper/wms/WmsRuturnPutEmbryoMapper.xml | 91 +++++++++++++++++ 5 files changed, 210 insertions(+) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRuturnPutEmbryoController.java diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRuturnPutEmbryoController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRuturnPutEmbryoController.java new file mode 100644 index 00000000..d57ef8de --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRuturnPutEmbryoController.java @@ -0,0 +1,99 @@ +package com.op.wms.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.op.wms.service.IWmsProductPutService; +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.wms.domain.WmsRuturnPutEmbryo; + +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 成品退货入库Controller + * + * @author Open Platform + * @date 2024-04-09 + */ +@RestController +@RequestMapping("/ruturn") +public class WmsRuturnPutEmbryoController extends BaseController { + @Autowired + private IWmsProductPutService wmsProductPutService; + +/** + * 查询成品退货入库列表 + */ +@RequiresPermissions("wms:ruturn:list") +@GetMapping("/list") + public TableDataInfo list(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { + startPage(); + List list = wmsProductPutService.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo); + return getDataTable(list); + } + +// /** +// * 导出成品退货入库列表 +// */ +// @RequiresPermissions("wms:ruturn:export") +// @Log(title = "成品退货入库", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { +// List list = wmsRuturnPutEmbryoService.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo); +// ExcelUtil util = new ExcelUtil(WmsRuturnPutEmbryo. class); +// util.exportExcel(response, list, "成品退货入库数据"); +// } +// +// /** +// * 获取成品退货入库详细信息 +// */ +// @RequiresPermissions("wms:ruturn:query") +// @GetMapping(value = "/{id}") +// public AjaxResult getInfo(@PathVariable("id") String id) { +// return success(wmsRuturnPutEmbryoService.selectWmsRuturnPutEmbryoById(id)); +// } +// +// /** +// * 新增成品退货入库 +// */ +// @RequiresPermissions("wms:ruturn:add") +// @Log(title = "成品退货入库", businessType = BusinessType.INSERT) +// @PostMapping +// public AjaxResult add(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { +// return toAjax(wmsRuturnPutEmbryoService.insertWmsRuturnPutEmbryo(wmsRuturnPutEmbryo)); +// } +// +// /** +// * 修改成品退货入库 +// */ +// @RequiresPermissions("wms:ruturn:edit") +// @Log(title = "成品退货入库", businessType = BusinessType.UPDATE) +// @PutMapping +// public AjaxResult edit(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { +// return toAjax(wmsRuturnPutEmbryoService.updateWmsRuturnPutEmbryo(wmsRuturnPutEmbryo)); +// } +// +// /** +// * 删除成品退货入库 +// */ +// @RequiresPermissions("wms:ruturn:remove") +// @Log(title = "成品退货入库", businessType = BusinessType.DELETE) +// @DeleteMapping("/{ids}") +// public AjaxResult remove(@PathVariable String[] ids) { +// return toAjax(wmsRuturnPutEmbryoService.deleteWmsRuturnPutEmbryoByIds(ids)); +// } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java index 022034ba..31f01906 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java @@ -14,4 +14,11 @@ public interface WmsRuturnPutEmbryoMapper { WmsRuturnPutEmbryo selectWmsRuturnPutEmbryoByid(WmsRuturnPutEmbryo wmsRuturnPutEmbryo1); void insertWmsRuturnPutEmbryoMapperRecords(WmsRuturnPutEmbryo wmsProductPutRecords); + /** + * 查询成品退货入库列表 + * + * @param wmsRuturnPutEmbryo 成品退货入库 + * @return 成品退货入库集合 + */ + public List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index f1fd022d..2cf511ed 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -126,4 +126,6 @@ public interface IWmsProductPutService { WmsFpStorageNewsSn palletScanning(WmsFpStorageNewsSn wmsFpStorageNewsSn); String palletTransferConfirmation(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); } 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 0c70f596..1313277f 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 @@ -1089,4 +1089,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } return result1; } + /** + * 查询成品退货入库列表 + * + * @param wmsRuturnPutEmbryo 成品退货入库 + * @return 成品退货入库 + */ + @Override + @DS("#header.poolName") + public List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { + return wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo); + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml index 93c536f8..f77bd2da 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml @@ -221,4 +221,95 @@ #{activeFlag}, + + + select id, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, speciFication as speciFication, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, attr1, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_ruturn_put_embryo + + + From 335363e99403ee5d963b1a4f189bb90d8eb8db38 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 9 Apr 2024 17:46:58 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BB=91=E5=AE=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/controller/QcUserMaterialController.java | 4 ++++ .../java/com/op/quality/mapper/QcUserMaterialMapper.java | 1 + .../com/op/quality/service/IQcUserMaterialService.java | 4 ++-- .../op/quality/service/impl/QcUserMaterialServiceImpl.java | 7 +++---- .../main/resources/mapper/quality/QcUserMaterialMapper.xml | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java index 235aff95..e0768f9b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java @@ -76,6 +76,10 @@ public class QcUserMaterialController extends BaseController { public AjaxResult getInfo(@PathVariable("userCode") String userCode) { return success(qcUserMaterialService.selectUserByUserCode(userCode)); } + @GetMapping("/getInfoById/{id}") + public AjaxResult getInfoById(@PathVariable("id") String id) { + return success(qcUserMaterialService.selectQcUserMaterialById(id)); + } /** * 新增人员物料绑定 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java index 9b1f8af8..d08d8dbe 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java @@ -34,6 +34,7 @@ public interface QcUserMaterialMapper { * @return 人员物料绑定 */ public QcUserMaterial selectUserByUserCode(String userCode); + public QcUserMaterial selectInfoById(String id); /** * 查询人员物料绑定列表 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java index f9895b2f..b2ae4f57 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java @@ -22,10 +22,10 @@ public interface IQcUserMaterialService { /** * 查询人员物料绑定 * - * @param userCode 人员物料绑定主键 + * @param id 人员物料绑定主键 * @return 人员物料绑定 */ - public QcUserMaterial selectQcUserMaterialById(String userCode); + public QcUserMaterial selectQcUserMaterialById(String id); /** * 查询人员物料绑定 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java index 461ae50d..c3555e05 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java @@ -40,13 +40,13 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { /** * 查询人员物料绑定 * - * @param userCode 人员物料绑定主键 + * @param id 人员物料绑定主键 * @return 人员物料绑定 */ @Override @DS("#header.poolName") - public QcUserMaterial selectQcUserMaterialById(String userCode) { - return qcUserMaterialMapper.selectQcUserMaterialById(userCode); + public QcUserMaterial selectQcUserMaterialById(String id) { + return qcUserMaterialMapper.selectQcUserMaterialById(id); } @Override @@ -54,7 +54,6 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { return qcUserMaterialMapper.selectUserByUserCode(userCode); } - /** * 查询人员物料绑定列表 * diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml index 7c223f4f..db38ecfa 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml @@ -114,7 +114,7 @@ From 800fe11ea5350579a4ef64e85f9bab0b3a23bba3 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 9 Apr 2024 18:49:59 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BB=91=E5=AE=9A=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/quality/domain/QcUserMaterial.java | 9 +++++++++ .../java/com/op/quality/mapper/QcUserMaterialMapper.java | 1 - .../quality/service/impl/QcUserMaterialServiceImpl.java | 4 ++-- .../resources/mapper/quality/QcUserMaterialMapper.xml | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java index 22db4118..c4bdb7e2 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java @@ -100,6 +100,7 @@ public class QcUserMaterial extends BaseEntity { private String[] userCodes; private String[] userNames; + private String[] attr1List; private String label; private String key; @@ -289,6 +290,14 @@ public class QcUserMaterial extends BaseEntity { this.deptName = deptName; } + public String[] getAttr1List() { + return attr1List; + } + + public void setAttr1List(String[] attr1List) { + this.attr1List = attr1List; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java index d08d8dbe..9b1f8af8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java @@ -34,7 +34,6 @@ public interface QcUserMaterialMapper { * @return 人员物料绑定 */ public QcUserMaterial selectUserByUserCode(String userCode); - public QcUserMaterial selectInfoById(String id); /** * 查询人员物料绑定列表 diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java index c3555e05..df2b4745 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java @@ -198,9 +198,9 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); String[] userCodes = qcUserMaterial.getUserCodes(); String[] userNames = qcUserMaterial.getUserNames(); + String[] attr1List = qcUserMaterial.getAttr1List(); String materialCode = qcUserMaterial.getMaterialCode(); String materialName = qcUserMaterial.getMaterialName(); - String attr1 = qcUserMaterial.getAttr1(); String user = SecurityUtils.getUsername(); //插入数据 for (int i = 0; i < userCodes.length; i++) { @@ -210,9 +210,9 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { qcUserMaterialDto.setCreateBy(user); qcUserMaterialDto.setUserCode(userCodes[i]); qcUserMaterialDto.setUserName(userNames[i]); + qcUserMaterialDto.setAttr1(attr1List[i]); qcUserMaterialDto.setMaterialCode(materialCode); qcUserMaterialDto.setMaterialName(materialName); - qcUserMaterialDto.setAttr1(attr1); qcUserMaterialDto.setFactoryCode(factoryCode); count += qcUserMaterialMapper.insertQcUserMaterial(qcUserMaterialDto); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml index db38ecfa..94549ab2 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml @@ -114,7 +114,7 @@ From dc2c77d18ac631ad81d1a53dba3578323d8c0a8e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 10 Apr 2024 11:23:20 +0800 Subject: [PATCH 07/21] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/plan/ProOrderWorkorderMapper.xml | 6 +++--- .../com/op/quality/mapper/QcCheckTaskIncomeMapper.java | 2 ++ .../service/impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../mapper/quality/QcCheckTaskIncomeMapper.xml | 10 ++++++++++ .../system/service/impl/SysDatasourceServiceImpl.java | 5 +++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index ef438b38..df8ce078 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -116,12 +116,12 @@ #{workorderName}, '%') and pow.order_id = #{orderId} - and pow.order_code like concat('%', #{orderCode}, '%') + and pow.workorder_code_sap like concat('%', #{orderCode}, '%') - and ppow.product_code like concat('%', #{productCode},'%') + and pow.product_code like concat('%', #{productCode},'%') - and ppow.product_name like concat('%', #{productName},'%') + and pow.product_name like concat('%', #{productName},'%') and pow.product_date = #{productDate} and pow.shift_id = #{shiftId} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index 36465d1c..cb0a3676 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -90,6 +90,8 @@ public interface QcCheckTaskIncomeMapper { List getUserByCheckType(String checkType); + List getCheckUser(QcCheckTaskIncome qcCheckTaskIncome); + int addCheckUsers(@Param("list") List users); int addQcCheckTaskDefects(@Param("list") List defects); 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 4ef7ca3f..ce575efd 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 @@ -220,7 +220,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTaskIncome.setCheckManName(""); qcCheckTaskIncome.setCheckManCode(""); /**qc_user_material取默认检查人**/ - List users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskIncome.getCheckType()); + List users = qcCheckTaskIncomeMapper.getCheckUser(qcCheckTaskIncome); if(CollectionUtils.isEmpty(users)){ QcUserMaterialDTO dto0 = new QcUserMaterialDTO(); dto0.setId(IdUtils.fastSimpleUUID()); 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 2cf55975..75b79be5 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 @@ -351,6 +351,16 @@ where material_code = #{checkType} and del_flag = '0' + + - and equipment_code like concat('%', - #{equipmentCode}, '%') - - and equipment_name like concat('%', - #{equipmentName}, '%') - + and equipment_code like concat('%',#{equipmentCode}, '%') + and equipment_name like concat('%',#{equipmentName}, '%') and equipment_brand = #{equipmentBrand} and equipment_spec = #{equipmentSpec} and equipment_type_id = #{equipmentTypeId} - and equipment_type_code like concat('%', - #{equipmentTypeCode}, '%') - - and equipment_type_name like concat('%', - #{equipmentTypeName}, '%') - + and equipment_type_code like concat('%',#{equipmentTypeCode}, '%') + and equipment_type_name like concat('%',#{equipmentTypeName}, '%') and workshop_id = #{workshopId} and workshop_code = #{workshopCode} - and workshop_name like concat('%', #{workshopName}, - '%') - + and workshop_name like concat('%', #{workshopName},'%') and status = #{status} and attr1 = #{attr1} and attr2 = #{attr2} and attr3 = #{attr3} and attr4 = #{attr4} - and unit_working_hours = - #{unitWorkingHours} - + and unit_working_hours = #{unitWorkingHours} and workshop_section = #{workshopSection} - and equipment_location = - #{equipmentLocation} - - and hourly_unit_price = #{hourlyUnitPrice} - + and equipment_location = #{equipmentLocation} + and hourly_unit_price = #{hourlyUnitPrice} and plc_ip = #{plcIp} and plc_port = #{plcPort} and equipment_head = #{equipmentHead} - and equipment_barcode = - #{equipmentBarcode} - - and equipment_barcode_image = - #{equipmentBarcodeImage} - + and equipment_barcode = #{equipmentBarcode} + and equipment_barcode_image = #{equipmentBarcodeImage} and manufacturer = #{manufacturer} and supplier = #{supplier} and use_life = #{useLife} and buy_time = #{buyTime} - and asset_original_value = - #{assetOriginalValue} - + and asset_original_value = #{assetOriginalValue} and net_asset_value = #{netAssetValue} and asset_head = #{assetHead} and fixed_asset_code = #{fixedAssetCode} @@ -242,20 +223,15 @@ and sap_asset = #{sapAsset} and factory_code = #{factoryCode} and equipment_status = #{equipmentStatus} - and equipment_category = - #{equipmentCategory} - - and asset_classification_name - = #{assetClassificationName} - - and asset_description = - #{assetDescription} - + and equipment_category = #{equipmentCategory} + and asset_classification_name = #{assetClassificationName} + and asset_description = #{assetDescription} and equipment_number = #{equipmentNumber} and inventory_number = #{inventoryNumber} and unit_measurement = #{unitMeasurement} and sap_code = #{sapCode} and sap_name = #{sapName} + and factory_workshop like concat('%', #{factoryWorkshop},'%') and del_flag ='0' @@ -325,6 +301,7 @@ unit_measurement, sap_code, sap_name, + factory_workshop, #{equipmentCode}, @@ -369,21 +346,21 @@ #{factoryCode}, #{equipmentStatus}, #{equipmentCategory}, - #{assetClassificationName}, - + #{assetClassificationName}, #{assetDescription}, #{equipmentNumber}, #{inventoryNumber}, #{unitMeasurement}, #{sapCode}, #{sapName}, + #{factoryWorkshop}, update base_equipment - equipment_code = #{equipmentCode}, + equipment_code = #{equipmentCode}, equipment_name = #{equipmentName}, equipment_brand = #{equipmentBrand}, equipment_spec = #{equipmentSpec}, @@ -403,15 +380,12 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, - unit_working_hours = #{unitWorkingHours}, - - workshop_section = #{workshopSection}, - equipment_location = - #{equipmentLocation}, - - hourly_unit_price = #{hourlyUnitPrice}, - plc_ip = #{plcIp}, - plc_port = #{plcPort}, + unit_working_hours = #{unitWorkingHours}, + workshop_section = #{workshopSection}, + equipment_location = #{equipmentLocation}, + hourly_unit_price = #{hourlyUnitPrice}, + plc_ip = #{plcIp}, + plc_port = #{plcPort}, equipment_barcode = #{equipmentBarcode}, equipment_barcode_image = #{equipmentBarcodeImage}, manufacturer = #{manufacturer}, @@ -428,16 +402,14 @@ factory_code = #{factoryCode}, equipment_status = #{equipmentStatus}, equipment_category = #{equipmentCategory}, - asset_classification_name = - #{assetClassificationName}, - - asset_description = #{assetDescription}, - - equipment_number = #{equipmentNumber}, - inventory_number = #{inventoryNumber}, - unit_measurement = #{unitMeasurement}, - sap_code = #{sapCode}, - sap_name = #{sapName}, + asset_classification_name = #{assetClassificationName}, + asset_description = #{assetDescription}, + equipment_number = #{equipmentNumber}, + inventory_number = #{inventoryNumber}, + unit_measurement = #{unitMeasurement}, + sap_code = #{sapCode}, + sap_name = #{sapName}, + factory_workshop = #{factoryWorkshop}, where equipment_id = #{equipmentId} From 514a1a7281e01a7aeb84672136ad876f09f358eb Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 10 Apr 2024 14:40:32 +0800 Subject: [PATCH 11/21] LJ88->LJ01 --- .../java/com/op/plan/service/impl/ProOrderServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 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 8baa1353..25dd78a5 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 @@ -303,7 +303,12 @@ public class ProOrderServiceImpl implements IProOrderService { workOrder.setProductName(productNameInfo.getProdDesc()); workOrder.setBelongWorkOrder(belongWorkOrder); - workOrder.setProdType(proOrder.getOrderType()); + if("LJ88".equals(proOrder.getOrderType())){ + workOrder.setProdType("LJ01"); + }else{ + workOrder.setProdType(proOrder.getOrderType()); + } + // 将工单信息更新至数据库/**pro_order_workorder**/ proOrderWorkorderMapper.insertProOrderWorkorder(workOrder); From 46028c63a5f109fccb7a9b757ac779a5815b8aa0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 11 Apr 2024 14:23:52 +0800 Subject: [PATCH 12/21] bug --- .../src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index df8ce078..fca2c89c 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -202,7 +202,7 @@ from pro_order_workorder pow left join pro_order po on pow.order_code = po.order_code where (pow.workorder_code = #{workorderId} or pow.workorder_id = #{workorderId}) - and pow.del_flag = '0' + and pow.del_flag = '0'and po.del_flag = '0' diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index 060784c5..fa4910b8 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -1,19 +1,22 @@ package com.op.open.controller; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; +import com.op.common.core.domain.R; import com.op.common.core.utils.StringUtils; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; +import com.op.common.datasource.creator.DynamicDatasourceCreator; import com.op.open.service.OpenService; -import com.op.system.api.RemoteQualityService; +import com.op.system.api.domain.DataSourcePropertyDTO; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.quality.QcCheckTaskProduceDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import java.util.List; +import javax.annotation.Resource; import java.util.Map; - +import com.op.common.core.utils.bean.BeanUtils; /** * mes上位机专属 * @@ -26,8 +29,10 @@ public class OpenController extends BaseController { @Autowired private OpenService openService; - - + @Resource + private DynamicDatasourceCreator dynamicDatasourceCreator; + @Resource + private DynamicRoutingDataSource dynamicRoutingDataSource; /** * 下一工序机台集合获取 * •接口描述：成型机码垛完、暂存区、WCS 请求 MES 获取目的地集合 @@ -185,4 +190,19 @@ public class OpenController extends BaseController { return openService.GetHrPostInfo(); } + @PostMapping("/addDatasource") + public R addDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicDatasourceCreator.createDynamicDataSource(dataSourceProperty); + return R.ok(); + } + + @PostMapping("/removeDatasource") + public R removeDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName()); + return R.ok(); + } } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index f4e5a02a..71ec4418 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -2,13 +2,8 @@ package com.op.open.service.impl; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.op.common.core.constant.Constants; -import com.op.common.core.context.SecurityContextHolder; -import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.utils.http.HttpUtils; @@ -17,43 +12,24 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.open.mapper.OpenMapper; import com.op.open.service.OpenService; -import com.op.system.api.RemoteSapService; -import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.device.DeviceRepairOrder; import com.op.system.api.domain.device.EquRepairOrderDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataDTO; -import com.op.system.api.domain.mes.MesReportWorkConsumeDTO; -import com.op.system.api.domain.mes.MesReportWorkDTO; -import com.op.system.api.domain.mes.ProOrderWorkorderDTO; import com.op.system.api.domain.mes.ProRfidProcessDetail; import com.op.system.api.domain.quality.*; -import com.op.system.api.domain.sap.SapCloseOrderQuery; -import com.op.system.api.domain.sap.SapRFW; import org.apache.commons.lang.StringUtils; -import org.apache.http.HttpResponse; +import java.time.LocalDateTime; +import java.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; import java.math.BigDecimal; -import java.net.HttpURLConnection; -import java.net.URL; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; @@ -327,6 +303,17 @@ public class OpenServiceImpl implements OpenService { public int insertQcCheckTaskProduce(QcCheckTaskProduceDTO qcCheckTaskProduce) { DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskProduce.getFactoryCode()); + + // 创建两个日期时间对象 +// LocalDateTime dateTime1 = LocalDateTime.of(2023, 1, 1, 10, 30); // 2023年1月1日 10:30 +// LocalDateTime dateTime2 = LocalDateTime.now(); // 2023年1月2日 11:45 +// // 计算分钟差 +// long minutesBetween = Duration.between(dateTime1, dateTime2).toMinutes(); +// if(minutesBetween<=1){ +// logger.info("++++++++++++检验任务1分钟内生成过，不再重复创建++++++++++++++"); +// return 0; +// } + qcCheckTaskProduce.setCreateTime(DateUtils.getNowDate()); String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java index 08a18768..2bc863f3 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java @@ -2,19 +2,20 @@ package com.op.plan.controller; import java.io.IOException; import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; + +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.op.common.core.utils.bean.BeanUtils; import java.util.List; +import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; - +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.op.common.core.domain.ExcelCol; import com.op.common.core.domain.R; -import com.op.common.core.utils.DateUtils; -import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.poi.ExcelMapUtil; -import com.op.common.security.utils.SecurityUtils; +import com.op.common.datasource.creator.DynamicDatasourceCreator; import com.op.plan.domain.dto.SplitOrderDTO; +import com.op.system.api.domain.DataSourcePropertyDTO; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -47,7 +48,11 @@ import org.springframework.web.multipart.MultipartFile; public class ProOrderController extends BaseController { @Autowired private IProOrderService proOrderService; + @Resource + private DynamicDatasourceCreator dynamicDatasourceCreator; + @Resource + private DynamicRoutingDataSource dynamicRoutingDataSource; /** * 通过订单Code查询级联订单信息并封装返回 * @@ -309,4 +314,19 @@ public class ProOrderController extends BaseController { return AjaxResult.error(); } } + @PostMapping("/addDatasource") + public R addDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicDatasourceCreator.createDynamicDataSource(dataSourceProperty); + return R.ok(); + } + + @PostMapping("/removeDatasource") + public R removeDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName()); + return R.ok(); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java index c952d900..abd919ba 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java @@ -9,26 +9,27 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.bean.BeanUtils; +import com.op.common.datasource.creator.DynamicDatasourceCreator; import com.op.common.security.utils.SecurityUtils; import com.op.quality.domain.*; -import com.op.system.api.RemoteOpenService; import com.op.system.api.RemoteSapService; import com.op.system.api.RemoteUserService; -import com.op.system.api.domain.SysRole; +import com.op.system.api.domain.DataSourcePropertyDTO; import com.op.system.api.domain.SysUser; -import com.op.system.api.domain.quality.HRInfo; import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO; -import com.op.system.api.domain.sap.SapSupplier; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; @@ -69,6 +70,10 @@ public class QcCheckTaskIncomeController extends BaseController { @Autowired private RemoteSapService remoteSapService; + @Resource + private DynamicDatasourceCreator dynamicDatasourceCreator; + @Resource + private DynamicRoutingDataSource dynamicRoutingDataSource; /** * 查询来料检验列表 */ @@ -451,4 +456,20 @@ public class QcCheckTaskIncomeController extends BaseController { List list = qcCheckTaskIncomeService.getCkeckProjectXJList(qcCheckTaskIncome); return getDataTable(list); } + @PostMapping("/addDatasource") + public R addDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicDatasourceCreator.createDynamicDataSource(dataSourceProperty); + return R.ok(); + } + + @PostMapping("/removeDatasource") + public R removeDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName()); + return R.ok(); + } + } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index 6306ecab..94251f85 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -1,8 +1,12 @@ package com.op.sap.controller; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; +import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.web.controller.BaseController; +import com.op.common.datasource.creator.DynamicDatasourceCreator; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.sap.domain.vo.*; @@ -10,6 +14,7 @@ import com.op.sap.mapper.SapBomMapper; import com.op.sap.service.*; import com.op.system.api.RemoteUserService; +import com.op.system.api.domain.DataSourcePropertyDTO; import com.op.system.api.domain.SysUser; import com.op.system.api.domain.sap.*; import com.op.system.api.domain.sap.SapCustom; @@ -20,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -60,6 +66,10 @@ public class SapController extends BaseController { @Autowired private SapWmsService sapWmsService; + @Resource + private DynamicDatasourceCreator dynamicDatasourceCreator; + @Resource + private DynamicRoutingDataSource dynamicRoutingDataSource; /**====================主数据相关===================================================================================*/ /** * 物料同步接口 @@ -521,5 +531,19 @@ public class SapController extends BaseController { public R incomingConversion(@RequestBody(required = false) Map mapList) { return sapItemSyncService.incomingConversion(mapList); } + @PostMapping("/addDatasource") + public R addDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicDatasourceCreator.createDynamicDataSource(dataSourceProperty); + return R.ok(); + } + @PostMapping("/removeDatasource") + public R removeDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName()); + return R.ok(); + } } diff --git a/op-modules/op-system/src/main/java/com/op/system/mapper/SysDatasourceMapper.java b/op-modules/op-system/src/main/java/com/op/system/mapper/SysDatasourceMapper.java index b2ac4385..c0fe1e05 100644 --- a/op-modules/op-system/src/main/java/com/op/system/mapper/SysDatasourceMapper.java +++ b/op-modules/op-system/src/main/java/com/op/system/mapper/SysDatasourceMapper.java @@ -76,4 +76,6 @@ public interface SysDatasourceMapper { List selectDBListByDept(SysDatasource qo); void deletUserDB(String userCode); + + void deleteUserByIds(String[] ids); } diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java index 4a2cfedc..429dd5fd 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java @@ -1,10 +1,14 @@ package com.op.system.service.impl; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; +import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.datasource.creator.DynamicDatasourceCreator; +import com.op.system.api.*; +import com.op.system.api.domain.DataSourcePropertyDTO; import com.op.system.api.domain.SysUser; import com.op.system.domain.SysDatasource; import com.op.system.mapper.SysDatasourceMapper; @@ -43,6 +47,24 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService { private String driver; @Resource private DynamicDatasourceCreator dynamicDatasourceCreator; + @Autowired + private RemoteQualityService remoteQualityService; + @Autowired + private RemotePlanService remotePlanService; + @Autowired + private RemoteMesService remoteMesService; + @Autowired + private RemoteWmsService remoteWmsService; + @Autowired + private RemoteDeviceService remoteDeviceService; + @Autowired + private RemoteOpenService remoteOpenService; + @Autowired + private RemoteSapService remoteSapService; + @Autowired + private RemoteTechnologyService remoteTechnologyService; + @Resource + private DynamicRoutingDataSource dynamicRoutingDataSource; /** * 查询工厂数据库 @@ -118,7 +140,32 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService { */ @Override public int deleteSysDatasourceByIds(String[] ids) { - return sysDatasourceMapper.deleteSysDatasourceByIds(ids); + + for(String id:ids){ + SysDatasource sysDatasource = sysDatasourceMapper.selectSysDatasourceById(id); + DataSourcePropertyDTO dataSourceProperty = new DataSourcePropertyDTO(); + dataSourceProperty.setPoolName(sysDatasource.getPoolName()); + dynamicRoutingDataSource.removeDataSource(sysDatasource.getPoolName()); +// //计划删除数据源 +// remotePlanService.removeDatasource(dataSourceProperty); + //质量删除数据源 + remoteQualityService.removeDatasource(dataSourceProperty); +// //mes删除数据源 +// remoteMesService.removeDatasource(dataSourceProperty); + //wms删除数据源 + remoteWmsService.removeDatasource(dataSourceProperty); +// //device删除数据源 +// remoteDeviceService.removeDatasource(dataSourceProperty); +// //open删除数据源 +// remoteOpenService.removeDatasource(dataSourceProperty); +// //sap删除数据源 +// remoteSapService.removeDatasource(dataSourceProperty); +// //工艺删除数据源 +// remoteTechnologyService.removeDatasource(dataSourceProperty); + } + sysDatasourceMapper.deleteSysDatasourceByIds(ids); + sysDatasourceMapper.deleteUserByIds(ids); + return 1; } /** @@ -217,6 +264,25 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService { dataSourceProperty.setLazy(false); dynamicDatasourceCreator.createDynamicDataSource(dataSourceProperty); + DataSourcePropertyDTO dto = new DataSourcePropertyDTO(); + BeanUtils.copyProperties(dataSourceProperty,dto); + //计划加入数据源 +// remotePlanService.addDatasource(dto); + //质量加入数据源 + remoteQualityService.addDatasource(dto); +// //mes加入数据源 +// remoteMesService.addDatasource(dto); + //wms加入数据源 + remoteWmsService.addDatasource(dto); +// //device加入数据源 +// remoteDeviceService.addDatasource(dto); +// //open加入数据源 +// remoteOpenService.addDatasource(dto); +// //sap加入数据源 +// remoteSapService.addDatasource(dto); +// //工艺加入数据源 +// remoteTechnologyService.addDatasource(dto); + return "数据库链接测试成功，数据库链接状态正常"; } catch (ClassNotFoundException | SQLException classNotFoundException) { return "数据库链接异常，请检查数据库基本信息。"; diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml index 558b903b..f076c8d6 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml @@ -193,4 +193,10 @@ delete from sys_user_datasource where user_id =#{userCode} + + delete from sys_user_datasource where datasource_id in + + #{id} + + diff --git a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java index c899cb77..c71154ba 100644 --- a/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java +++ b/op-modules/op-technology/src/main/java/com/op/technology/controller/ProRouteController.java @@ -1,18 +1,24 @@ package com.op.technology.controller; import java.util.List; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.op.common.core.domain.R; +import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.web.page.TableDataInfo; import com.op.common.core.web.controller.BaseController; +import com.op.common.datasource.creator.DynamicDatasourceCreator; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.common.security.annotation.RequiresPermissions; import com.op.system.api.RemoteSapService; +import com.op.system.api.domain.DataSourcePropertyDTO; import com.op.system.api.domain.sap.SapRouterQuery; import com.op.technology.domain.ProRoute; import com.op.technology.service.IProRouteProcessService; @@ -45,7 +51,10 @@ public class ProRouteController extends BaseController { @Autowired private RemoteSapService remoteSapService; - + @Resource + private DynamicDatasourceCreator dynamicDatasourceCreator; + @Resource + private DynamicRoutingDataSource dynamicRoutingDataSource; /** * 查询工艺路线列表 */ @@ -148,4 +157,20 @@ public class ProRouteController extends BaseController { } return AjaxResult.error("手动同步失败"); } + + @PostMapping("/addDatasource") + public R addDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicDatasourceCreator.createDynamicDataSource(dataSourceProperty); + return R.ok(); + } + + @PostMapping("/removeDatasource") + public R removeDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName()); + return R.ok(); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseAreaController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseAreaController.java index c0011ec5..465d03ed 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseAreaController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseAreaController.java @@ -1,8 +1,15 @@ package com.op.wms.controller; import java.util.List; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; +import com.op.common.core.domain.R; +import com.op.common.core.utils.bean.BeanUtils; +import com.op.common.datasource.creator.DynamicDatasourceCreator; +import com.op.system.api.domain.DataSourcePropertyDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,7 +40,10 @@ import com.op.common.core.web.page.TableDataInfo; public class BaseAreaController extends BaseController { @Autowired private IBaseAreaService baseAreaService; - + @Resource + private DynamicDatasourceCreator dynamicDatasourceCreator; + @Resource + private DynamicRoutingDataSource dynamicRoutingDataSource; /** * 查询库区列表 */ @@ -101,4 +111,20 @@ public class BaseAreaController extends BaseController { public AjaxResult remove(@PathVariable String[] areaIds) { return toAjax(baseAreaService.deleteBaseAreaByAreaIds(areaIds)); } + @PostMapping("/addDatasource") + public R addDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicDatasourceCreator.createDynamicDataSource(dataSourceProperty); + return R.ok(); + } + + @PostMapping("/removeDatasource") + public R removeDatasource(@RequestBody DataSourcePropertyDTO dto){ + DataSourceProperty dataSourceProperty = new DataSourceProperty(); + BeanUtils.copyProperties(dto,dataSourceProperty); + dynamicRoutingDataSource.removeDataSource(dataSourceProperty.getPoolName()); + return R.ok(); + } + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index 2f4b896e..d326c2be 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java @@ -348,7 +348,7 @@ public class BaseProduct extends BaseEntity { * 报工汇率 */ @Excel(name = "报工汇率") - private Integer reportRate; + private BigDecimal reportRate; public void setCategory(String category) { this.category = category; @@ -790,12 +790,12 @@ public class BaseProduct extends BaseEntity { return mtart; } - public void setReportRate(Integer reportRate) { - this.reportRate = reportRate; + public BigDecimal getReportRate() { + return reportRate; } - public Integer getReportRate() { - return reportRate; + public void setReportRate(BigDecimal reportRate) { + this.reportRate = reportRate; } @Override From 1706f6be9b71ab34c162b0ed8657a40c5ca87836 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 12 Apr 2024 14:42:27 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=99=E5=BD=93=E5=A4=A9=E5=92=8C=E6=98=A8?= =?UTF-8?q?=E5=A4=A9=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/quality/QcProCheckMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml index 65dd8aa2..d55b3279 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml @@ -275,6 +275,10 @@ and qct.check_type = #{checkType} and qctu.check_man_code = #{checkManCode} and qct.check_status in (${checkStatus}) + and ( + CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120) + or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120) + ) order by qct.create_time desc From 36bf1e057a1a9fa2608af9afebda849dd02bf0d0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 12 Apr 2024 15:47:03 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=87=8D=E5=A4=8D,bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/system/service/impl/SysUserServiceImpl.java | 6 +++--- .../src/main/resources/mapper/system/SysUserMapper.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java index 3475cd68..d483ecf3 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java @@ -592,14 +592,14 @@ public class SysUserServiceImpl implements ISysUserService { int n = 0; //sap返回的供应商编码 - List codes = dtos.stream().map(HRInfo::getUserCode).collect(Collectors.toList()); + List codes = dtos.stream().map(HRInfo::getUserName).collect(Collectors.toList()); //sap返回的工作中心编码-本地已存在 List exsitCodes = userMapper.getExsitCodes(codes); //sap返回的工作中心编码-本地不存在// 差集 (list2 - list1) List noExsitCodes = codes.stream().filter(item -> !exsitCodes.contains(item)).collect(Collectors.toList()); List updates = dtos.stream() - .filter(item -> exsitCodes.contains(item.getUserCode())) + .filter(item -> exsitCodes.contains(item.getUserName())) .collect(Collectors.toList()); if(!CollectionUtils.isEmpty(updates)){ @@ -621,7 +621,7 @@ public class SysUserServiceImpl implements ISysUserService { System.out.println("人员更新成功条数："+m); } List adds = dtos.stream() - .filter(item -> noExsitCodes.contains(item.getUserCode())) + .filter(item -> noExsitCodes.contains(item.getUserName())) .collect(Collectors.toList()); if(!CollectionUtils.isEmpty(adds)){ diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml index 0739a7b6..22d19da5 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -241,9 +241,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sex = #{item.sex}, del_flag = #{item.delFlag}, update_by = #{item.updateBy}, - update_time = #{updateTime} + update_time = #{item.updateTime} where - user_name = #{item.userCode} + user_name = #{item.userName} From e96450db0763479bd6078c207c28ab83df2b810e Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 12 Apr 2024 16:01:16 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml | 1 + 1 file changed, 1 insertion(+) 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 75b79be5..f639d3f0 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 @@ -172,6 +172,7 @@ left join pro_order_workorder pow on powb.workorder_id = pow.workorder_id where powb.del_flag = '0' and pow.del_flag = '0' and pow.workorder_code = #{workorderCode} + order by powb.batch_code + + + + and Site_code = #{siteCode} + + + and Order_Code = #{orderCode} + + + and Material_Code = #{materialCode} + + + and Material_Desc = #{materialDesc} + + + and Plan_Date = #{planDate} + + + and Loc_Number = #{locNumber} + + + and Unit = #{Unit} + + + and Reality_Number = #{realityNumber} + + + and Order_Status = #{orderStatus} + + + and User_Defined1 = #{userDefined1} + + + and Loc_Code = #{locCode} + + + and User_Defined2 = #{userDefined2} + + + and User_Defined3 = #{userDefined3} + + + and User_Defined4 = #{userDefined4} + + + and User_Defined5 = #{userDefined5} + + + and User_Defined6 = #{userDefined6} + + + and User_Defined7 = #{userDefined7} + + + and User_Defined8 = #{userDefined8} + + + and User_Defined9 = #{userDefined9} + + + and User_Defined10 = #{userDefined10} + + + and User_Defined11 = #{userDefined11} + + + and Remark = #{Remark} + + + and Create_By = #{createBy} + + + and Create_Date = #{createDate} + + + and Last_Update_By = #{lastUpdateBy} + + + and Last_Update_Date = #{lastUpdateDate} + + + and Active = #{Active} + + + and Enterprise_Id = #{enterpriseId} + + + and Enterprise_Code = #{enterpriseCode} + + + + + + + + insert into ods_product_embryo_inventory + + Site_code, + + ID, + + Order_Code, + + Material_Code, + + Material_Desc, + + Plan_Date, + + Loc_Number, + + Unit, + + Reality_Number, + + Order_Status, + + User_Defined1, + + Loc_Code, + + User_Defined2, + + User_Defined3, + + User_Defined4, + + User_Defined5, + + User_Defined6, + + User_Defined7, + + User_Defined8, + + User_Defined9, + + User_Defined10, + + User_Defined11, + + Remark, + + Create_By, + + Create_Date, + + Last_Update_By, + + Last_Update_Date, + + Active, + + Enterprise_Id, + + Enterprise_Code, + + + + #{siteCode}, + + #{ID}, + + #{orderCode}, + + #{materialCode}, + + #{materialDesc}, + + #{planDate}, + + #{locNumber}, + + #{Unit}, + + #{realityNumber}, + + #{orderStatus}, + + #{userDefined1}, + + #{locCode}, + + #{userDefined2}, + + #{userDefined3}, + + #{userDefined4}, + + #{userDefined5}, + + #{userDefined6}, + + #{userDefined7}, + + #{userDefined8}, + + #{userDefined9}, + + #{userDefined10}, + + #{userDefined11}, + + #{Remark}, + + #{createBy}, + + #{createDate}, + + #{lastUpdateBy}, + + #{lastUpdateDate}, + + #{Active}, + + #{enterpriseId}, + + #{enterpriseCode}, + + + + + + update ods_product_embryo_inventory + + Site_code = + #{siteCode}, + + Order_Code = + #{orderCode}, + + Material_Code = + #{materialCode}, + + Material_Desc = + #{materialDesc}, + + Plan_Date = + #{planDate}, + + Loc_Number = + #{locNumber}, + + Unit = + #{Unit}, + + Reality_Number = + #{realityNumber}, + + Order_Status = + #{orderStatus}, + + User_Defined1 = + #{userDefined1}, + + Loc_Code = + #{locCode}, + + User_Defined2 = + #{userDefined2}, + + User_Defined3 = + #{userDefined3}, + + User_Defined4 = + #{userDefined4}, + + User_Defined5 = + #{userDefined5}, + + User_Defined6 = + #{userDefined6}, + + User_Defined7 = + #{userDefined7}, + + User_Defined8 = + #{userDefined8}, + + User_Defined9 = + #{userDefined9}, + + User_Defined10 = + #{userDefined10}, + + User_Defined11 = + #{userDefined11}, + + Remark = + #{Remark}, + + Create_By = + #{createBy}, + + Create_Date = + #{createDate}, + + Last_Update_By = + #{lastUpdateBy}, + + Last_Update_Date = + #{lastUpdateDate}, + + Active = + #{Active}, + + Enterprise_Id = + #{enterpriseId}, + + Enterprise_Code = + #{enterpriseCode}, + + + where ID = #{ID} + + + + delete from ods_product_embryo_inventory where ID = #{ID} + + + + delete from ods_product_embryo_inventory where ID in + + #{ID} + + + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml index 9210d715..3d4aebe3 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml @@ -253,4 +253,8 @@ set user_defined2 = COALESCE(user_defined2, 0) + 1 where sn=#{sn} and active_flag='1' + +