From 747fc401c7a2b22bb9a05129940d990f14c4b57e Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 26 Nov 2025 16:17:07 +0800 Subject: [PATCH] =?UTF-8?q?2025-11-25=20=E9=A2=86=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=201=E3=80=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E5=BE=85=E7=A1=AE=E8=AE=A4=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=AD=9B=E9=80=89=E4=B8=AD=E4=B9=9F=E9=9C=80?= =?UTF-8?q?=E8=A6=81=20=20=201.1=20=E8=8D=89=E7=A8=BF=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=82=B9=E5=87=BB"=E6=8F=90=E4=BA=A4"=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E7=8A=B6=E6=80=81=E6=94=B9=E4=B8=BA=E5=BE=85=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=20=20=201.2=20=E5=BE=85=E7=A1=AE=E8=AE=A4=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=82=B9=E5=87=BB"=E4=B8=8B=E8=BE=BE"=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E7=8A=B6=E6=80=81=E6=94=B9=E4=B8=BA=E5=BE=85?= =?UTF-8?q?=E5=87=BA=E5=BA=93=202=E3=80=81=E4=B8=BB=E8=A1=A8SOIssueNotifyH?= =?UTF-8?q?eader=E5=A2=9E=E5=8A=A0=E8=BD=A6=E9=97=B4=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=88=B0work=5Fcenter=5Fno=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=B1=95=E7=A4=BA=E8=AF=A5=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB=203=E3=80=81=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=8E=92=E5=BA=8F=E6=8C=89=E7=85=A7=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E5=80=92=E6=8E=92desc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssureNotifyController.java | 11 +++++++++++ .../mapper/IssureNotifyMapper.java | 3 +++ .../service/IssureNotifyService.java | 3 +++ .../service/impl/IssureNotifyServiceImpl.java | 12 ++++++++++-- .../orderIssure/vo/SOIssueNotifyHeader.java | 11 +++++++++++ .../mapper/orderIssure/IssureNotifyMapper.xml | 19 ++++++++++++++----- 6 files changed, 52 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java b/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java index 1285433..81674fb 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java +++ b/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java @@ -3,7 +3,9 @@ package com.gaotao.modules.orderIssure.controller; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; +import com.gaotao.modules.app.entity.WorkCenter; import com.gaotao.modules.base.data.BuData; +import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.orderIssure.entity.*; import com.gaotao.modules.orderIssure.service.IssureNotifyService; import com.gaotao.modules.orderIssure.vo.EamWorkShop; @@ -374,4 +376,13 @@ public class IssureNotifyController { return R.ok().put("rows", list); } + /** + * 查加工中心 + */ + @PostMapping("/getWorkCenterList") + public R getWorkCenterList(@RequestBody BuData data){ + List list = issureNotifyService.getWorkCenterList(data); + return R.ok().put("rows", list); + } + } diff --git a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java index 35b8531..597b0e5 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java +++ b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.modules.base.data.BuData; +import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.orderIssure.entity.*; import com.gaotao.modules.orderIssure.vo.EamWorkShop; import com.gaotao.modules.orderIssure.vo.IssueNotifyChangeLog; @@ -184,4 +185,6 @@ public interface IssureNotifyMapper extends BaseMapper { List getBomAlternativeParts(BomAlternativePartsData data); void deleteNotifyMaterial2(SOIssueNotifyOrderMaterialListData data); + + List getWorkCenterList(BuData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java b/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java index 982e98e..3591d59 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java @@ -2,6 +2,7 @@ package com.gaotao.modules.orderIssure.service; import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.base.data.BuData; +import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.orderIssure.entity.*; import com.gaotao.modules.orderIssure.vo.EamWorkShop; import com.gaotao.modules.orderIssure.vo.IssueNotifyChangeLog; @@ -157,4 +158,6 @@ public interface IssureNotifyService { * @return 替代料列表 */ List getBomAlternativeParts(BomAlternativePartsData data); + + List getWorkCenterList(BuData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index 34b9155..e44857c 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -8,6 +8,7 @@ import com.gaotao.common.utils.BigDecimalUtils; import com.gaotao.common.utils.DateUtils; import com.gaotao.common.utils.PageUtils; import com.gaotao.modules.base.data.BuData; +import com.gaotao.modules.base.entity.WorkCenterData; import com.gaotao.modules.inboundNotification.entity.vo.InboundNotificationDetailVo; import com.gaotao.modules.orderIssure.entity.*; import com.gaotao.modules.orderIssure.mapper.IssureNotifyMapper; @@ -386,8 +387,6 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { /** * 获取用户 bu - * @param data - * @return */ @Override public List getSiteAndBuByUserName(BuData data) { @@ -395,6 +394,15 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { return list; } + /** + * 查加工中心 + */ + @Override + public List getWorkCenterList(BuData data) { + List list = issureNotifyMapper.getWorkCenterList(data); + return list; + } + @Override @Transactional public void saveIssueNoOrderDetail(SOIssueNotifyOrderListData data){ diff --git a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java index 31bc7a3..44b33f7 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java +++ b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java @@ -200,6 +200,17 @@ public class SOIssueNotifyHeader extends QueryPage implements Serializable { //@TableField(updateStrategy = FieldStrategy.IGNORED) private Date confirmDate; + @TableField("work_center_no") + private String workCenterNo; + + public String getConfirmStatus() { + return confirmStatus; + } + + public void setConfirmStatus(String confirmStatus) { + this.confirmStatus = confirmStatus; + } + public String getNotifyNo() { return notifyNo; } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 128966a..83606e7 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -13,12 +13,11 @@ insert into SOIssueNotifyHeader (NotifyNo,Site,NotifyDate,UserName,EnteredDate,Receiver,DepartmentID,Remark,CreditFlag,IssueFlag,IssueResult,PlanIssueDate, -RealIssueDate,Status,HaveIssueRecordFlag,CalcFlag,NeedApproveFlag,ApprovedFlag,Approver,ApproveDate,WarehouseID, -RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) + RealIssueDate,Status,HaveIssueRecordFlag,CalcFlag,NeedApproveFlag,ApprovedFlag,Approver,ApproveDate,WarehouseID, + RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu, work_center_no) values(#{notifyNo},#{site},#{notifyDate},#{userName},#{enteredDate},#{receiver},#{departmentID},#{remark},#{creditFlag},#{issueFlag},#{issueResult},#{planIssueDate}, #{realIssueDate},#{status},#{haveIssueRecordFlag},#{calcFlag},#{needApproveFlag},#{approvedFlag},#{approver},#{approveDate},#{warehouseID}, - #{recordVersion},#{outWorkOrderFlag},#{projectID},#{orderType},#{authRuleID},#{bu} - ) + #{recordVersion},#{outWorkOrderFlag},#{projectID},#{orderType},#{authRuleID},#{bu}, #{workCenterNo}) update SOIssueNotifyHeader set bu=#{bu} where site=#{site} and NotifyNo=#{notifyNo} @@ -292,7 +291,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) ${query.sql} - order by a.NotifyNo + order by a.NotifyNo desc + + \ No newline at end of file