From f9ff55a8b66ceda8411f2cc47e21d3de0b966949 Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期五, 24 一月 2025 17:32:40 +0800
Subject: [PATCH] 分单尚未测试
---
JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml | 9 +++++----
JavaSource/com/mandi/fendan/mapper/xmls/Fd_GbxstdMapper.xml | 6 +++---
JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java | 3 ++-
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 9 ++++++---
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/mapper/xmls/Fd_GbxstdMapper.xml b/JavaSource/com/mandi/fendan/mapper/xmls/Fd_GbxstdMapper.xml
index a210155..cc4ec09 100644
--- a/JavaSource/com/mandi/fendan/mapper/xmls/Fd_GbxstdMapper.xml
+++ b/JavaSource/com/mandi/fendan/mapper/xmls/Fd_GbxstdMapper.xml
@@ -5,12 +5,12 @@
select count(1) from gbxstd_view a
<where>
<if test="companyNo !=null and companyNo !=''">
- EXISTS ( SELECT 1 from fd_company_ywdy b where a.td_ywdybh=b.ywdyNo and b.companyNo=#{companyNo} )
+ EXISTS ( SELECT 1 from fd_company_ywdy b where a.td_cqNo=b.ywdyNo and b.companyNo=#{companyNo} )
<choose>
<when test="ztbz==0">
and EXISTS (SELECT 1 from fd_wlgs_fhdq b
LEFT JOIN nc_dq c on b.fhdqNo=c.code
- where c.code=a.td_shddbh and b.wlgsNo=#{companyNo} AND a.td_ztbz!='鑷彁'
+ where c.code=a.td_shddbh and b.wlgsNo=#{companyNo} AND a.td_ztbz!='鑷彁'
<!-- <if test='cqV >= 0'>
<choose>
<when test="cqV==0">
@@ -76,7 +76,7 @@
as rownumber,a.* from gbxstd_view a
<where>
<if test="companyNo !=null and companyNo !=''">
- EXISTS ( SELECT 1 from fd_company_ywdy b where a.td_ywdybh=b.ywdyNo and b.companyNo=#{companyNo} )
+ EXISTS ( SELECT 1 from fd_company_ywdy b where a.td_cqNo=b.ywdyNo and b.companyNo=#{companyNo} )
<choose>
<when test="ztbz==0">
and EXISTS (SELECT 1 from fd_wlgs_fhdq b LEFT JOIN nc_dq c on b.fhdqNo=c.code where c.code=a.td_shddbh and b.wlgsNo=#{companyNo} AND a.td_ztbz!='鑷彁'
diff --git a/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml b/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
index 1af2336..1cc04bf 100644
--- a/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
+++ b/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
@@ -4,7 +4,8 @@
<sql id="column">
a.td_bmbh,a.td_bmmc,a.td_bz,a.td_djrq,a.td_fpbh, a.td_jylx, a.td_khbh,a.td_cqNo,a.committime,
CASE WHEN a.td_fpbh IS NULL THEN b.name WHEN a.td_fpbh= '' THEN b.name
- WHEN a.td_ywdybh= '101' THEN '娌冲崡鎶ュ叧' WHEN a.td_ywdybh= '102' THEN '閮戝窞鎶ュ叧' WHEN a.td_ywdybh= '111' THEN '鏄庢櫉鎶ュ叧' WHEN a.td_ywdybh= '114' THEN '涔夌憺鎶ュ叧' ELSE '绉戞妧鎶ュ叧'
+<!-- WHEN a.td_ywdybh= '101' THEN '娌冲崡鎶ュ叧' WHEN a.td_ywdybh= '102' THEN '閮戝窞鎶ュ叧' WHEN a.td_ywdybh= '111' THEN '鏄庢櫉鎶ュ叧' WHEN a.td_ywdybh= '114' THEN '涔夌憺鎶ュ叧' ELSE '绉戞妧鎶ュ叧'-->
+ WHEN a.td_cqNo= '101' THEN '娌冲崡鎶ュ叧' WHEN a.td_ywdybh= '102' THEN '閮戝窞鎶ュ叧' WHEN a.td_ywdybh= '111' THEN '鏄庢櫉鎶ュ叧' WHEN a.td_ywdybh= '114' THEN '涔夌憺鎶ュ叧' ELSE '绉戞妧鎶ュ叧'
END td_khmc,
a.td_shddbh,
c.name as td_shdd,
@@ -171,7 +172,7 @@
<include refid="column"/> from fd_xstd a
LEFT JOIN dbo.company b ON a.td_khbh= b.companyNo
LEFT JOIN dbo.nc_dq c ON a.td_shddbh= c.code
- LEFT JOIN dbo.nc_ywdy d ON a.td_ywdybh= d.code
+ LEFT JOIN dbo.nc_ywdy d ON a.td_cqNo=d.code <!--a.td_ywdybh= d.code-->
left join dbo.nc_dq e on a.td_shddbh = e.code
<where>
NOT EXISTS ( SELECT 1 FROM dbo.fd_gbxstd g WHERE a.td_tdbh= g.xstdNo )
@@ -191,8 +192,8 @@
select count(*) from fd_xstd a
LEFT JOIN dbo.company b ON a.td_khbh= b.companyNo
LEFT JOIN dbo.nc_dq c ON a.td_shddbh= c.code
- LEFT JOIN dbo.nc_ywdy d ON a.td_ywdybh= d.code
- left join dbo.nc_dq e on a.td_shddbh = e.code
+ LEFT JOIN dbo.nc_ywdy d ON a.td_cqNo= d.code <!--a.td_ywdybh= d.code-->
+ left join dbo.nc_dq e on a.td_shddbh= e.code
<where>
NOT EXISTS ( SELECT 1 FROM dbo.fd_gbxstd g WHERE a.td_tdbh= g.xstdNo )
<include refid="condition"/>
diff --git a/JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java b/JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java
index a7eb5c0..0eb57b8 100644
--- a/JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java
+++ b/JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java
@@ -163,7 +163,8 @@
return orr;
}
}else{
- Rcompany = ConvertTool.covertToCustoms(xstd.getTd_ywdybh());
+// Rcompany = ConvertTool.covertToCustoms(xstd.getTd_ywdybh());
+ Rcompany = ConvertTool.covertToCustoms(xstd.getTd_cqNo());
}
List<Fd_XSTD> tdl= new ArrayList<Fd_XSTD>();
diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index 83f1a1f..8c68758 100644
--- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
@@ -563,11 +563,13 @@
bsi.setRecompany(wx.getTdmx_shdw());
}else{
bsi.setRecompany(
- ConvertTool.covertToCustoms(xstd.getTd_ywdybh())
+// ConvertTool.covertToCustoms(xstd.getTd_ywdybh())
+ ConvertTool.covertToCustoms(xstd.getTd_cqNo())
);
}
bsi.setReID("");
- bsi.setDecompany(ConvertTool.ncCovertToFactoryName(xstd.getTd_ywdybh()));
+// bsi.setDecompany(ConvertTool.ncCovertToFactoryName(xstd.getTd_ywdybh()));
+ bsi.setDecompany(ConvertTool.ncCovertToFactoryName(xstd.getTd_cqNo()));
bsi.setDeID("");
bsi.setFrombatch("ERP绯荤粺");
bsi.setForshowindx(1);
@@ -1170,7 +1172,8 @@
Nckh nckh = zsjper.getNckhbyCode(fd_xstd.getTd_khbh());// 瀹㈡埛涓嶅瓨鍦ㄧ殑鐗规畩鎯呭喌鏄笉搴旇瀛樺湪鐨勶紝浠ラ槻涓囦竴锛屽姞鍒ょ┖銆�
tdm.put("td_khmc",nckh!=null?nckh.getName():"");
}else {
- String name = ConvertTool.covertToCustoms(fd_xstd.getTd_ywdybh());
+// String name = ConvertTool.covertToCustoms(fd_xstd.getTd_ywdybh());
+ String name = ConvertTool.covertToCustoms(fd_xstd.getTd_cqNo());
tdm.put("td_khmc", name);
}
tdm.put("td_bz",fd_xstd.getTd_bz());
--
Gitblit v1.9.3