diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjMxSap.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjMxSap.java index b326ffb0..ff918434 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjMxSap.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjMxSap.java @@ -69,4 +69,9 @@ public class FpkjMxSap { * 矿别名称 */ private String KNAME; + /** + * 规格型号 + */ + private String ZGGXH; + } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 7b84544d..f3622b1a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -519,12 +519,6 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { StringBuilder errorStr = new StringBuilder(); for (int i = 0; i < orderItemInfo.size(); i++) { OrderItemInfo item = orderItemInfo.get(i); - if(StrUtil.isNotBlank(item.getSpbm())){ - item.setZnfm(ConfigureConstant.STRING_0); - item.setTswl(ConfigureConstant.STRING_0); - log.info("{},第{}行税编:{}不为空,不进行补全",LOGGER_MSG,i+1,item.getSpbm()); - continue; - } //rowIndex excel导入时为行坐标,其他业务时为明细行在集合中的索引值 String indexStr = StringUtils.isBlank(item.getRowIndex()) ? String.valueOf(i + 1) : item.getRowIndex(); //如果是清单红字发票的话,不进行明细行补全 @@ -558,7 +552,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { } } else { //根据商品编码判断如何进行补全数据 - if (StringUtils.isNotBlank(item.getZxbm())) { + if (StringUtils.isNotBlank(item.getZxbm()) && StringUtils.isBlank(item.getSpbm())) { // 根据SAP曹源及MDM赵荣平口述,SAP推送过来的自行编码是经过自动补0的,处理逻辑如下: // 物料、客商、人员数据都会默认补0,处理逻辑是客商从右往左取6位,其他的(物料、人员)从右往左取8位 item.setZxbm(StringUtils.right(item.getZxbm(), 8)); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index e975785b..9d7369d6 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3529,7 +3529,7 @@ public class BeanTransitionUtils { ddmxxxBO.setSPSL(""); ddmxxxBO.setDJ(""); }else { - ddmxxxBO.setGGXH(""); + ddmxxxBO.setGGXH(detail.getZGGXH()); ddmxxxBO.setDW(detail.getZSLDW()); ddmxxxBO.setSPSL(detail.getZZSL()); ddmxxxBO.setDJ(detail.getZZDJ()); @@ -3540,8 +3540,8 @@ public class BeanTransitionUtils { ddmxxxBO.setSE(detail.getZZSE()); ddmxxxBO.setPH(detail.getCHARG()); ddmxxxBO.setKB(detail.getKTYPE()+":"+detail.getKNAME()); - //TODO lfl 优惠政策标识 取税编对应的优惠政策标识! - ddmxxxBO.setYHZCBS("0"); + //TODO lfl 优惠政策标识 后面补全商品明细的时候会补全! + //ddmxxxBO.setYHZCBS("0"); ddmxList.add(ddmxxxBO); } }