hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lets' into lets

This commit is contained in:
zhengyf 2024-11-06 15:28:10 +08:00
parent a9a81244ac 6fd08960e4
commit b00af47593
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java
View File

@ -132,7 +132,7 @@ public class OverallConstant {
prodOverAll.put("u8cApiNeedStackTraceCode", "N"); prodOverAll.put("u8cApiNeedStackTraceCode", "N");
prodOverAll.put("u8cApiZdrCode", "tbadmin");//单据制单人---测试环境：tbadmin prodOverAll.put("u8cApiZdrCode", "tbadmin");//单据制单人---测试环境：tbadmin
prodOverAll.put("u8c自定义项档案-公司对照", "0001A11000000004XB42"); prodOverAll.put("u8c自定义项档案-公司对照", "0001A11000000000WNVT");
prodOverAll.put("u8c自定义项档案-店铺主键", "0001A110000000000EBX"); prodOverAll.put("u8c自定义项档案-店铺主键", "0001A110000000000EBX");
prodOverAll.put("u8c自定义项档案-平台主键", "0001A110000000000EEU"); prodOverAll.put("u8c自定义项档案-平台主键", "0001A110000000000EEU");
prodOverAll.put("u8c自定义项档案-存货分类对应收支项目主键", "0001A210000000008FBN"); prodOverAll.put("u8c自定义项档案-存货分类对应收支项目主键", "0001A210000000008FBN");

4
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java
View File

@ -1132,7 +1132,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
bdCumandocEntity1.setPkCubasdoc(fuzzyQueryCustomers.getPkCubasdoc()); bdCumandocEntity1.setPkCubasdoc(fuzzyQueryCustomers.getPkCubasdoc());
List<BdCumandocEntity> bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1); List<BdCumandocEntity> bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1);
if (bdCumandocEntityList == null || bdCumandocEntityList.size() == 0) { if (bdCumandocEntityList == null || bdCumandocEntityList.size() == 0) {
Assert.state(false, "根据客商基本档案主键{}，没有办法查询到客商管理档案", fuzzyQueryCustomers.getPkCubasdoc()); Assert.state(false, "根据客商基本档案主键{} 客商名称：{}，无法匹配到公司：{} 对应的客商管理档案", fuzzyQueryCustomers.getPkCubasdoc(), fuzzyQueryCustomers.getCustname(), bdCorpEntityList.get(0).getUnitname());
} }
//查找平台 //查找平台
@ -1693,7 +1693,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
bdCumandocEntity1.setPkCubasdoc(fuzzyQueryCustomers.getPkCubasdoc()); bdCumandocEntity1.setPkCubasdoc(fuzzyQueryCustomers.getPkCubasdoc());
List<BdCumandocEntity> bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1); List<BdCumandocEntity> bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1);
if (bdCumandocEntityList == null || bdCumandocEntityList.size() == 0) { if (bdCumandocEntityList == null || bdCumandocEntityList.size() == 0) {
Assert.state(false, "根据客商基本档案主键{}，无法匹配到客商管理档案", fuzzyQueryCustomers.getPkCubasdoc()); Assert.state(false, "根据客商基本档案主键{} 客商名称：{}，无法匹配到公司：{} 对应的客商管理档案", fuzzyQueryCustomers.getPkCubasdoc(), fuzzyQueryCustomers.getCustname(), bdCorpEntityList.get(0).getUnitname());
} else if (bdCumandocEntityList.size() >= 2) { } else if (bdCumandocEntityList.size() >= 2) {
Assert.state(false, "根据客商基本档案主键{}，匹配到{}哥客商管理档案", fuzzyQueryCustomers.getPkCubasdoc(), bdCumandocEntityList.size()); Assert.state(false, "根据客商基本档案主键{}，匹配到{}哥客商管理档案", fuzzyQueryCustomers.getPkCubasdoc(), bdCumandocEntityList.size());
} }

4
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java
View File

@ -1076,7 +1076,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
bdCumandocEntity1.setCustflags(ProfilesActiveConstant.CUSTOMER); bdCumandocEntity1.setCustflags(ProfilesActiveConstant.CUSTOMER);
List<BdCumandocEntity> bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1); List<BdCumandocEntity> bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1);
if (bdCumandocEntityList == null || bdCumandocEntityList.size() == 0) { if (bdCumandocEntityList == null || bdCumandocEntityList.size() == 0) {
Assert.state(false, "根据客商基本档案主键{}，没有办法查询到客商管理档案", fuzzyQueryCustomers.getPkCubasdoc()); Assert.state(false, "根据客商基本档案主键{} 客商名称：{}，无法匹配到公司：{} 对应的客商管理档案", fuzzyQueryCustomers.getPkCubasdoc(), fuzzyQueryCustomers.getCustname(), bdCorpEntityList.get(0).getUnitname());
} }
//查找平台 //查找平台
@ -1391,7 +1391,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
bdCumandocEntity1.setCustflags(ProfilesActiveConstant.CUSTOMER); bdCumandocEntity1.setCustflags(ProfilesActiveConstant.CUSTOMER);
List<BdCumandocEntity> bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1); List<BdCumandocEntity> bdCumandocEntityList = iBdCumandocDao.query(bdCumandocEntity1);
if (bdCumandocEntityList == null || bdCumandocEntityList.size() == 0) { if (bdCumandocEntityList == null || bdCumandocEntityList.size() == 0) {
Assert.state(false, "根据客商基本档案主键{}，没有办法查询到客商管理档案", fuzzyQueryCustomers.getPkCubasdoc()); Assert.state(false, "根据客商基本档案主键{} 客商名称：{}，无法匹配到公司：{} 对应的客商管理档案", fuzzyQueryCustomers.getPkCubasdoc(), fuzzyQueryCustomers.getCustname(), bdCorpEntityList.get(0).getUnitname());
} }
//查找平台 //查找平台

2
buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java
View File

@ -88,7 +88,7 @@ public class SoSaleOutPluginInitializerToBTest {
// soSaleOutPluginInitializerToB.startImplementByStockTime("2024-10-31 14:48:41", "2024-10-31 14:48:41"); // soSaleOutPluginInitializerToB.startImplementByStockTime("2024-10-31 14:48:41", "2024-10-31 14:48:41");
soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024103000021968","stock"); soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024110500018124", "stock");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

2
buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
View File

@ -121,7 +121,7 @@ class SoSaleOutPluginInitializerToCTest {
try { try {
// soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024091900002878", "stock"); // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024091900002878", "stock");
soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024102900028994", "tran"); soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110500013375", "stock");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

6
buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtilTest.java
View File

@ -69,8 +69,10 @@ public class QueryU8CEntityUtilTest {
@Test @Test
public void testGetFuzzyQueryCustomers() { public void testGetFuzzyQueryCustomers() {
try { try {
String aaa = "9279"; // String aaa = "9279";
queryU8CEntityUtil.getFuzzyQueryCustomers(aaa); // queryU8CEntityUtil.getFuzzyQueryCustomers(aaa);
queryU8CEntityUtil.queryBdDefDocByPkDefDocAll();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }