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

丽知：调拨修改。

This commit is contained in:
zhengyf 2024-09-09 18:11:45 +08:00
parent 44676ead52
commit 1f0cf3c232
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/IcGeneralBDaoImpl.java
View File

@ -18,12 +18,12 @@ public class IcGeneralBDaoImpl extends MybatisGenericDao<IcGeneralBEntity, Strin
@Override @Override
public List<IcGeneralBEntity> queryByCgeneralhid(String cgeneralhid) { public List<IcGeneralBEntity> queryByCgeneralhid(String cgeneralhid) {
return query("com.hzya.frame.plugin.lets.entity.IcGeneralBEntity.queryByCgeneralhid",cgeneralhid); return query("com.hzya.frame.plugin.lets.dao.impl.IcGeneralBDaoImpl.queryByCgeneralhid",cgeneralhid);
} }
@Override
@DS(ProfilesActiveConstant.LETS_DATE_SOURCE) @DS(ProfilesActiveConstant.LETS_DATE_SOURCE)
@Override
public List<IcGeneralBEntity> queryAndCinvbasCode(String cgeneralhid) { public List<IcGeneralBEntity> queryAndCinvbasCode(String cgeneralhid) {
return (List<IcGeneralBEntity>)selectList("com.hzya.frame.plugin.lets.entity.IcGeneralBEntity.queryAndCinvbasCode",cgeneralhid); return (List<IcGeneralBEntity>)selectList("com.hzya.frame.plugin.lets.dao.impl.IcGeneralBDaoImpl.queryAndCinvbasCode",cgeneralhid);
} }
} }

33
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java
View File

