From 5856609c632c34408004feaa5c39c8807afdf7ff Mon Sep 17 00:00:00 2001 From: shaoyong Date: Mon, 25 Mar 2024 16:57:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QcUserMaterialController.java | 37 +++++++++++++++ .../com/op/quality/domain/QcUserMaterial.java | 9 ++++ .../quality/mapper/QcUserMaterialMapper.java | 4 ++ .../service/IQcUserMaterialService.java | 7 +++ .../impl/QcUserMaterialServiceImpl.java | 46 +++++++++++++++++++ .../mapper/quality/QcUserMaterialMapper.xml | 37 ++++++++++----- 6 files changed, 128 insertions(+), 12 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 398c3e8d0..c0756d8ed 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 @@ -3,6 +3,7 @@ package com.op.quality.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.quality.domain.QcMarketFeedback; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -125,4 +126,40 @@ public class QcUserMaterialController extends BaseController { List list = qcUserMaterialService.getRightList(qcUserMaterial); return getDataTable(list); } + /** + * 查询人员绑定信息 + * @param qcUserMaterial + * @return + */ + @GetMapping(value = "/getSelectedUsers") + public TableDataInfo getSelectedUsers(QcUserMaterial qcUserMaterial) { + startPage(); + List list = qcUserMaterialService.getSelectedUsers(qcUserMaterial); + return getDataTable(list); + } + + /** + * 添加人员绑定信息 + * @param qcUserMaterial + * @return + */ + @PostMapping("/addUserBind") + public AjaxResult addUserBind(@RequestBody QcUserMaterial qcUserMaterial) { + return toAjax(qcUserMaterialService.addUserBind(qcUserMaterial)); + } + + /** + * 删除人员绑定信息 + * @param qcUserMaterial + * @return + */ + @DeleteMapping("/deleteByMaterialCode") + public AjaxResult deleteByMaterialCode(@RequestBody QcUserMaterial qcUserMaterial) { + int i = qcUserMaterialService.deleteByMaterialCode(qcUserMaterial); + return toAjax(i); + } + + + + } 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 77b4995c0..22db41187 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 @@ -32,6 +32,7 @@ public class QcUserMaterial extends BaseEntity { */ @Excel(name = "员工名称") private String userName; + private String deptName; /** * 物料编码 @@ -280,6 +281,14 @@ public class QcUserMaterial extends BaseEntity { this.userNames = userNames; } + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + @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 0aa4fe480..9b1f8af8b 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 @@ -78,4 +78,8 @@ public interface QcUserMaterialMapper { public List getUserMaterialListUndo(QcUserMaterial qcUserMaterial); public List getUserMaterialListDo(QcUserMaterial qcUserMaterial); + + public List getSelectedUsers(QcUserMaterial qcUserMaterial); + + public int deleteByMaterialCode(QcUserMaterial qcUserMaterial); } 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 d30424e6d..f9895b2f2 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 @@ -77,5 +77,12 @@ public interface IQcUserMaterialService { */ public int deleteQcUserMaterialByUserCode(QcUserMaterial qcUserMaterial); + public int deleteByMaterialCode(QcUserMaterial qcUserMaterial); + public List getRightList(QcUserMaterial qcUserMaterial); + + public List getSelectedUsers(QcUserMaterial qcUserMaterial); + + public int addUserBind(QcUserMaterial qcUserMaterial); + } 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 6a57c31df..cd499ab83 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 @@ -150,6 +150,12 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { return qcUserMaterialMapper.deleteQcUserMaterialByUserCode(qcUserMaterial); } + @Override + @DS("#header.poolName") + public int deleteByMaterialCode(QcUserMaterial qcUserMaterial) { + return qcUserMaterialMapper.deleteByMaterialCode(qcUserMaterial); + } + @Override @DS("#header.poolName") public List getList(QcUserMaterial qcUserMaterial) { @@ -174,4 +180,44 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { }); return selected; } + + @Override + @DS("#header.poolName") + public List getSelectedUsers(QcUserMaterial qcUserMaterial) { + return qcUserMaterialMapper.getSelectedUsers(qcUserMaterial); + } + + @Override + @DS("#header.poolName") + public int addUserBind(QcUserMaterial qcUserMaterial) { + int count = 0; + if (qcUserMaterial.getMaterialCode() != null) { + QcUserMaterial qcUserMaterialDto = null; + Date now = DateUtils.getNowDate(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); + String[] userCodes = qcUserMaterial.getUserCodes(); + String[] userNames = qcUserMaterial.getUserNames(); + String materialCode = qcUserMaterial.getMaterialCode(); + String materialName = qcUserMaterial.getMaterialName(); + String user = SecurityUtils.getUsername(); + //插入数据 + for (int i = 0; i < userCodes.length; i++) { + qcUserMaterialDto = new QcUserMaterial(); + qcUserMaterialDto.setId(IdUtils.fastSimpleUUID()); + qcUserMaterialDto.setCreateTime(now); + qcUserMaterialDto.setCreateBy(user); + qcUserMaterialDto.setUserCode(userCodes[i]); + qcUserMaterialDto.setUserName(userNames[i]); + qcUserMaterialDto.setMaterialCode(materialCode); + qcUserMaterialDto.setMaterialName(materialName); + qcUserMaterialDto.setFactoryCode(factoryCode); + count += qcUserMaterialMapper.insertQcUserMaterial(qcUserMaterialDto); + } + + } + return count; + + } } 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 e549f9c2c..194a2bbe5 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 @@ -30,17 +30,21 @@ - + insert into qc_user_material @@ -177,4 +185,9 @@ #{userCode} + + + delete from qc_user_material where user_code = #{userCode} and material_code = #{materialCode} + + From 10c0a7c13058abb774cd81e8ef08f30558dd2be6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 25 Mar 2024 17:29:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0remark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/mes/domain/MesReportWork.java | 1 + .../op/mes/service/impl/IWCInterfaceServiceImpl.java | 1 + .../mes/service/impl/MesReportWorkServiceImpl.java | 2 ++ .../resources/mapper/mes/MesReportWorkMapper.xml | 12 ++++++++---- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index f87cb2e99..468fe2f53 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -209,6 +209,7 @@ public class MesReportWork extends BaseEntity { //版本 private String version; private String sapCode; + private String remark; public String getSapCode() { return sapCode; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 09383f65e..6ebf93769 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -471,6 +471,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } sapRFW.setLt_hwList(lt_hwList); sapRFW.setAnzma(workOrder.getSapCode());//产线编号 + sapRFW.setRemark(workOrder.getRemark());//产线编号 logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求：" + JSONObject.toJSONString(sapRFW)); R r = remoteSapService.sapRFWOrder(sapRFW); logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果：" + r.getCode() + "," + r.getData() + "," + r.getMsg()); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index 803dc3590..defff4bf4 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -173,6 +173,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { mesReportWork.setParentOrder("0"); List liblist0 = mesReportWorkMapper.getReportList(mesReportWork); pTabs.setLibList(liblist0); + pTabs.setRemark(liblist0.get(0).getRemark()); tabs.add(pTabs); ProOrderWorkorder sonWorkOrder = mesReportWorkMapper.getSonWorkOrder(mesReportWork.getWorkorderCode()); @@ -185,6 +186,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { mesReportWork.setWorkorderCode(sonWorkOrder.getParentOrder()); List liblist = mesReportWorkMapper.getReportList(mesReportWork); sTabs.setLibList(liblist); + sTabs.setRemark(liblist.get(0).getRemark()); tabs.add(sTabs); sonWorkOrder = mesReportWorkMapper.getSonWorkOrder(sonWorkOrder.getWorkorderCode()); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 2541a16dd..31a3c187f 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -538,7 +538,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.work_time workTime, mrw.use_man useMan, mrw.create_time createTime, - pow.workorder_code_sap workorderCodeSap + pow.workorder_code_sap workorderCodeSap, + mrw.remark from mes_report_work mrw left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code where mrw.del_flag='0' and pow.del_flag = '0' @@ -575,6 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.product_name productName, mrw.sac1, mrw.sac2, + mrw.remark, equ.sap_code sapCode from ( select @@ -583,12 +585,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sum(work_time) sac1, sum(work_time*use_man) sac2, product_code, - product_name + product_name, + remark from mes_report_work where upload_status != #{uploadStatus} and prod_type = #{prodType} and workorder_code = #{workorderCode} - group by workorder_code,product_code,product_name + group by workorder_code,product_code,product_name,remark ) mrw left join pro_order_workorder ow on mrw.workorder_code = ow.workorder_code left join base_equipment equ on equ.equipment_code = ow.workorder_name @@ -865,7 +868,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" work_time = #{item.workTime}, use_man = #{item.useMan}, update_by = #{item.updateBy}, - update_time = #{item.updateTime} + update_time = #{item.updateTime}, + remark = #{item.remark} where id = #{item.id} From e0be502d8f89fe47ca5ba0c167f0c5a13b67b5e8 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 26 Mar 2024 09:16:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/controller/QcUserMaterialController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c0756d8ed..235aff955 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 @@ -3,7 +3,7 @@ package com.op.quality.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.op.quality.domain.QcMarketFeedback; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; From fc21de5529e8a2602e3d8d27aa2a5096dd5c25d4 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 26 Mar 2024 10:51:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8D=9F=E8=80=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=EF=BC=8C=E7=B2=BE=E7=A1=AE?= =?UTF-8?q?=E5=88=B0=E5=8D=8A=E6=88=90=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/mes/MesReportWorkConsumeMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 77d9b0a24..d9862ceff 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -93,6 +93,9 @@ where workorder_code = #{parentOrder} or parent_order = #{parentOrder} and del_flag='0' ) + + and bp.product_code like '00000004%' +