Skip to content

S
sap-service
Commit e9bb927c authored by Quxl's avatar Quxl
Browse files
Options

x

parent 8368a263
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 109 deletions
src/main/java/com/egolm/sso/services/material_master/MaterialMasterServiceImpl.java
View file @ e9bb927c
...@@ -63,55 +63,57 @@ public class MaterialMasterServiceImpl implements MaterialMasterService { ...@@ -63,55 +63,57 @@ public class MaterialMasterServiceImpl implements MaterialMasterService {
if(items != null) { if(items != null) {
for(ITEM item : items) { for(ITEM item : items) {
String GOODS_CODE = item.getMATNR(); if(item != null) {
Map<String, Object> goods = getGoods(DIS_CODE, GOODS_CODE); String GOODS_CODE = item.getMATNR();
if (goods == null) { Map<String, Object> goods = getGoods(DIS_CODE, GOODS_CODE);
goods = new HashMap<>(); if (goods == null) {
} goods = new HashMap<>();
goods.put("DIS_CODE", DIS_CODE); }
goods.put("DATUM", DateUtil.parseDate(DATUM, DateUtil.FMT_DATE)); goods.put("DIS_CODE", DIS_CODE);
goods.put("UZEIT", DateUtil.parseDate(UZEIT, DateUtil.FMT_TIME)); goods.put("DATUM", DateUtil.parseDate(DATUM, DateUtil.FMT_DATE));
goods.put("UZEIT", DateUtil.parseDate(UZEIT, DateUtil.FMT_TIME));
goods.put("GOODS_CODE", GOODS_CODE);
goods.put("ROUGH_WEIGHT", Double.valueOf(item.getBRGEW())); goods.put("GOODS_CODE", GOODS_CODE);
goods.put("NET_WEIGHT", Double.valueOf(item.getNTGEW())); goods.put("ROUGH_WEIGHT", Double.valueOf(item.getBRGEW()));
goods.put("WETGHT_UNIT", item.getGEWEI()); goods.put("NET_WEIGHT", Double.valueOf(item.getNTGEW()));
goods.put("CATEGORY_CODE", item.getPLINE()); goods.put("WETGHT_UNIT", item.getGEWEI());
goods.put("CREATION_DATE", DateUtil.parseDate(item.getERSDA(), DateUtil.FMT_DATE)); goods.put("CATEGORY_CODE", item.getPLINE());
goods.put("LAST_CHANGE_DATE", DateUtil.parseDate(item.getLAEDA(), DateUtil.FMT_DATE)); goods.put("CREATION_DATE", DateUtil.parseDate(item.getERSDA(), DateUtil.FMT_DATE));
goods.put("GOODS_NAME", item.getNORMT()); goods.put("LAST_CHANGE_DATE", DateUtil.parseDate(item.getLAEDA(), DateUtil.FMT_DATE));
goods.put("PRODUCTION_LINE_CODE", item.getLIFNR()); goods.put("GOODS_NAME", item.getNORMT());
goods.put("VMSTA", item.getVMSTA()); goods.put("PRODUCTION_LINE_CODE", item.getLIFNR());
goods.put("MSTAV", item.getMSTAV()); goods.put("VMSTA", item.getVMSTA());
goods.put("STKTYP", item.getSTKTYP()); goods.put("MSTAV", item.getMSTAV());
goods.put("SPEC", item.getUMREZ()); goods.put("STKTYP", item.getSTKTYP());
goods.put("SPEC", item.getUMREZ());
goods.put("GOODS_NAME_EN", item.getNORMT_EN()); goods.put("GOODS_NAME_EN", item.getNORMT_EN());
goods.put("AUMNG", item.getAUMNG()); goods.put("AUMNG", item.getAUMNG());
goods.put("VRKME", item.getVRKME()); goods.put("VRKME", item.getVRKME());
goods.put("BASE_UNIT", item.getMEINS()); goods.put("BASE_UNIT", item.getMEINS());
goods.put("STATISTICS_UNIT", item.getSCHME());// （统计单位--》发货单位） goods.put("STATISTICS_UNIT", item.getSCHME());// （统计单位--》发货单位）
goods.put("LAENG", item.getLAENG()); goods.put("LAENG", item.getLAENG());
goods.put("BREIT", item.getBREIT()); goods.put("BREIT", item.getBREIT());
goods.put("HOEHE", item.getHOEHE()); goods.put("HOEHE", item.getHOEHE());
goods.put("MEABM", item.getMEABM()); goods.put("MEABM", item.getMEABM());
goods.put("LAENG_B", item.getLAENG_B()); goods.put("LAENG_B", item.getLAENG_B());
goods.put("BREIT_B", item.getBREIT_B()); goods.put("BREIT_B", item.getBREIT_B());
goods.put("HOEHE_B", item.getHOEHE_B()); goods.put("HOEHE_B", item.getHOEHE_B());
goods.put("MEABM_B", item.getMEABM_B()); goods.put("MEABM_B", item.getMEABM_B());
goods.put("PUBLIC", item.getPUBLIC()); goods.put("PUBLIC", item.getPUBLIC());
goods.put("INTERNET", item.getINTERNET()); goods.put("INTERNET", item.getINTERNET());
Long BATCHID = common.getNextval(dateString + "T_VEN_GOODS_BATCH_" + dateString); Long BATCHID = common.getNextval(dateString + "T_VEN_GOODS_BATCH_" + dateString);
String BATCH = dateString+"-"+BATCHID; String BATCH = dateString+"-"+BATCHID;
goods.put("TRACE_NO", "sapmaterialmaster" + DateUtil.formatDate(now, DateUtil.FMT_DATETIME)); goods.put("TRACE_NO", "sapmaterialmaster" + DateUtil.formatDate(now, DateUtil.FMT_DATETIME));
goods.put("BATCH", BATCH); goods.put("BATCH", BATCH);
goods.put("SEND_STATUS", "N"); goods.put("SEND_STATUS", "N");
if (goods.get("ID") != null) { if (goods.get("ID") != null) {
updateGoods(goods); updateGoods(goods);
} else { } else {
insertGoods(goods); insertGoods(goods);
}
} }
} }
} }
......
src/main/java/com/egolm/sso/services/price_list/PriceListServiceImpl.java
View file @ e9bb927c
...@@ -63,39 +63,41 @@ public class PriceListServiceImpl implements PriceListService { ...@@ -63,39 +63,41 @@ public class PriceListServiceImpl implements PriceListService {
} }
if(items != null) { if(items != null) {
for(ITEM item : items) { for(ITEM item : items) {
String MATNR = item.getMATNR(); if(item != null) {
Map<String, Object> priceObj = getPriceObj(KUNNR, MATNR); String MATNR = item.getMATNR();
if (priceObj == null) { Map<String, Object> priceObj = getPriceObj(KUNNR, MATNR);
priceObj = new HashMap<>(); if (priceObj == null) {
} priceObj = new HashMap<>();
}
priceObj.put("KUNNR", KUNNR);
priceObj.put("DATUM", DateUtil.parseDate(DATUM, DateUtil.FMT_DATE)); priceObj.put("KUNNR", KUNNR);
priceObj.put("UZEIT", DateUtil.parseDate(UZEIT, DateUtil.FMT_TIME)); priceObj.put("DATUM", DateUtil.parseDate(DATUM, DateUtil.FMT_DATE));
priceObj.put("MATNR", MATNR); priceObj.put("UZEIT", DateUtil.parseDate(UZEIT, DateUtil.FMT_TIME));
priceObj.put("MATNR", MATNR);
priceObj.put("KBETR", StringUtil.toDouble(item.getKBETR()));
priceObj.put("KONWA", item.getKONWA()); priceObj.put("KBETR", StringUtil.toDouble(item.getKBETR()));
priceObj.put("KPEIN", item.getKPEIN()); priceObj.put("KONWA", item.getKONWA());
priceObj.put("KMEIN", item.getKMEIN()); priceObj.put("KPEIN", item.getKPEIN());
priceObj.put("UMREZ", item.getUMREZ()); priceObj.put("KMEIN", item.getKMEIN());
priceObj.put("MAKTX", item.getMAKTX()); priceObj.put("UMREZ", item.getUMREZ());
priceObj.put("PRSCH", StringUtil.toDouble(item.getPRSCH())); priceObj.put("MAKTX", item.getMAKTX());
priceObj.put("DATAM", DateUtil.parseDate(item.getDATAM(), DateUtil.FMT_DATE)); priceObj.put("PRSCH", StringUtil.toDouble(item.getPRSCH()));
priceObj.put("DATBI", DateUtil.parseDate(item.getDATBI(), DateUtil.FMT_DATE)); priceObj.put("DATAM", DateUtil.parseDate(item.getDATAM(), DateUtil.FMT_DATE));
priceObj.put("PLINE", item.getPLINE()); priceObj.put("DATBI", DateUtil.parseDate(item.getDATBI(), DateUtil.FMT_DATE));
priceObj.put("PRSCH_1", StringUtil.toDouble(item.getPRSCH_1())); priceObj.put("PLINE", item.getPLINE());
priceObj.put("PRSCH_1", StringUtil.toDouble(item.getPRSCH_1()));
priceObj.put("SEND_STATUS", "N"); priceObj.put("SEND_STATUS", "N");
Long BATCHID = common.getNextval("T_PRICE_LIST_BATCH_" + dateString); Long BATCHID = common.getNextval("T_PRICE_LIST_BATCH_" + dateString);
String BATCH = dateString + "-" + BATCHID; String BATCH = dateString + "-" + BATCHID;
priceObj.put("TRACE_NO", "sappricelist" + DateUtil.formatDate(now, DateUtil.FMT_DATETIME)); priceObj.put("TRACE_NO", "sappricelist" + DateUtil.formatDate(now, DateUtil.FMT_DATETIME));
priceObj.put("BATCH", BATCH); priceObj.put("BATCH", BATCH);
if (priceObj.get("ID") != null) { if (priceObj.get("ID") != null) {
updatePriceObj(priceObj); updatePriceObj(priceObj);
} else { } else {
insertPriceObj(priceObj); insertPriceObj(priceObj);
}
} }
} }
} }
......
src/main/java/com/egolm/sso/services/shipping_notfirmation/ShippingNotificationServiceImpl.java
View file @ e9bb927c
...@@ -71,36 +71,40 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ ...@@ -71,36 +71,40 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ
if(HEADER_PARTNERs != null) { if(HEADER_PARTNERs != null) {
for(int i=0; i<HEADER_PARTNERs.size(); i++) { for(int i=0; i<HEADER_PARTNERs.size(); i++) {
HEADER_PARTNER HEADER_PARTNER = HEADER_PARTNERs.get(i); HEADER_PARTNER HEADER_PARTNER = HEADER_PARTNERs.get(i);
String PARTNER_Q = HEADER_PARTNER.getPARTNER_Q(); if(HEADER_PARTNER != null) {
String PARTNER_ID = HEADER_PARTNER.getPARTNER_ID(); String PARTNER_Q = HEADER_PARTNER.getPARTNER_Q();
String NAME1 = HEADER_PARTNER.getNAME1(); String PARTNER_ID = HEADER_PARTNER.getPARTNER_ID();
String NAME2 = HEADER_PARTNER.getNAME2(); String NAME1 = HEADER_PARTNER.getNAME1();
String POSTL_COD1 = HEADER_PARTNER.getPOSTL_COD1(); String NAME2 = HEADER_PARTNER.getNAME2();
String CITY1 = HEADER_PARTNER.getCITY1(); String POSTL_COD1 = HEADER_PARTNER.getPOSTL_COD1();
if("AG".equals(PARTNER_Q)) { String CITY1 = HEADER_PARTNER.getCITY1();
header.put("PARTNER_Q1", PARTNER_Q); if("AG".equals(PARTNER_Q)) {
header.put("PARTNER_ID1", PARTNER_ID); header.put("PARTNER_Q1", PARTNER_Q);
header.put("PARTNER_NAME1_1", NAME1); header.put("PARTNER_ID1", PARTNER_ID);
header.put("PARTNER_NAME2_1", NAME2); header.put("PARTNER_NAME1_1", NAME1);
header.put("PARTNER_POSTLCOD1_1", POSTL_COD1); header.put("PARTNER_NAME2_1", NAME2);
header.put("PARTNER_CITY1_1", CITY1); header.put("PARTNER_POSTLCOD1_1", POSTL_COD1);
} else if("WE".equals(PARTNER_Q)) { header.put("PARTNER_CITY1_1", CITY1);
header.put("PARTNER_Q2", PARTNER_Q); } else if("WE".equals(PARTNER_Q)) {
header.put("PARTNER_ID2", PARTNER_ID); header.put("PARTNER_Q2", PARTNER_Q);
header.put("PARTNER_NAME1_2", NAME1); header.put("PARTNER_ID2", PARTNER_ID);
header.put("PARTNER_NAME2_2", NAME2); header.put("PARTNER_NAME1_2", NAME1);
header.put("PARTNER_POSTLCOD1_2", POSTL_COD1); header.put("PARTNER_NAME2_2", NAME2);
header.put("PARTNER_CITY1_2", CITY1); header.put("PARTNER_POSTLCOD1_2", POSTL_COD1);
} else { header.put("PARTNER_CITY1_2", CITY1);
throw new XRException("Partner type undefined [" + PARTNER_Q + "] in HEADER_PARTNER"); } else {
throw new XRException("Partner type undefined [" + PARTNER_Q + "] in HEADER_PARTNER");
}
} }
} }
} }
List<HEADER_DATE> HEADER_DATEs= HEADER_DELIVERY.getHEADER_DATE(); List<HEADER_DATE> HEADER_DATEs= HEADER_DELIVERY.getHEADER_DATE();
if(HEADER_DATEs!=null) { if(HEADER_DATEs!=null) {
HEADER_DATE HEADER_DATE = HEADER_DATEs.get(0); HEADER_DATE HEADER_DATE = HEADER_DATEs.get(0);
header.put("QUALF", HEADER_DATE.getQUALF()); if(HEADER_DATE != null) {
header.put("NTEND", HEADER_DATE.getNTEND()); header.put("QUALF", HEADER_DATE.getQUALF());
header.put("NTEND", HEADER_DATE.getNTEND());
}
} }
header.put("BATCH", dateString + "-" + common.getNextval("T_SHIPPING_NOTIFICATION_HEADER_BATCH_"+dateString)); header.put("BATCH", dateString + "-" + common.getNextval("T_SHIPPING_NOTIFICATION_HEADER_BATCH_"+dateString));
header.put("SEND_STATUS", "N"); header.put("SEND_STATUS", "N");
...@@ -127,19 +131,25 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ ...@@ -127,19 +131,25 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ
List<ITEM_REFERENCE_SO> ITEM_REFERENCE_SOs = ITEM.getITEM_REFERENCE_SO(); List<ITEM_REFERENCE_SO> ITEM_REFERENCE_SOs = ITEM.getITEM_REFERENCE_SO();
if(ITEM_REFERENCE_SOs!=null) { if(ITEM_REFERENCE_SOs!=null) {
ITEM_REFERENCE_SO ITEM_REFERENCE_SO = ITEM_REFERENCE_SOs.get(0); ITEM_REFERENCE_SO ITEM_REFERENCE_SO = ITEM_REFERENCE_SOs.get(0);
item.put("REFERENCE_SO_QUALF", ITEM_REFERENCE_SO.getQUALF()); if(ITEM_REFERENCE_SO != null) {
item.put("REFERENCE_SO_BELNR", ITEM_REFERENCE_SO.getBELNR()); item.put("REFERENCE_SO_QUALF", ITEM_REFERENCE_SO.getQUALF());
item.put("REFERENCE_SO_POSNR", ITEM_REFERENCE_SO.getPOSNR()); item.put("REFERENCE_SO_BELNR", ITEM_REFERENCE_SO.getBELNR());
item.put("REFERENCE_SO_POSNR", ITEM_REFERENCE_SO.getPOSNR());
}
} }
List<ITEM_REFERENCE_PO_TYPE> ITEM_REFERENCE_PO_TYPEs = ITEM.getITEM_REFERENCE_PO_TYPE(); List<ITEM_REFERENCE_PO_TYPE> ITEM_REFERENCE_PO_TYPEs = ITEM.getITEM_REFERENCE_PO_TYPE();
if(ITEM_REFERENCE_PO_TYPEs != null) { if(ITEM_REFERENCE_PO_TYPEs != null) {
for(int i=0; i<ITEM_REFERENCE_PO_TYPEs.size(); i++) { for(int i=0; i<ITEM_REFERENCE_PO_TYPEs.size(); i++) {
ITEM_REFERENCE_PO_TYPE ITEM_REFERENCE_PO_TYPE = ITEM_REFERENCE_PO_TYPEs.get(i); ITEM_REFERENCE_PO_TYPE ITEM_REFERENCE_PO_TYPE = ITEM_REFERENCE_PO_TYPEs.get(i);
item.put("REFERENCE_PO_TYPE_TDID"+(i+1), ITEM_REFERENCE_PO_TYPE.getTDID()); if(ITEM_REFERENCE_PO_TYPE != null) {
List<ITEM_REFERENCE_PO_DATA> ITEM_REFERENCE_PO_DATAs = ITEM_REFERENCE_PO_TYPE.getITEM_REFERENCE_PO_DATA(); item.put("REFERENCE_PO_TYPE_TDID"+(i+1), ITEM_REFERENCE_PO_TYPE.getTDID());
if(ITEM_REFERENCE_PO_DATAs!=null&&ITEM_REFERENCE_PO_DATAs.size()>0) { List<ITEM_REFERENCE_PO_DATA> ITEM_REFERENCE_PO_DATAs = ITEM_REFERENCE_PO_TYPE.getITEM_REFERENCE_PO_DATA();
ITEM_REFERENCE_PO_DATA ITEM_REFERENCE_PO_DATA = ITEM_REFERENCE_PO_DATAs.get(0); if(ITEM_REFERENCE_PO_DATAs!=null&&ITEM_REFERENCE_PO_DATAs.size()>0) {
item.put("REFERENCE_PO_TYPE_TDLINE"+(i+1), ITEM_REFERENCE_PO_DATA.getTDLINE()); ITEM_REFERENCE_PO_DATA ITEM_REFERENCE_PO_DATA = ITEM_REFERENCE_PO_DATAs.get(0);
if(ITEM_REFERENCE_PO_DATA != null) {
item.put("REFERENCE_PO_TYPE_TDLINE"+(i+1), ITEM_REFERENCE_PO_DATA.getTDLINE());
}
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment