From 404b2025163c2dc8aff0c811a0445fc0e9c45d54 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 13 Sep 2023 11:47:07 +0800 Subject: [PATCH] sap --- .../op-sap/src/main/java/com/op/sap.rar | Bin 0 -> 17797 bytes .../com/op/sap/controller/SapController.java | 61 +++- .../op/sap/domain/SapMaterialPreparation.java | 125 +++++++++ .../java/com/op/sap/mapper/SapBomMapper.java | 8 +- .../com/op/sap/service/SapBomService.java | 3 + .../op/sap/service/SapItemSyncService.java | 17 ++ .../com/op/sap/service/SapOrderService.java | 26 ++ .../op/sap/service/SapWorkCenterService.java | 12 + .../sap/service/impl/SapBomServiceImpl.java | 187 +++++++++---- .../op/sap/service/impl/SapItemSyncImpl.java | 130 +++++++++ .../impl/SapWorkCenterServiceImpl.java | 169 ++++++++++++ .../main/java/com/op/sap/util/HandleEnum.java | 260 ++++++++++++++++++ .../op-sap/src/main/resources/bootstrap.yml | 4 +- .../mapper/sap/SapBomComponentMapper.xml | 2 + .../resources/mapper/sap/SapBomMapper.xml | 65 ++++- 15 files changed, 1000 insertions(+), 69 deletions(-) create mode 100644 op-modules/op-sap/src/main/java/com/op/sap.rar create mode 100644 op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java create mode 100644 op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java create mode 100644 op-modules/op-sap/src/main/java/com/op/sap/service/SapWorkCenterService.java create mode 100644 op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java create mode 100644 op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapWorkCenterServiceImpl.java create mode 100644 op-modules/op-sap/src/main/java/com/op/sap/util/HandleEnum.java diff --git a/op-modules/op-sap/src/main/java/com/op/sap.rar b/op-modules/op-sap/src/main/java/com/op/sap.rar new file mode 100644 index 0000000000000000000000000000000000000000..ff9aae695ecc89af12422f68bfd0a13ee80a0fef GIT binary patch literal 17797 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 literal 0 HcmV?d00001 diff --git a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java index 5ac5b038..62579b68 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/controller/SapController.java @@ -2,14 +2,10 @@ package com.op.sap.controller; import com.op.common.core.domain.R; import com.op.common.core.web.controller.BaseController; -import com.op.common.core.web.domain.AjaxResult; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; -import com.op.sap.service.SapBomService; +import com.op.sap.service.*; -import com.op.sap.service.SapMaterialPreparationService; -import com.op.sap.service.SapOrderService; -import com.op.sap.service.SapRouterService; import com.op.system.api.domain.sap.SapCreateOrder; import com.op.system.api.domain.sap.SapMaterialPreparation; import com.op.system.api.domain.sap.SapRFW; @@ -35,6 +31,12 @@ public class SapController extends BaseController { @Autowired private SapRouterService sapRouterService; + @Autowired + private SapItemSyncService sapItemSyncService; + + @Autowired + private SapWorkCenterService sapWorkCenterService; + /** * 订单同步接口 * @return @@ -49,17 +51,18 @@ public class SapController extends BaseController { * 物料同步接口 * @return */ -// @PostMapping("/itemSync") -// public List itemSync(){ -// return sapService.itemSync(); -// } + @PostMapping("/itemSync") + @Log(title = "同步SAP物料清单", businessType = BusinessType.SAP) + public R itemSync(){ + return sapItemSyncService.itemSync(); + } /** * 物料清单同步接口 * @return */ @PostMapping("/bomSync") - @Log(title = "同步SAP物料清单", businessType = BusinessType.SAP) + @Log(title = "同步SAP物料组件清单", businessType = BusinessType.SAP) public R bomSync(){ return sapBomService.bomSync(); } @@ -99,6 +102,11 @@ public class SapController extends BaseController { return sapOrderService.sapCloseOrder(shopOrder); } + /** + * 报工 + * @param sapRFW + * @return + */ @PostMapping("/sapRFWOrder") @Log(title = "生产订单报工接口", businessType = BusinessType.SAP) public R sapRFWOrder(@RequestBody SapRFW sapRFW){ @@ -106,9 +114,42 @@ public class SapController extends BaseController { } + /** + * 工艺路线同步 + * @return + */ @PostMapping("/sapRouterSync") + @Log(title = "工艺路线同步接口", businessType = BusinessType.SAP) public R sapRouerSync() { return sapRouterService.sapRouterSync(); } + /** + * 工作中心 + */ + @PostMapping("/sapWorkCenterSync") + @Log(title = "工作中心接口", businessType = BusinessType.SAP) + public R sapWorkCenterSync(){ + return sapWorkCenterService.sapWorkCenterSync(); + } + /** + *供应商主数据接口 + */ + @PostMapping("/sapSupplierSync") + @Log(title = "供应商主数据", businessType = BusinessType.SAP) + public R sapSupplierSync(){ + return sapWorkCenterService.sapSupplierSync(); + } + + /** + * 客户主数据接口 + * @return + */ + + @PostMapping("/sapCustomSync") + @Log(title = "客户主数据", businessType = BusinessType.SAP) + public R sapCustomSync(){ + return sapWorkCenterService.sapCustomSync(); + } + } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java new file mode 100644 index 00000000..2981cdd7 --- /dev/null +++ b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapMaterialPreparation.java @@ -0,0 +1,125 @@ +package com.op.sap.domain; + + +public class SapMaterialPreparation { + //订单号 + private String AUFNR; + //预留/相关需求的项目编号 + private String RSPOS; + //物料号 + private String MATNR; + //物料描述（短文本） + private String MAKTX; + //工厂 + private String WERKS; + //库存地点 + private String LGORT; + //组件的需求日期 + private String BDTER; + //需求量 + private String BDMNG; + //欠料数量 + private String ZQLSL; + //基本计量单位 + private String MEINS; + //标识：反冲 + private String RGEKZ; + //直接采购标识 + private String DBSKZ; + + public String getAUFNR() { + return AUFNR; + } + + public void setAUFNR(String AUFNR) { + this.AUFNR = AUFNR; + } + + public String getRSPOS() { + return RSPOS; + } + + public void setRSPOS(String RSPOS) { + this.RSPOS = RSPOS; + } + + public String getMATNR() { + return MATNR; + } + + public void setMATNR(String MATNR) { + this.MATNR = MATNR; + } + + public String getMAKTX() { + return MAKTX; + } + + public void setMAKTX(String MAKTX) { + this.MAKTX = MAKTX; + } + + public String getWERKS() { + return WERKS; + } + + public void setWERKS(String WERKS) { + this.WERKS = WERKS; + } + + public String getLGORT() { + return LGORT; + } + + public void setLGORT(String LGORT) { + this.LGORT = LGORT; + } + + public String getBDTER() { + return BDTER; + } + + public void setBDTER(String BDTER) { + this.BDTER = BDTER; + } + + public String getBDMNG() { + return BDMNG; + } + + public void setBDMNG(String BDMNG) { + this.BDMNG = BDMNG; + } + + public String getZQLSL() { + return ZQLSL; + } + + public void setZQLSL(String ZQLSL) { + this.ZQLSL = ZQLSL; + } + + public String getMEINS() { + return MEINS; + } + + public void setMEINS(String MEINS) { + this.MEINS = MEINS; + } + + public String getRGEKZ() { + return RGEKZ; + } + + public void setRGEKZ(String RGEKZ) { + this.RGEKZ = RGEKZ; + } + + public String getDBSKZ() { + return DBSKZ; + } + + public void setDBSKZ(String DBSKZ) { + this.DBSKZ = DBSKZ; + } +} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java index 725a9ee9..95e1a4e6 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBomMapper.java @@ -4,16 +4,20 @@ import com.op.system.api.domain.sap.SapBom; import com.op.system.api.domain.sap.SapBomComponent; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface SapBomMapper { /** * 新增BOM物料管理 * - * @param sapBom BOM物料管理 - * @return 结果 */ + List selectBaseBomByBomCode(String bomCode); + public int insertBaseBom(SapBom sapBom); + void insertBaseBomBatch(List sapBomList); + public int insertBasetBomComponent(SapBomComponent sapBomComponent); } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapBomService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapBomService.java index ff1c1cbe..8de4fe3f 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapBomService.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapBomService.java @@ -2,7 +2,10 @@ package com.op.sap.service; import com.op.common.core.domain.R; import com.op.common.core.web.domain.AjaxResult; +import com.op.system.api.domain.sap.SapBom; public interface SapBomService { public R bomSync(); + + SapBom getMaxRevisionBom(String STLNR); } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java new file mode 100644 index 00000000..1260ae77 --- /dev/null +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapItemSyncService.java @@ -0,0 +1,17 @@ +package com.op.sap.service; + +import com.op.common.core.domain.R; + +import java.util.List; + +/** + * 杨万里 2023年8月 + */ +public interface SapItemSyncService { + + /** + * 物料同步 + * @return + */ + R itemSync(); +} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java index bcb7437a..f5dfa4be 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java @@ -8,12 +8,38 @@ import com.op.system.api.model.SapProOrder; import java.util.List; +/** + * 杨万里 2023年8月 + */ public interface SapOrderService { + /** + * 订单同步 + * @param sapProOrder + * @return + */ R> shopOrderSync(SapProOrder sapProOrder); + + /** + * 订单创建 + * @param sapCreateOrderList + * @return + */ R> SapCreateOrder(List sapCreateOrderList); + /** + * 订单关闭 + * @param shopOrder + * @return + */ + R sapCloseOrder(String shopOrder); + /** + * 订单报工 + * @param sapRFW + * @return + */ + R sapRFWOrder(SapRFW sapRFW); } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapWorkCenterService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapWorkCenterService.java new file mode 100644 index 00000000..db9a72fd --- /dev/null +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapWorkCenterService.java @@ -0,0 +1,12 @@ +package com.op.sap.service; + +import com.op.common.core.domain.R; + +public interface SapWorkCenterService { + + R sapWorkCenterSync(); + + R sapSupplierSync(); + + R sapCustomSync(); +} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBomServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBomServiceImpl.java index 6aca333e..9cfd7cb6 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBomServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBomServiceImpl.java @@ -4,7 +4,11 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.constant.Constants; import com.op.common.core.domain.R; import com.op.common.core.exception.ServiceException; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; +import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.sap.util.HandleEnum; import com.op.system.api.domain.sap.SapBom; import com.op.system.api.domain.sap.SapBomComponent; import com.op.sap.mapper.SapBomComponentMapper; @@ -13,14 +17,15 @@ import com.op.sap.service.SapBomService; import com.op.sap.util.SAPConnUtils; import com.sap.conn.jco.*; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.TreeSet; +import java.util.*; import java.util.stream.Collectors; @Service @@ -32,6 +37,9 @@ public class SapBomServiceImpl implements SapBomService { @Autowired private SapBomComponentMapper sapBomComponentMapper; + @Autowired + private SqlSessionFactory sqlSessionFactory; + @Override public R bomSync() { @@ -52,10 +60,10 @@ public class SapBomServiceImpl implements SapBomService { // jCoTable.setValue(Constants.LOW, "00012222"); JCoTable jCoTables = func.getTableParameterList().getTable("S_MATNR"); - jCoTables.appendRow(); - jCoTables.setValue(Constants.SIGN, "I"); - jCoTables.setValue(Constants.OPTION, "EQ"); - jCoTables.setValue(Constants.LOW, "000000010101000115"); +// jCoTables.appendRow(); +// jCoTables.setValue(Constants.SIGN, "I"); +// jCoTables.setValue(Constants.OPTION, "EQ"); +// jCoTables.setValue(Constants.LOW, "000000010101000115"); JCoTable S_WERKS_jCoTables = func.getTableParameterList().getTable("S_WERKS"); S_WERKS_jCoTables.appendRow(); @@ -68,15 +76,14 @@ public class SapBomServiceImpl implements SapBomService { JCoTable maraTable = func.getTableParameterList().getTable("LT_BOM"); JCoRecordMetaData metaData = maraTable.getRecordMetaData(); System.out.println("###" + metaData.toString()); - SapBom sapBom = new SapBom(); - SapBomComponent sapBomComponent=new SapBomComponent(); - DynamicDataSourceContextHolder.push("op_xiaolan"); + + + List sapBomList=new ArrayList<>(); + List sapBomComponentList=new ArrayList<>(); + for (int i = 0; i < maraTable.getNumRows(); i++) { maraTable.setRow(i); String STLNR = maraTable.getString("STLNR"); - if (STLNR == null || STLNR.equals("")){ - throw new ServiceException("组件清单码为空"); - } String MATNR = maraTable.getString("MATNR"); String MAKTX = maraTable.getString("MAKTX"); String WERKS = maraTable.getString("WERKS"); @@ -107,40 +114,59 @@ public class SapBomServiceImpl implements SapBomService { String BEIKZ = maraTable.getString("BEIKZ"); String BEIKZ_NM = maraTable.getString("BEIKZ_NM"); String SANKA = maraTable.getString("SANKA"); - System.out.println("物料编码：" + MATNR + - " - 物料名称：" + MAKTX + " - 工厂：" + WERKS + - " - 生产版本：" + VERID + " - BOM单号：" + STLNR - + " - 可选BOM：" + STLAL + " - 创建日期：" + ANDAT + " - 创建者：" + ANNAM + - " - 修改日期：" + AEDAT + " - 修改者：" + AENAM - + " - 生产版本有效期：" + ADATU + " - 生产版本截止日期：" + BDATU + " - BOM计算数量：" + LOSGR + - " - BOM计算单位：" + MEINS + - " - BOM基本数量：" + BMENG + " - BOM基本单位：" + BMEIN + " - BOM层次：" + STUFE + " - 项目编号：" + WEGXX - + " - 组件编码：" + PMATNR + " - 组件名称：" + PMAKTX + " - 组件上层物料名称：" + OJTXB - + " - 标准用量：" + PMENGE + " - 损耗率：" + PAUSCH + " - 损耗额：" + PXHLCE + " - 含损耗用量：" + PMNGKO - + " - 组件数量单位：" + PMEINS + " - 组件采购标志：" + PBESKZ + " - 物料供应标识：" + BEIKZ + " - 物料供应标识：" + BEIKZ_NM - + " - 成本核算标识相关：" + SANKA); -// sapBom.setFactoryCode(WERKS); -// sapBom.setProductionVersion(VERID); -// sapBom.setBomCode(STLNR); -// sapBom.setOptionalBom(STLAL); -// sapBom.setPvvd(DateUtils.dateTime("yyyy-MM-dd", ADATU)); -// sapBom.setPved(DateUtils.dateTime("yyyy-MM-dd", BDATU)); -// sapBom.setBomCalculateNumber(new BigDecimal(LOSGR)); -// sapBom.setBomCalculateUnit(MEINS); -// sapBom.setBomBaseNumber(new BigDecimal(BMENG)); -// sapBom.setBomBaseUnit(BMEIN); -// sapBom.setComponentUnit(PMEINS); -// sapBom.setComponentProFlag(PBESKZ); -// sapBom.setCreateBy(ANNAM); -// // sapBom.setCreateTime(DateUtils.dateTime("yyyy-MM-dd", ANDAT)); -// sapBom.setUpdateBy(AENAM); -// // sapBom.setUpdateTime(DateUtils.dateTime("yyyy-MM-dd", AEDAT)); + String OJMBR = maraTable.getString("OJMBR"); + + if (!StringUtils.isEmpty(STLAL)){ + System.out.println("物料编码：" + MATNR + + " - 物料名称：" + MAKTX + " - 工厂：" + WERKS + + " - 生产版本：" + VERID + " - BOM单号：" + STLNR + + " - 可选BOM：" + STLAL + " - 创建日期：" + ANDAT + " - 创建者：" + ANNAM + + " - 修改日期：" + AEDAT + " - 修改者：" + AENAM + + " - 生产版本有效期：" + ADATU + " - 生产版本截止日期：" + BDATU + " - BOM计算数量：" + LOSGR + + " - BOM计算单位：" + MEINS + + " - BOM基本数量：" + BMENG + " - BOM基本单位：" + BMEIN + " - BOM层次：" + STUFE + " - 项目编号：" + WEGXX + + " - 组件编码：" + PMATNR + " - 组件名称：" + PMAKTX + " - 组件上层物料编码：" + OJMBR+" - 组件上层物料名称：" + OJTXB + + " - 标准用量：" + PMENGE + " - 损耗率：" + PAUSCH + " - 损耗额：" + PXHLCE + " - 含损耗用量：" + PMNGKO + + " - 组件数量单位：" + PMEINS + " - 组件采购标志：" + PBESKZ + " - 物料供应标识：" + BEIKZ + " - 物料供应标识：" + BEIKZ_NM + + " - 成本核算标识相关：" + SANKA); + } + + + + //插入BOM表 + //BomBO + /** + * 查询是否有此BOM清单 + */ + SapBom sapBom = new SapBom(); + sapBom.setFactoryCode(WERKS); + sapBom.setProductionVersion(STLAL); + sapBom.setBomCode(STLNR); + sapBom.setCumc(OJMBR); + sapBom.setComponent(PMATNR); + sapBom.setOptionalBom(STLAL); + sapBom.setPvvd(DateUtils.dateTime("yyyy-MM-dd", ADATU)); + sapBom.setPved(DateUtils.dateTime("yyyy-MM-dd", BDATU)); + sapBom.setBomCalculateNumber(new BigDecimal(LOSGR)); + sapBom.setBomCalculateUnit(MEINS); + sapBom.setBomBaseNumber(new BigDecimal(BMENG)); + sapBom.setBomBaseUnit(BMEIN); + sapBom.setComponentUnit(PMEINS); + sapBom.setComponentProFlag(PBESKZ); + // sapBom.setCurrentVersion(""); + sapBom.setCreateBy(ANNAM); + sapBom.setCreateTime(DateUtils.dateTime("yyyy-MM-dd", ANDAT)); + sapBom.setUpdateBy(AENAM); + sapBom.setUpdateTime(DateUtils.dateTime("yyyy-MM-dd", AEDAT)); + + SapBomComponent sapBomComponent=new SapBomComponent(); sapBomComponent.setBomCode(STLNR); - sapBomComponent.setSite(WERKS); + sapBomComponent.setSite("1000"); sapBomComponent.setMsi(BEIKZ); sapBomComponent.setSanka(SANKA); sapBomComponent.setProductCode(MATNR); - sapBomComponent.setCumc(OJTXB); + sapBomComponent.setCumc(OJMBR); + sapBomComponent.setComponent(PMATNR); sapBomComponent.setBomHierarchy(STUFE); sapBomComponent.setProjectNo(WEGXX); sapBomComponent.setStandardDosage(new BigDecimal(PMENGE)); @@ -148,13 +174,13 @@ public class SapBomServiceImpl implements SapBomService { sapBomComponent.setLossAmount(new BigDecimal(PXHLCE)); sapBomComponent.setCilosses(new BigDecimal(PMNGKO)); sapBomComponent.setCreateBy(ANNAM); - // sapBomComponent.setCreateTime(DateUtils.dateTime("yyyy-MM-dd", ANDAT)); + sapBomComponent.setCreateTime(DateUtils.dateTime("yyyy-MM-dd", ANDAT)); sapBomComponent.setUpdateBy(AENAM); - // sapBomComponent.setUpdateTime(DateUtils.dateTime("yyyy-MM-dd", AEDAT)); - // sapBomList.add(sapBom); - // sapBomComponentMapper.insertSapBomComponent(sapBomComponent); + sapBomComponent.setUpdateTime(DateUtils.dateTime("yyyy-MM-dd", AEDAT)); + sapBomComponentList.add(sapBomComponent); + sapBomList.add(sapBom); } - // inserBaseBom(sapBomList); + createBOM(sapBomList,sapBomComponentList); return R.ok(); } catch (Exception e) { return R.fail(e.getMessage()); @@ -162,10 +188,65 @@ public class SapBomServiceImpl implements SapBomService { } } - public void inserBaseBom(List sapBomList){ - sapBomList = sapBomList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(SapBom::getBomCode))), ArrayList::new)); - for (SapBom sapBom:sapBomList) { - sapBomMapper.insertBaseBom(sapBom); + @Override + public SapBom getMaxRevisionBom(String STLNR) { + List list = sapBomMapper.selectBaseBomByBomCode(STLNR); + if (list == null || list.size() <= 0) { + return null; + } + + return list.get(0); + } + + public void createBOM(List sapBomList,List sapBomComponentList){ + List newBomList = sapBomList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(SapBom::getBomCode))), ArrayList::new)); + if (newBomList.size()>0){ + DynamicDataSourceContextHolder.push("ds_1000"); + SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false); + for (SapBom sapBom:newBomList) { + List sapBomComponents; + //查询Bom号是否存在 + SapBom bomModel = this.getMaxRevisionBom(sapBom.getBomCode()); + //存在且版本号大于现有版本 + if (bomModel!=null&&sapBom.getOptionalBom()!=null&&Float.parseFloat(sapBom.getOptionalBom())>Float.parseFloat(bomModel.getOptionalBom())) + { + //升级BOM + String bomBo = HandleEnum.BOM.getHandle(sapBom.getFactoryCode(),sapBom.getBomCode(),sapBom.getOptionalBom()); + sapBom.setBomBo(bomBo); + //插入BOM表 + sapBomMapper.insertBaseBom(sapBom); + //筛选组件清单 + sapBomComponents = sapBomComponentList.stream().filter(sbc-> + sbc.getBomCode().equals(sapBom.getBomCode())).collect(Collectors.toList()); + //执行插入 + + sapBomComponents.stream().forEach(components -> { + components.setBomBo(bomBo); + sapBomComponentMapper.insertSapBomComponent(components); + }); + + } + else if (bomModel==null&&sapBom.getOptionalBom()!=null){ + //插入初始BOM + String bomBo = HandleEnum.BOM.getHandle(sapBom.getFactoryCode(),sapBom.getBomCode(),sapBom.getOptionalBom()); + sapBom.setBomBo(bomBo); + //插入BOM表 + sapBomMapper.insertBaseBom(sapBom); + //筛选组件清单 + sapBomComponents = sapBomComponentList.stream().filter(sbc-> + sbc.getBomCode().equals(sapBom.getBomCode())).collect(Collectors.toList()); + //执行插入 + sapBomComponents.stream().forEach(components -> { + components.setBomBo(bomBo); + sapBomComponentMapper.insertSapBomComponent(components); + }); + + } + sqlSession.commit(); + sqlSession.clearCache(); + + } + } } diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java new file mode 100644 index 00000000..10f7206d --- /dev/null +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -0,0 +1,130 @@ +package com.op.sap.service.impl; + +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import com.op.common.core.constant.Constants; +import com.op.common.core.domain.R; +import com.op.sap.mapper.SapBaseProductMapper; +import com.op.sap.service.SapItemSyncService; +import com.op.sap.util.SAPConnUtils; +import com.op.system.api.domain.sap.SapBaseProduct; +import com.sap.conn.jco.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; + +@Service +public class SapItemSyncImpl implements SapItemSyncService { + @Autowired + private SapBaseProductMapper sapBaseProductMapper; + @Override + public R itemSync() { + try { + // 获取调用 RFC 函数对象 + //获取连接 + JCoDestination dest = SAPConnUtils.connect(); + JCoRepository repository = dest.getRepository(); + JCoFunction func = repository.getFunction("ZMMR_MES_MAT_GET"); + if (func == null) { + throw new RuntimeException("Function does not exist in SAP"); + } + + JCoTable jCoTables = func.getTableParameterList().getTable("S_MATNR"); + System.out.println(jCoTables); +// jCoTables.appendRow(); +// jCoTables.setValue(Constants.SIGN, "I"); +// jCoTables.setValue(Constants.OPTION, "EQ"); +// jCoTables.setValue(Constants.LOW, "000000010101000115"); + // 获取调用 RFC 函数对象 + func.execute(dest); + // 获取 内表 - ZMES_PRO + JCoTable maraTable = func.getTableParameterList().getTable("LT_MARA"); + JCoRecordMetaData metaData = maraTable.getRecordMetaData(); + System.out.println("###" + metaData.toString()); + DynamicDataSourceContextHolder.push("ds_1000"); + for (int i = 0; i < maraTable.getNumRows(); i++) { + SapBaseProduct baseProduct = new SapBaseProduct(); + maraTable.setRow(i); + String MATNR = maraTable.getString("MATNR"); + String MAKTX = maraTable.getString("MAKTX"); + String EAN11 = maraTable.getString("EAN11"); + String MTART = maraTable.getString("MTART"); + String MTBEZ = maraTable.getString("MTBEZ"); + String MATKL = maraTable.getString("MATKL"); + String WGBEZ = maraTable.getString("WGBEZ"); + BigDecimal BRGEW = maraTable.getBigDecimal("BRGEW"); + BigDecimal NTGEW = maraTable.getBigDecimal("NTGEW"); + BigDecimal VOLUM = maraTable.getBigDecimal("VOLUM"); + String VOLEH = maraTable.getString("VOLEH"); + String MEINS = maraTable.getString("MEINS"); + String MEINH = maraTable.getString("MEINH"); + String UMREZ = maraTable.getString("UMREZ"); + String UMREN = maraTable.getString("UMREN"); + String LVORM = maraTable.getString("LVORM"); + String MENGE = maraTable.getString("MENGE"); + String MHDHB = maraTable.getString("MHDHB"); + String SPART = maraTable.getString("SPART"); + String SPART_NM = maraTable.getString("SPART_NM"); + String MVGR1 = maraTable.getString("MVGR1"); + String MVGR1_NM = maraTable.getString("MVGR1_NM"); + String MVGR2 = maraTable.getString("MVGR2"); + String MVGR2_NM = maraTable.getString("MVGR2_NM"); + String MVGR3 = maraTable.getString("MVGR3"); + String MVGR3_NM = maraTable.getString("MVGR3_NM"); + String MVGR4 = maraTable.getString("MVGR4"); + String MVGR4_NM = maraTable.getString("MVGR4_NM"); + String MVGR5 = maraTable.getString("MVGR5"); + String MVGR5_NM = maraTable.getString("MVGR5_NM"); + // String SANKA = maraTable.getString("SANKA"); + System.out.println( + "物料号：" + MATNR+ + "物料描述（短文本）：" + MAKTX+ + "国际文件号(EAN/UPC)：" + EAN11+ + "物料类型：" + MTART+ + "物料类型描述：" + MTBEZ+ + "物料组：" + MATKL+ + "物料组描述：" + WGBEZ+ + "毛重：" + BRGEW+ + "净重：" + NTGEW+ + "体积：" + VOLUM+ + "体积单位：" + VOLEH+ + "基本计量单位：" + MEINS+ + "帐面库存单位的可选计量单位 ：" + MEINH+ + "基本计量单位转换分子：" + UMREZ+ + "转换为基本计量单位的分母：" + UMREN+ + "在客户级标记要删除的物料：" + LVORM+ + "数量：" + MENGE+ + "总货架寿命 ：" + MHDHB+ + "产品组：" + SPART+ + "产品组描述：" + SPART_NM+ + "物料组1：" + MVGR1+ + "物料组1描述：" + MVGR1_NM+ + "物料组2：" + MVGR2+ + "物料组2描述：" + MVGR2_NM+ + " 物料组3：" + MVGR3+ + " 物料组描述 ：" + MVGR3_NM); + //查询物料存不存在 + baseProduct.setProductCode(MATNR); + SapBaseProduct sapBaseProduct=sapBaseProductMapper.selectBaseProductByProductCode(baseProduct); + if (sapBaseProduct==null){ + sapBaseProduct.setProductCode(MATNR); + sapBaseProduct.setProductDescZh(MAKTX); +// baseProduct.setProductean11(EAN11); + sapBaseProduct.setProductGroup(MATKL); + sapBaseProduct.setProductGroupName(WGBEZ); + sapBaseProduct.setGrossWeight(BRGEW); + sapBaseProduct.setNetWeight(NTGEW); + sapBaseProduct.setVolume(VOLUM); + sapBaseProduct.setDelFlag("0"); + // sapBaseProductMapper.insertBaseProduct(sapBaseProduct); + } + + + } + return R.ok(); + + }catch (Exception e){ + return R.fail(e.getMessage()); + } + } +} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapWorkCenterServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapWorkCenterServiceImpl.java new file mode 100644 index 00000000..f47253d6 --- /dev/null +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapWorkCenterServiceImpl.java @@ -0,0 +1,169 @@ +package com.op.sap.service.impl; + +import com.op.common.core.domain.R; +import com.op.common.core.utils.DateUtils; +import com.op.sap.service.SapWorkCenterService; +import com.op.sap.util.SAPConnUtils; +import com.op.system.api.domain.sap.SapWorkCenter; +import com.sap.conn.jco.*; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class SapWorkCenterServiceImpl implements SapWorkCenterService { + + @Override + public R sapWorkCenterSync() { + try { + // 获取调用 RFC 函数对象 + //获取连接 + JCoDestination dest = SAPConnUtils.connect(); + JCoRepository repository = dest.getRepository(); + JCoFunction func = repository.getFunction("ZMES_GET_ARBPL"); + if (func == null) { + throw new RuntimeException("Function does not exist in SAP"); + } + // 配置传入参数 + JCoTable jCoTable = func.getTableParameterList().getTable("S_WERKS"); +// jCoTable.appendRow(); +// jCoTable.setValue("SIGN", "I"); +// jCoTable.setValue("OPTION", "EQ"); +// jCoTable.setValue("LOW", "1000"); + func.execute(dest);//执行调用函数 + // 获取 内表 - ZMES_PRO + JCoTable maraTable = func.getTableParameterList().getTable("LT_ARBPL"); + JCoRecordMetaData metaData = maraTable.getRecordMetaData(); + System.out.println("###" + metaData.toString()); + List sapWorkCenterList=new ArrayList<>(); + for (int i = 0; i sapWorkCenterList=new ArrayList<>(); + for (int i = 0; i sapWorkCenterList=new ArrayList<>(); + for (int i = 0; i = parts.length) { + return null; + } else { + return parts[position]; + } + } + + public String getPrefix() { + return prefix; + } +} diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml index 14dae316..6981aeea 100644 --- a/op-modules/op-sap/src/main/resources/bootstrap.yml +++ b/op-modules/op-sap/src/main/resources/bootstrap.yml @@ -14,12 +14,12 @@ spring: nacos: discovery: namespace: lanju-op - group: zxl + group: ywl # 服务注册地址 server-addr: 140.249.53.142:8848 config: namespace: lanju-op - group: zxl + group: ywl #命名空间 #group: local # 配置中心地址 diff --git a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomComponentMapper.xml b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomComponentMapper.xml index 0465b9e6..85282fa3 100644 --- a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomComponentMapper.xml +++ b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomComponentMapper.xml @@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into base_bom_component id, + bom_bo, bom_code, site, product_code, @@ -94,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id}, + #{bomBo}, #{bomCode}, #{site}, #{productCode}, diff --git a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml index d1cdb9e2..34b049ec 100644 --- a/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml +++ b/op-modules/op-sap/src/main/resources/mapper/sap/SapBomMapper.xml @@ -60,14 +60,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where factory_code = #{factoryCode} + where bom_code = #{bomCode} + order by production_version desc insert into base_bom + bom_bo, factory_code, production_version, bom_code, @@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" current_version, + #{bomBo}, #{factoryCode}, #{productionVersion}, #{bomCode}, @@ -120,6 +123,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{currentVersion}, + + insert into base_bom + + bom_bo, + factory_code, + production_version, + bom_code, + optional_bom, + optional_bom_text, + pvvd, + pved, + bom_calculate_number, + bom_calculate_unit, + bom_base_number, + bom_base_unit, + component_unit, + component_pro_flag, + msi, + sanka, + attr1, + attr2, + attr3, + create_by, + create_time, + update_by, + update_time, + remark, + current_version, + + VALUES + + #{bomBo}, + #{factoryCode}, + #{productionVersion}, + #{bomCode}, + #{optionalBom}, + #{optionalBomText}, + #{pvvd}, + #{pved}, + #{bomCalculateNumber}, + #{bomCalculateUnit}, + #{bomBaseNumber}, + #{bomBaseUnit}, + #{componentUnit}, + #{componentProFlag}, + #{msi}, + #{sanka}, + #{attr1}, + #{attr2}, + #{attr3}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{currentVersion}, + + update base_bom