@ -26,6 +26,7 @@ import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil;
import com.hzya.frame.plugin.lets.util.pushData.Attribute; import com.hzya.frame.plugin.lets.util.pushData.Attribute;
import com.hzya.frame.plugin.lets.util.pushData.PushU8CByApiCode; import com.hzya.frame.plugin.lets.util.pushData.PushU8CByApiCode;
import com.hzya.frame.plugin.lets.util.pushData.ZTResult; import com.hzya.frame.plugin.lets.util.pushData.ZTResult;
import com.hzya.frame.stringutil.StringUtil;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
import com.hzya.frame.ttxofs.dto.InterfaceParamDto; import com.hzya.frame.ttxofs.dto.InterfaceParamDto;
@ -189,12 +190,13 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），未查询到调拨出库单：{}", stockoutNo); Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），未查询到调拨出库单：{}", stockoutNo);
} }
//过滤成功日志 //过滤成功日志
List<StockoutOrderSearchResponse.StockoutOrder> filterTransferOutOrders = filterData(transferOutOrder); // List<StockoutOrderSearchResponse.StockoutOrder> filterTransferOutOrders = filterData(transferOutOrder);
if (filterTransferOutOrders.size() == 0) { // if (filterTransferOutOrders.size() == 0) {
Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），该调拨出库单：{}，已被推送成功，请勿重新推送", stockoutNo); // Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），该调拨出库单：{}，已被推送成功，请勿重新推送", stockoutNo);
} // }
//推送U8C //推送U8C
implement(filterTransferOutOrders); // implement(filterTransferOutOrders);
implement(transferOutOrder);
} catch (Exception e) { } catch (Exception e) {
logger.error("丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）,start(String goodsName)方法报错：", e); logger.error("丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）,start(String goodsName)方法报错：", e);
@ -226,6 +228,7 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
Assert.state(false, "丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）根据日期期间[开始时间]-[结束时间]：{}-{}，该调期调拨出库单[出库完成]已被推送成功，请勿重新推送", startTime, endTime); Assert.state(false, "丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）根据日期期间[开始时间]-[结束时间]：{}-{}，该调期调拨出库单[出库完成]已被推送成功，请勿重新推送", startTime, endTime);
} }
//推送U8C //推送U8C
// implement(transferOutOrder);
implement(filterTransferOutOrders); implement(filterTransferOutOrders);
} catch (Exception e) { } catch (Exception e) {
logger.error("丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）,start(String startTime, String endTime)方法报错：", e); logger.error("丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）,start(String startTime, String endTime)方法报错：", e);
@ -289,7 +292,7 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
String created = stockoutH.getCreated(); String created = stockoutH.getCreated();
format = created; format = created;
//dbilldate 单据日期 //dbilldate 单据日期
parentvo.setDbilldate(format); parentvo.setDbilldate(format.substring(0,10));
//dauditdate 审批日期 //dauditdate 审批日期
parentvo.setDauditdate(format); parentvo.setDauditdate(format);
//coperatorid 制单人 //coperatorid 制单人
@ -344,13 +347,20 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
//ofs行id //ofs行id
children.setPk_defdoc20(ofsDetail.getId()); children.setPk_defdoc20(ofsDetail.getId());
//nprice 单价，取上一次结账的单价 //nprice 单价，取上一次结账的单价 nmny金额 nnotaxmny无税金额 nnotaxprice 无税单价
IaMonthledgerEntity iaMonthledgerEntity = queryIaMonthledger(ofsDetail, ofsTranseferOrder.getHeader().getCompanyCode()); IaMonthledgerEntity iaMonthledgerEntity = queryIaMonthledger(ofsDetail, ofsTranseferOrder.getHeader().getCompanyCode());
System.out.println(iaMonthledgerEntity); System.out.println(iaMonthledgerEntity);
if(iaMonthledgerEntity==null){ if(iaMonthledgerEntity==null){
children.setNprice("0"); // children.setNprice("0");
children.setNmny("0");
}else {
// children.setNprice(iaMonthledgerEntity.getNabprice());
children.setNmny(iaMonthledgerEntity.getNabprice());
} }
children.setNprice(iaMonthledgerEntity.getNabprice());
//ntaxrate 税率
children.setNtaxrate("13");
} }
billVO.setParentvo(parentvo); billVO.setParentvo(parentvo);
@ -369,12 +379,14 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
System.out.println(attribute); System.out.println(attribute);
boolean isSuccess = false; boolean isSuccess = false;
String vbillcode = ""; String vbillcode = "";
String cbillid = "";
if ("success".equals(attribute.getStatus())) { if ("success".equals(attribute.getStatus())) {
isSuccess = true; isSuccess = true;
String data = attribute.getData(); String data = attribute.getData();
BillVO resBillVO = resultDataHandle(data); BillVO resBillVO = resultDataHandle(data);
System.out.println(resBillVO); System.out.println(resBillVO);
vbillcode = resBillVO.getParentvo().getVcode(); vbillcode = resBillVO.getParentvo().getVcode();
cbillid = resBillVO.getParentvo().getCbillid();
} }
if (!isSuccess) { if (!isSuccess) {
Assert.state(false, "推送U8C--> 丽知：OFS调整出库--->U8C其它出库 失败 接口返回结果：{} 接口入参:{}", response, mapStr); Assert.state(false, "推送U8C--> 丽知：OFS调整出库--->U8C其它出库 失败 接口返回结果：{} 接口入参:{}", response, mapStr);
@ -389,7 +401,8 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
integrationTaskLivingDetailsEntity.setBusinessDate(format); integrationTaskLivingDetailsEntity.setBusinessDate(format);
integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode); integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode);
integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode); integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);
integrationTaskLivingDetailsEntity.setDef1(vbillcode);//u8c调拨订单号 integrationTaskLivingDetailsEntity.setNewSystemNumber(vbillcode);//u8c调拨订单号
integrationTaskLivingDetailsEntity.setNewSystemPrimary(cbillid);//u8c调拨订单号
integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);

6
buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java
View File

@ -40,7 +40,7 @@ public class TransferTest {
@Test @Test
public void t10(){ public void t10(){
transferOutPluginInitializer.start("LETS-SH2024082800000001"); transferOutPluginInitializer.start("LETS-SH2024090400000005");
} }
@Test @Test
@ -59,7 +59,7 @@ public class TransferTest {
} }
@Test @Test
public void t21(){ public void t21(){
transferInPluginInitializer.start("LETS-RE2024082700000003"); transferInPluginInitializer.start("LETS-RE2024090400000004");
} }
@ -86,7 +86,7 @@ public class TransferTest {
} }
@Test @Test
public void t41(){ public void t41(){
adjustOutPluginInitializer.start("LETS-SH2024082700000001"); adjustOutPluginInitializer.start("LETS-SH2024090400000005");
} }
@Test @Test
public void t42(){ public void t42(){