From 973032dc914e84cec5ab18c4c23784a77599b2bc Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期五, 17 一月 2025 16:53:48 +0800
Subject: [PATCH] Revert "CRM>分单系统销售退货单同步"
---
JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java b/JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java
index c9a715c..a7eb5c0 100644
--- a/JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java
+++ b/JavaSource/com/mandi/fendan/service/impl/Fd_BsheetService.java
@@ -133,15 +133,6 @@
orr.setErrmsg("璇ユ彁鍗曞凡缁忓垎鍗曞畬鎴愶紝涓嶈兘鍒嗗崟锛�");
return orr;
}
- // 鍒ゆ柇鏄惁瀛樺湪瀹㈡埛
- if(StringUtils.isBlank(xstd.getTd_fpbh())){
- Nckh nckh = zsjper.getNckhbyCode(xstd.getTd_khbh());// 瀹㈡埛涓嶅瓨鍦ㄧ殑鐗规畩鎯呭喌鏄笉搴旇瀛樺湪鐨勶紝浠ラ槻涓囦竴锛屽姞鍒ょ┖銆�
- if(nckh == null) {
- orr.setCode(1);
- orr.setErrmsg("璇ユ彁鍗曞鎴蜂笉瀛樺湪锛岃妫�鏌ユ暟鎹紒");
- return orr;
- }
- }
//閫佽揣
if(xstd.getTd_ztbz()==2){
if(fdc!=null){
@@ -152,12 +143,6 @@
}
}
}else{
-
-// Fd_wlgs_fhdq wldq=this.dqper.getbyNos(lg.getDepartno(),xstd.getTd_shddbh(),
- // todo 涓嬮潰鐨勬剰涔変綍鍦紵锛燂紵锛熼粯璁ゆ煡绉戞妧锛燂紵锛�
-// xstd.getTd_ywdybh().equals(Contants.nc_ywdy_ZZ)?Contants.nc_ywdy_ZZ
-// :xstd.getTd_ywdybh().equals(Contants.nc_ywdy_MS)?Contants.nc_ywdy_MS
-// :Contants.nc_ywdy_KJ);
Fd_wlgs_fhdq wldq = this.dqper.getbyNos(lg.getDepartno(),xstd.getTd_shddbh(), ConvertTool.ncGetDefault(xstd.getTd_ywdybh()));
int total = fdMxWlgsMapper.selectCountByTdTdls(xstd.getTd_tdls());
if(wldq==null && total == 0){
@@ -171,11 +156,13 @@
if(StringUtils.isBlank(xstd.getTd_fpbh())){
if(mm!=null)
Rcompany=mm.get("name")==null?"":mm.get("name").toString();
+ // 鍒ゆ柇鏄惁瀛樺湪瀹㈡埛
+ if(mm == null || mm.size() == 0) { // 瀹㈡埛蹇呴』瀛樺湪锛屽惁鍒欐棤娉曞垎鍗�
+ orr.setCode(1);
+ orr.setErrmsg("璇ユ彁鍗曞鎴蜂笉瀛樺湪锛岃妫�鏌ユ暟鎹紒");
+ return orr;
+ }
}else{
- /*Rcompany=(xstd.getTd_ywdybh().equals(Contants.nc_ywdy_ZZ)?"閮戝窞鎶ュ叧":
- xstd.getTd_ywdybh().equals(Contants.nc_ywdy_MT)?"娌冲崡鎶ュ叧":
- xstd.getTd_ywdybh().equals(Contants.nc_ywdy_MS)?"鏄庢櫉鎶ュ叧":
- "绉戞妧鎶ュ叧");*/
Rcompany = ConvertTool.covertToCustoms(xstd.getTd_ywdybh());
}
@@ -184,8 +171,6 @@
List<Fd_XSTDMX> mxl=new ArrayList<Fd_XSTDMX>();
//鏄惁淇濆瓨涓�鍗￠�氫笟鍔″崟琛ㄥご淇℃伅
boolean saveBT=false;
- /*String bsDE=xstd.getTd_cqNo().equals(Contants.nc_ywdy_ZZ) ?
- Contants.zzSdepartNo :xstd.getTd_cqNo().equals(Contants.nc_ywdy_MS)?Contants.msSdepartNo:Contants.kjSdepartNo;*/
String bsDE = ConvertTool.ncCovertToYkt(xstd.getTd_cqNo());
String bbsNo="";
String ziti="";//鏄惁鑷彁
@@ -465,7 +450,10 @@
}
orr.setCode(0);
- orr.setItem(null);
+ Map map = new HashMap<>();
+ // 杩斿洖涓氬姟鍗曞彿锛岀粰鍓嶇浣跨敤
+ map.put("businessNo",bbsNo);
+ orr.setItem(map);
return orr;
}
--
Gitblit v1.9.3