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

丽知：调拨修改

This commit is contained in:
zhengyf 2024-09-13 17:58:01 +08:00
parent 74ac490c8b
commit 93a68ed5b6
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java
View File

@ -301,17 +301,17 @@ public class TransferInPluginInitializer extends PluginBaseEntity {
//pk_corp 公司 //pk_corp 公司
parentvo.setPk_corp(ofsTransferHeader.getCompanyCode()); parentvo.setPk_corp(ofsTransferHeader.getCompanyCode());
//pk_defdoc19 自定义项19（ofs调拨订单号） //pk_defdoc19 自定义项19（ofs调拨订单号）
parentvo.setPk_defdoc19(ofsSourceOrderCode); parentvo.setVuserdef19(ofsSourceOrderCode);
//U8C调拨订单信息 //U8C调拨订单信息
// List<ToBillEntity> toBillEntityList = queryToBillByPkVdefdoc19(ofsSourceOrderCode); // List<ToBillEntity> toBillEntityList = queryToBillByPkVdefdoc19(ofsSourceOrderCode);
//U8C调拨出库单主表信息 //U8C调拨出库单主表信息
List<IcGeneralHEntity> icGeneralHEntityList = queryIcGeneralHByPkVdefdoc19(ofsSourceOrderCode); List<IcGeneralHEntity> icGeneralHEntityList = queryIcGeneralHByVdef19(ofsSourceOrderCode);
if (icGeneralHEntityList == null) { if (icGeneralHEntityList == null) {
Assert.state(false, "在U8C内根据OFS调拨订单号（pk_vdefdoc19）:{},没有查询到调拨出库单，请检查。", ofsSourceOrderCode); Assert.state(false, "在U8C内根据OFS调拨订单号（vdefdoc19）:{},没有查询到调拨出库单，请检查。", ofsSourceOrderCode);
} }
if (icGeneralHEntityList.size() > 1) { if (icGeneralHEntityList.size() > 1) {
Assert.state(false, "在U8C内根据OFS调拨订单号（pk_vdefdoc19）:{},查询到调拨出库单不唯一，请检查。", ofsSourceOrderCode); Assert.state(false, "在U8C内根据OFS调拨订单号（vdefdoc19）:{},查询到调拨出库单不唯一，请检查。", ofsSourceOrderCode);
} }
IcGeneralHEntity icGeneralHEntity = icGeneralHEntityList.get(0); IcGeneralHEntity icGeneralHEntity = icGeneralHEntityList.get(0);
@ -339,11 +339,11 @@ public class TransferInPluginInitializer extends PluginBaseEntity {
for (IcGeneralBEntity icGeneralBEntity : icGeneralBEntityList) { for (IcGeneralBEntity icGeneralBEntity : icGeneralBEntityList) {
System.out.println(icGeneralBEntity); System.out.println(icGeneralBEntity);
//根据存货+行号匹配 //根据存货+行号匹配
if (ofsTransferDetail.getRefOrderDetailId().equals(icGeneralBEntity.getPkDefdoc20().trim()) && ofsTransferDetail.getSkuCode().equals(icGeneralBEntity.getCinvbascode())) { if (ofsTransferDetail.getRefOrderDetailId().equals(icGeneralBEntity.getVuserdef20().trim()) && ofsTransferDetail.getSkuCode().equals(icGeneralBEntity.getCinvbascode())) {
//crowno 行号 //crowno 行号
childrenvo.setCrowno(i++ + "0"); childrenvo.setCrowno(i++ + "0");
//ofs来源单据行行号 //ofs来源单据行行号
childrenvo.setPk_defdoc20(ofsTransferDetail.getRefOrderDetailId()); childrenvo.setVuserdef20(ofsTransferDetail.getRefOrderDetailId());
//vsourcerowno 来源单据行号 //vsourcerowno 来源单据行号
childrenvo.setVsourcerowno(icGeneralBEntity.getCrowno()); childrenvo.setVsourcerowno(icGeneralBEntity.getCrowno());
break; break;
@ -506,10 +506,10 @@ public class TransferInPluginInitializer extends PluginBaseEntity {
/** /**
* 根据调拨出库单主表自定义项19（ofs调拨订单号）查询调拨出库单主表 * 根据调拨出库单主表自定义项19（ofs调拨订单号）查询调拨出库单主表
*/ */
public List<IcGeneralHEntity> queryIcGeneralHByPkVdefdoc19(String pkDefdoc19) { public List<IcGeneralHEntity> queryIcGeneralHByVdef19(String pkDefdoc19) {
IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity(); IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity();
icGeneralHEntity.setDr(0); icGeneralHEntity.setDr(0);
icGeneralHEntity.setPkDefdoc19(pkDefdoc19); icGeneralHEntity.setVuserdef19(pkDefdoc19);
icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE); icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
List<IcGeneralHEntity> icGeneralHEntityList = icGeneralHDao.query(icGeneralHEntity); List<IcGeneralHEntity> icGeneralHEntityList = icGeneralHDao.query(icGeneralHEntity);
if (icGeneralHEntityList == null || icGeneralHEntityList.size() == 0) { if (icGeneralHEntityList == null || icGeneralHEntityList.size() == 0) {

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

@ -345,24 +345,19 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
children.setNnum(BigDecimal.valueOf(Long.parseLong(ofsDetail.getShipQty()))); children.setNnum(BigDecimal.valueOf(Long.parseLong(ofsDetail.getShipQty())));
childrenvo.add(children); childrenvo.add(children);
//ofs行id //ofs行id
children.setPk_defdoc20(ofsDetail.getId()); // children.setPk_defdoc20(ofsDetail.getId());
children.setVbdef20(ofsDetail.getId()); children.setVbdef20(ofsDetail.getId());
//nprice 单价，取上一次结账的单价 nmny金额 nnotaxmny无税金额 nnotaxprice 无税单价 //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 { }else {
// children.setNprice(iaMonthledgerEntity.getNabprice()); children.setNprice(iaMonthledgerEntity.getNabprice());
children.setNmny(iaMonthledgerEntity.getNabprice());
} }
//ntaxrate 税率 //ntaxrate 税率
children.setNtaxrate("13"); children.setNtaxrate("13");
} }
billVO.setParentvo(parentvo); billVO.setParentvo(parentvo);
billVO.setChildrenvo(childrenvo); billVO.setChildrenvo(childrenvo);

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

@ -62,7 +62,7 @@ public class TransferTest {
} }
@Test @Test
public void t21(){ public void t21(){
transferInPluginInitializer.start("LETS-RE2024091100000001"); transferInPluginInitializer.start("LETS-RE2024090400000004");
} }