From 181a39e9f4c91d05dc7b16030764d61f87fba9b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Wed, 27 Aug 2025 16:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/service/Impl/BaseServiceImpl.java | 12 ++++++------ .../modules/sys/controller/SysMenuController.java | 2 +- .../resources/mapper/schedule/ScheduleMapper.xml | 3 +-- .../resources/mapper/schedule/SchedulingMapper.xml | 5 +++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java index 74665da..013e223 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java @@ -1560,12 +1560,12 @@ public class BaseServiceImpl implements BaseService { responseData.setCode("500"); return responseData; } - String partTypeDb = partR1.get(0).getPartTypeDb(); - if ((!"F".equals(partTypeDb)) && (!"W".equals(partTypeDb)) && (!"T".equals(partTypeDb))) { - responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200062)); - responseData.setCode("500"); - return responseData; - } + // String partTypeDb = partR1.get(0).getPartTypeDb(); + // if ((!"F".equals(partTypeDb)) && (!"W".equals(partTypeDb)) && (!"T".equals(partTypeDb))) { + // responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200062)); + // responseData.setCode("500"); + // return responseData; + // } //如果新老物料号不同，那么需要判断新的物料是否是虚拟件 if ((!inData.getPartNo().equals(inData.getPartNo1())) && "Y".equals(inData.getRepairFlag1()) && "V".equals(partR1.get(0).getmRPCode())) { responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200063)); diff --git a/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java b/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java index 73a06ad..464cc16 100644 --- a/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java +++ b/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java @@ -46,7 +46,7 @@ public class SysMenuController extends AbstractController { } /** - * 所有菜单列表 + * 所有菜单列表R */ @GetMapping("/list") @RequiresPermissions("sys:menu:list") diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 24feeda..9f1b446 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -110,8 +110,7 @@ Left Join SORouting as S1 On T.Site=S1.Site and T.OrderNo=S1.OrderNo and T.PreItemNo=S1.ItemNo Left Join SORouting as S2 On T.Site=S2.Site and T.OrderNo=S2.OrderNo and T.NextItemNo=S2.ItemNo - Round(T.QtyScheduled,3) round(T.QtyRequired,3) and T.ClosedFlag = 'N' AND T.WorkCenterNo - ]]> 'FQC' + Round(T.QtyScheduled,3) round(T.QtyRequired,3) and T.ClosedFlag = 'N' and T.site in (Select Site from AccessSite where upper(UserID)=#{username}) diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index 771a80c..b1e3820 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -419,10 +419,11 @@ SELECT sfr.RollNo rollNo, CONVERT(VARCHAR(19), sfr.CreatedDate, 120) createdDate, dbo.Get_OperatorDesc(sfr.Site, sfr.Createdby) createdBy, sfr.CreatedOpsItemNo itemNo, dbo.Get_SOOpsDescription(sfr.Site, sfr.OrderNo, sfr.CreatedOpsItemNo) itemDesc, dbo.Get_SORouting_NextOperationDesc(sfr.Site,sfr.OrderNo,sfr.CreatedOpsItemNo) nextItemDesc, sfr.RollQty rollQty, so.PartNo partNo, - dbo.Get_Part_DescSpec(so.Site,so.PartNo) partDesc, pt.Remark customerPartNo, pt.ConfigurationTemplateID customerName, oi.U_UL ul, + dbo.Get_Part_DescSpec(so.Site,so.PartNo) partDesc, pt.Remark customerPartNo, pt.ConfigurationTemplateID customerName,'系统数据' ul, + pt.DefaultLocationID locationId, st.SiteName siteName FROM SFDC_Rolls sfr, ShopOrder so, Part pt - LEFT JOIN dbo.view_sap_oitm oi ON oi.ItemCode = pt.PartNo + LEFT JOIN Site st ON st.SiteID = pt.Site AND sfr.Site = so.Site AND sfr.OrderNo = so.OrderNo