diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteMesService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteMesService.java index d7cccf97..d0527ab9 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteMesService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteMesService.java @@ -4,6 +4,7 @@ import com.op.common.core.constant.ServiceNameConstants; import com.op.common.core.domain.BaseFileData; import com.op.common.core.domain.R; +import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.factory.RemoteMesFallbackFactory; import com.op.system.api.model.SapProOrder; import org.springframework.cloud.openfeign.FeignClient; @@ -25,5 +26,11 @@ public interface RemoteMesService { @PostMapping("/file/upLoadFile") public R upLoadFile(@RequestBody List files); + /**下一工序机台集合获取**/ + @PostMapping("/wcsInterface/requestDestinationStations") + public R requestDestinationStations(@RequestBody WCSDTO wCSDTO); + /**获取领料单**/ + @PostMapping("/prepare/getMesPrepare") + public R getMesPrepare(); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteMesFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteMesFallbackFactory.java index 87876431..b6c0c40c 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteMesFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteMesFallbackFactory.java @@ -4,6 +4,7 @@ import com.op.common.core.domain.BaseFileData; import com.op.common.core.domain.R; import com.op.system.api.RemoteMesService; +import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.model.SapProOrder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,6 +30,16 @@ public class RemoteMesFallbackFactory implements FallbackFactory upLoadFile(List files) { return R.fail("上传失败:" + throwable.getMessage()); } + + @Override + public R requestDestinationStations(WCSDTO wCSDTO) { + return R.fail("下一站点获取失败:" + throwable.getMessage()); + } + + @Override + public R getMesPrepare() { + return R.fail("领料单获取失败:" + throwable.getMessage()); + } }; } } diff --git a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java index 8fbb060c..d3804837 100644 --- a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java +++ b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java @@ -1,5 +1,7 @@ package com.op.job.task; +import com.op.system.api.RemoteMesService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.op.common.core.utils.StringUtils; @@ -10,6 +12,10 @@ import com.op.common.core.utils.StringUtils; */ @Component("ryTask") public class RyTask { + + @Autowired + private RemoteMesService remoteMesService; + public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) { System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i)); } @@ -22,4 +28,9 @@ public class RyTask { System.out.println("执行无参方法"); } + public void getMesPrepareTask(){ + System.out.println("++同步领料单+开始++getMesPrepareTask+++++"); + remoteMesService.getMesPrepare(); + } + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java index b5a4d632..cb42c990 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java @@ -3,6 +3,7 @@ package com.op.mes.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.common.core.domain.R; import com.op.common.core.utils.uuid.IdUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties; @@ -26,7 +27,7 @@ import com.op.common.core.web.page.TableDataInfo; /** * 备料单Controller - * + * * @author Open Platform * @date 2023-08-03 */ @@ -98,4 +99,11 @@ public class MesPrepareController extends BaseController { public AjaxResult remove(@PathVariable String[] prepareIds) { return toAjax(mesPrepareService.deleteMesPrepareByPrepareIds(prepareIds)); } + + @Log(title = "备料单", businessType = BusinessType.INSERT) + @PostMapping("/getMesPrepare") + public R getMesPrepare() { + return mesPrepareService.getMesPrepare(); + } + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java index 6aa48196..9550e625 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesPrepareDetail.java @@ -9,7 +9,7 @@ import com.op.common.core.web.domain.BaseEntity; /** * mes备料单明细对象 mes_prepare_detail - * + * * @author Open Platform * @date 2023-08-04 */ @@ -41,7 +41,9 @@ public class MesPrepareDetail extends BaseEntity { /** 生产数量 */ @Excel(name = "生产数量") - private Long quantity; + private String quantity; + + private String fundQuanlity; /** 工单生产日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -75,11 +77,57 @@ public class MesPrepareDetail extends BaseEntity { /** 产品类型 */ @Excel(name = "产品类型") private String prodType; + /** 库位 */ + private String locator; + + private String needDate; + private String recoil; + private String buyFlag; + + public String getBuyFlag() { + return buyFlag; + } + + public void setBuyFlag(String buyFlag) { + this.buyFlag = buyFlag; + } /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String factoryCode; + public String getRecoil() { + return recoil; + } + + public void setRecoil(String recoil) { + this.recoil = recoil; + } + + public String getFundQuanlity() { + return fundQuanlity; + } + + public void setFundQuanlity(String fundQuanlity) { + this.fundQuanlity = fundQuanlity; + } + + public String getNeedDate() { + return needDate; + } + + public void setNeedDate(String needDate) { + this.needDate = needDate; + } + + public String getLocator() { + return locator; + } + + public void setLocator(String locator) { + this.locator = locator; + } + public void setRecordId(String recordId) { this.recordId = recordId; } @@ -122,11 +170,11 @@ public class MesPrepareDetail extends BaseEntity { public String getUnit() { return unit; } - public void setQuantity(Long quantity) { + public void setQuantity(String quantity) { this.quantity = quantity; } - public Long getQuantity() { + public String getQuantity() { return quantity; } public void setProductDate(Date productDate) { diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java index 0c00dd2d..ded1e74f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesPrepareDetailMapper.java @@ -3,17 +3,18 @@ package com.op.mes.mapper; import java.util.List; import com.op.mes.domain.MesPrepareDetail; +import org.apache.ibatis.annotations.Param; /** * mes备料单明细Mapper接口 - * + * * @author Open Platform * @date 2023-08-04 */ public interface MesPrepareDetailMapper { /** * 查询mes备料单明细 - * + * * @param recordId mes备料单明细主键 * @return mes备料单明细 */ @@ -21,7 +22,7 @@ public interface MesPrepareDetailMapper { /** * 查询mes备料单明细列表 - * + * * @param mesPrepareDetail mes备料单明细 * @return mes备料单明细集合 */ @@ -29,7 +30,7 @@ public interface MesPrepareDetailMapper { /** * 新增mes备料单明细 - * + * * @param mesPrepareDetail mes备料单明细 * @return 结果 */ @@ -37,7 +38,7 @@ public interface MesPrepareDetailMapper { /** * 修改mes备料单明细 - * + * * @param mesPrepareDetail mes备料单明细 * @return 结果 */ @@ -45,7 +46,7 @@ public interface MesPrepareDetailMapper { /** * 删除mes备料单明细 - * + * * @param recordId mes备料单明细主键 * @return 结果 */ @@ -53,9 +54,11 @@ public interface MesPrepareDetailMapper { /** * 批量删除mes备料单明细 - * + * * @param recordIds 需要删除的数据主键集合 * @return 结果 */ public int deleteMesPrepareDetailByRecordIds(String[] recordIds); + + public void insertMesPrepareDetails(@Param("list") List details); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java index 355a16ba..9dbed40f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java @@ -1,15 +1,18 @@ package com.op.mes.service.impl; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; +import com.alibaba.fastjson.JSON; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.common.security.utils.SecurityUtils; +import com.op.mes.domain.MesPrepareDetail; import com.op.mes.mapper.MesPrepareDetailMapper; import com.op.system.api.RemoteSapService; import com.op.system.api.RemoteUserService; @@ -148,12 +151,66 @@ public class MesPrepareServiceImpl implements IMesPrepareService { List list = sapMaterialPreparationList.stream() .filter(a->a.getWERKS().equals(poolName)) .collect(Collectors.toList()); - for(SapMaterialPreparation sap:list){ + //取出各单位集合中所有单位名称 + Set orderCodes = list.stream().map(SapMaterialPreparation::getAUFNR).collect(Collectors.toSet()); + for(String orderCode : orderCodes){ + /**mes_prepare**/ + String mesPrepareId = IdUtils.fastSimpleUUID(); + MesPrepare mesPrepare = new MesPrepare(); + mesPrepare.setPrepareId(mesPrepareId); + mesPrepare.setWorkorderCode(orderCode);//工单(子) + mesPrepare.setCreateTime(DateUtils.getNowDate()); + mesPrepare.setCreateBy(SecurityUtils.getUsername()); + mesPrepare.setStatus("L0");//默认待确认 + mesPrepareMapper.insertMesPrepare(mesPrepare); + /**mes_prepare_detail**/ + List details = new ArrayList<>(); + List listdetails = list.stream() + .filter(a->a.getAUFNR().equals(orderCode)) + .collect(Collectors.toList()); + MesPrepareDetail detail = null; + Date createDate = DateUtils.getNowDate(); + for(SapMaterialPreparation sap:listdetails){ + detail = new MesPrepareDetail(); + detail.setPrepareId(mesPrepareId); + detail.setRecordId(IdUtils.fastSimpleUUID()); + detail.setAttr1(sap.getRSPOS());//预留/相关需求的项目编号 + detail.setMaterialCode(sap.getMATNR());//物料号 + detail.setMaterailName(sap.getMAKTX());//物料描述（短文本） + detail.setFactoryCode(sap.getWERKS());//工厂 + detail.setLocator(sap.getLGORT());//库存地点 + detail.setNeedDate(sap.getBDTER());//组件的需求日期 + detail.setQuantity(sap.getBDMNG());////需求量 + detail.setFundQuanlity(sap.getZQLSL());//欠料数量 + detail.setUnit(sap.getMEINS());//基本计量单位 + detail.setRecoil(sap.getRGEKZ());//反冲标识 + detail.setBuyFlag(sap.getDBSKZ());//直接采购标识 + detail.setCreateBy(SecurityUtils.getUsername()); + detail.setCreateTime(createDate); + details.add(detail); + } + mesPrepareDetailMapper.insertMesPrepareDetails(details); } - /**mes_prepare**/ - //mesPrepareMapper.insertMesPrepare(); - /**mes_prepare_detail**/ - //mesPrepareDetailMapper.insertMesPrepareDetail() + + } + + public static void main(String args[]){ + List list = new ArrayList<>(); + SapMaterialPreparation p1 = new SapMaterialPreparation(); + p1.setAUFNR("1001"); + p1.setWERKS("1001a"); + list.add(p1); + SapMaterialPreparation p2 = new SapMaterialPreparation(); + p2.setAUFNR("1001"); + p2.setWERKS("1001b"); + list.add(p2); + SapMaterialPreparation p3 = new SapMaterialPreparation(); + p3.setAUFNR("1002"); + p3.setWERKS("1002a"); + list.add(p3); + //取出各单位集合中所有单位名称 + Set orderCodes = list.stream().map(SapMaterialPreparation::getAUFNR).collect(Collectors.toSet()); + System.out.println(JSON.toJSONString(orderCodes)); } } diff --git a/op-modules/op-mes/src/main/resources/mapper/MesPrepareDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/MesPrepareDetailMapper.xml index 8c63ac04..53c269c2 100644 --- a/op-modules/op-mes/src/main/resources/mapper/MesPrepareDetailMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/MesPrepareDetailMapper.xml @@ -110,8 +110,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{factoryCode}, + + INSERT INTO mes_prepare_detail ( + record_id,prepare_id,material_code,material_name,unit, + quantity,create_by,create_time,factory_code,status, + locator,need_date,recoil,fund_quanlity,buy_flag + )VALUES + + ( + #{list.recordId},#{list.prepareId},#{list.materialCode},#{list.materialName},#{list.unit}, + #{list.quantity},#{list.createBy},#{list.createTime},#{list.factoryCode},#{list.status}, + #{list.locator},#{list.needDate},#{list.recoil},#{list.fundQuanlity},#{list.buyFlag}, + ) + + + - + update mes_prepare_detail prepare_id = #{prepareId}, diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java index d91ee1eb..0669656b 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java @@ -3,14 +3,11 @@ package com.op.quality.service.serviceImpl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; -//import com.op.quality.domain.BaseFile; import com.op.quality.domain.BaseFile; import com.op.quality.domain.QcProCheck; -//import com.op.quality.mapper.BaseFileMapper; import com.op.quality.mapper.BaseFileMapper; import com.op.quality.mapper.QcProCheckMapper; import com.op.quality.service.QcProCheckService; -import com.sap.conn.jco.JCoException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; 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 6b9fff03..d671527b 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 @@ -1,10 +1,15 @@ package com.op.sap.controller; -import com.op.common.core.domain.R; +import com.op.common.core.utils.DateUtils; +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.*; +import com.op.sap.service.SapBomService; + +import com.op.sap.domain.SapBom; +import com.op.sap.service.SapMaterialPreparationService; +import com.op.sap.service.SapOrderService; import com.op.system.api.model.SapProOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -13,10 +18,8 @@ import java.util.List; @RestController @RequestMapping("/sap") -public class SapController { +public class SapController extends BaseController { - @Autowired - private SapService sapService; @Autowired private SapOrderService sapOrderService; @@ -32,9 +35,19 @@ public class SapController { */ @PostMapping("/shopOrderSync") @Log(title = "同步SAP订单", businessType = BusinessType.SAP) - public AjaxResult shopOrderSync(@RequestBody SapProOrder sapProOrder){ + public AjaxResult shopOrderSync(@RequestBody SapProOrder sapProOrder){ return sapOrderService.shopOrderSync(sapProOrder); } + + /** + * 物料同步接口 + * @return + */ +// @PostMapping("/itemSync") +// public List itemSync(){ +// return sapService.itemSync(); +// } + /** * 物料清单同步接口 * @return @@ -46,30 +59,17 @@ public class SapController { } /** - * 物料同步接口 + * 生产订单备料单接口 + * @param shopOrder * @return */ - @PostMapping("saveItem") - public R saveItem(){ - return sapService.sapItem(); - } - -// @PostMapping("saveBom") -// public R saveBom(){ -// return sapService.sapBom(); -// } - @PostMapping("saveProRoute") - public R saveProRoute(){return sapService.sapProRoute();} - @PostMapping("/sapProRouteProduct") - public R sapProRouteProduct(){ - return sapService.sapProRouteProduct(); - } - @PostMapping("/sapProRouteProcess") - public R sapProRouteProcess() { - return sapService.sapProRouteProcess(); + @PostMapping("/materialPreparation") + @Log(title = "生产订单备料单接口", businessType = BusinessType.SAP) + public AjaxResult materialPreparation(@RequestParam("shopOrder") String shopOrder){ + return sapMaterialPreparationService.MaterialPreparation(shopOrder); } - } +} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapBaseFile.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapBaseFile.java deleted file mode 100644 index 2994713f..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapBaseFile.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.op.sap.domain; - -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 附件对象 base_file - * - * @author Open Platform - * @date 2023-07-10 - */ -public class SapBaseFile extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 附件ID */ - private String fileId; - - /** 附件名称 */ - @Excel(name = "附件名称") - private String fileName; - - /** 附件地址 */ - @Excel(name = "附件地址") - private String fileAddress; - - /** 数据来源 */ - @Excel(name = "数据来源") - private String sourceId; - - /** 预留字段1 */ - @Excel(name = "预留字段1") - private String attr1; - - /** 预留字段2 */ - @Excel(name = "预留字段2") - private String attr2; - - /** 预留字段3 */ - @Excel(name = "预留字段3") - private Long attr3; - - /** 预留字段4 */ - @Excel(name = "预留字段4") - private Long attr4; - - public void setFileId(String fileId) { - this.fileId = fileId; - } - - public String getFileId() { - return fileId; - } - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public String getFileName() { - return fileName; - } - public void setFileAddress(String fileAddress) { - this.fileAddress = fileAddress; - } - - public String getFileAddress() { - return fileAddress; - } - public void setSourceId(String sourceId) { - this.sourceId = sourceId; - } - - public String getSourceId() { - return sourceId; - } - public void setAttr1(String attr1) { - this.attr1 = attr1; - } - - public String getAttr1() { - return attr1; - } - public void setAttr2(String attr2) { - this.attr2 = attr2; - } - - public String getAttr2() { - return attr2; - } - public void setAttr3(Long attr3) { - this.attr3 = attr3; - } - - public Long getAttr3() { - return attr3; - } - public void setAttr4(Long attr4) { - this.attr4 = attr4; - } - - public Long getAttr4() { - return attr4; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("fileId", getFileId()) - .append("fileName", getFileName()) - .append("fileAddress", getFileAddress()) - .append("sourceId", getSourceId()) - .append("remark", getRemark()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapBaseProduct.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapBaseProduct.java deleted file mode 100644 index d32ddc72..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapBaseProduct.java +++ /dev/null @@ -1,482 +0,0 @@ -package com.op.sap.domain; - -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.math.BigDecimal; - -/** - * 物料管理 base_product - * - * @author JGY - * @date 2023-07-18 - */ -public class SapBaseProduct extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 主键ID */ - private String productId; - - /** 物料编码 */ - @Excel(name = "物料编码") - private String productCode; - - /** 物料名称 */ - @Excel(name = "物料名称") - private String productDescZh; - - /** 物料名称 */ - @Excel(name = "物料型号") - private String productModel; - - /** 英文描述 */ - @Excel(name = "英文描述") - private String productDescEn; - - /** 序列号规则代码 */ - @Excel(name = "序列号规则代码") - private String ruleCode; - - /** 旧物料号 */ - @Excel(name = "旧物料号") - private String oldProductCode; - - /** 散件物料号 */ - @Excel(name = "散件物料号") - private String partsProductCode; - - /** 69码 */ - @Excel(name = "69码") - private String skuBarcode; - - /** 长 */ - @Excel(name = "长") - private BigDecimal length; - - /** 宽 */ - @Excel(name = "宽") - private BigDecimal width; - - /** 高 */ - @Excel(name = "高") - private BigDecimal height; - - /** 毛重 */ - @Excel(name = "毛重") - private BigDecimal grossWeight; - - /** 净重 */ - @Excel(name = "净重") - private BigDecimal netWeight; - - /** 皮重 */ - @Excel(name = "皮重") - private BigDecimal tareWeight; - - /** 体积 */ - @Excel(name = "体积") - private BigDecimal volume; - - /** 单价 */ - @Excel(name = "单价") - private BigDecimal unitPrice; - - /** 物料组 */ - @Excel(name = "物料类别组") - private String productGroup; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String productGroupName; - - /** 用户自定义1 */ - @Excel(name = "用户自定义1") - private String userDefined1; - - /** 用户自定义2 */ - @Excel(name = "用户自定义2") - private String userDefined2; - - /** 用户自定义3 */ - @Excel(name = "用户自定义3") - private String userDefined3; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String userDefined4; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String userDefined5; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String userDefined6; - - /** 工厂编码 */ - @Excel(name = "工厂编码") - private String factoryCode; - - /** 激活标记 */ - @Excel(name = "激活标记") - private String activeFlag; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String syncFlag; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String primaryUom; - - /** $column.columnComment */ - private String delFlag; - - /** 订单单位 */ - @Excel(name = "订单单位") - private String bstme; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private BigDecimal basicOrder; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private BigDecimal convOrder; - - /** 发货单位 */ - @Excel(name = "发货单位") - private String ausme; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private BigDecimal basicIssue; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private BigDecimal convIssue; - - /** 是否补料（0否 */ - @Excel(name = "是否补料", readConverterExp = "是否补料（0否") - private String appendFlag; - - /** 补料比例 */ - @Excel(name = "补料比例") - private String appendPercent; - - public void setProductId(String productId) { - this.productId = productId; - } - public String getProductId() { - return productId;} - - public void setProductCode(String productCode) { - this.productCode = productCode; - } - - public String getProductCode() { - return productCode; - } - public void setProductDescZh(String productDescZh) { - this.productDescZh = productDescZh; - } - - public String getProductDescZh() { - return productDescZh; - } - - public void setProductModel(String productModel) { - this.productModel = productModel; - } - - public String getProductModel() { - return productModel; - } - public void setProductDescEn(String productDescEn) { - this.productDescEn = productDescEn; - } - - public String getProductDescEn() { - return productDescEn; - } - public void setRuleCode(String ruleCode) { - this.ruleCode = ruleCode; - } - - public String getRuleCode() { - return ruleCode; - } - public void setOldProductCode(String oldProductCode) { - this.oldProductCode = oldProductCode; - } - - public String getOldProductCode() { - return oldProductCode; - } - public void setPartsProductCode(String partsProductCode) { - this.partsProductCode = partsProductCode; - } - - public String getPartsProductCode() { - return partsProductCode; - } - public void setSkuBarcode(String skuBarcode) { - this.skuBarcode = skuBarcode; - } - - public String getSkuBarcode() { - return skuBarcode; - } - public void setLength(BigDecimal length) { - this.length = length; - } - - public BigDecimal getLength() { - return length; - } - public void setWidth(BigDecimal width) { - this.width = width; - } - - public BigDecimal getWidth() { - return width; - } - public void setHeight(BigDecimal height) { - this.height = height; - } - - public BigDecimal getHeight() { - return height; - } - public void setGrossWeight(BigDecimal grossWeight) { - this.grossWeight = grossWeight; - } - - public BigDecimal getGrossWeight() { - return grossWeight; - } - public void setNetWeight(BigDecimal netWeight) { - this.netWeight = netWeight; - } - - public BigDecimal getNetWeight() { - return netWeight; - } - public void setTareWeight(BigDecimal tareWeight) { - this.tareWeight = tareWeight; - } - - public BigDecimal getTareWeight() { - return tareWeight; - } - public void setVolume(BigDecimal volume) { - this.volume = volume; - } - - public BigDecimal getVolume() { - return volume; - } - public void setUnitPrice(BigDecimal unitPrice) { - this.unitPrice = unitPrice; - } - - public BigDecimal getUnitPrice() { - return unitPrice; - } - public void setProductGroup(String productGroup) { - this.productGroup = productGroup; - } - - public String getProductGroup() { - return productGroup; - } - public void setProductGroupName(String productGroupName) { - this.productGroupName = productGroupName; - } - - public String getProductGroupName() { - return productGroupName; - } - public void setUserDefined1(String userDefined1) { - this.userDefined1 = userDefined1; - } - - public String getUserDefined1() { - return userDefined1; - } - public void setUserDefined2(String userDefined2) { - this.userDefined2 = userDefined2; - } - - public String getUserDefined2() { - return userDefined2; - } - public void setUserDefined3(String userDefined3) { - this.userDefined3 = userDefined3; - } - - public String getUserDefined3() { - return userDefined3; - } - public void setUserDefined4(String userDefined4) { - this.userDefined4 = userDefined4; - } - - public String getUserDefined4() { - return userDefined4; - } - public void setUserDefined5(String userDefined5) { - this.userDefined5 = userDefined5; - } - - public String getUserDefined5() { - return userDefined5; - } - public void setUserDefined6(String userDefined6) { - this.userDefined6 = userDefined6; - } - - public String getUserDefined6() { - return userDefined6; - } - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getFactoryCode() { - return factoryCode; - } - public void setActiveFlag(String activeFlag) { - this.activeFlag = activeFlag; - } - - public String getActiveFlag() { - return activeFlag; - } - public void setSyncFlag(String syncFlag) { - this.syncFlag = syncFlag; - } - - public String getSyncFlag() { - return syncFlag; - } - public void setPrimaryUom(String primaryUom) { - this.primaryUom = primaryUom; - } - - public String getPrimaryUom() { - return primaryUom; - } - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public String getDelFlag() { - return delFlag; - } - public void setBstme(String bstme) { - this.bstme = bstme; - } - - public String getBstme() { - return bstme; - } - public void setBasicOrder(BigDecimal basicOrder) { - this.basicOrder = basicOrder; - } - - public BigDecimal getBasicOrder() { - return basicOrder; - } - public void setConvOrder(BigDecimal convOrder) { - this.convOrder = convOrder; - } - - public BigDecimal getConvOrder() { - return convOrder; - } - public void setAusme(String ausme) { - this.ausme = ausme; - } - - public String getAusme() { - return ausme; - } - public void setBasicIssue(BigDecimal basicIssue) { - this.basicIssue = basicIssue; - } - - public BigDecimal getBasicIssue() { - return basicIssue; - } - public void setConvIssue(BigDecimal convIssue) { - this.convIssue = convIssue; - } - - public BigDecimal getConvIssue() { - return convIssue; - } - public void setAppendFlag(String appendFlag) { - this.appendFlag = appendFlag; - } - - public String getAppendFlag() { - return appendFlag; - } - public void setAppendPercent(String appendPercent) { - this.appendPercent = appendPercent; - } - - public String getAppendPercent() { - return appendPercent; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("productId", getProductId()) - .append("productCode", getProductCode()) - .append("productDescZh", getProductDescZh()) - .append("productDescEn", getProductDescEn()) - .append("ruleCode", getRuleCode()) - .append("oldProductCode", getOldProductCode()) - .append("partsProductCode", getPartsProductCode()) - .append("skuBarcode", getSkuBarcode()) - .append("length", getLength()) - .append("width", getWidth()) - .append("height", getHeight()) - .append("grossWeight", getGrossWeight()) - .append("netWeight", getNetWeight()) - .append("tareWeight", getTareWeight()) - .append("volume", getVolume()) - .append("unitPrice", getUnitPrice()) - .append("productGroup", getProductGroup()) - .append("productGroupName", getProductGroupName()) - .append("userDefined1", getUserDefined1()) - .append("userDefined2", getUserDefined2()) - .append("userDefined3", getUserDefined3()) - .append("userDefined4", getUserDefined4()) - .append("userDefined5", getUserDefined5()) - .append("userDefined6", getUserDefined6()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("factoryCode", getFactoryCode()) - .append("activeFlag", getActiveFlag()) - .append("syncFlag", getSyncFlag()) - .append("primaryUom", getPrimaryUom()) - .append("delFlag", getDelFlag()) - .append("bstme", getBstme()) - .append("basicOrder", getBasicOrder()) - .append("convOrder", getConvOrder()) - .append("ausme", getAusme()) - .append("basicIssue", getBasicIssue()) - .append("convIssue", getConvIssue()) - .append("appendFlag", getAppendFlag()) - .append("appendPercent", getAppendPercent()) - .toString(); - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProProcess.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProProcess.java deleted file mode 100644 index dcc1dfd0..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProProcess.java +++ /dev/null @@ -1,232 +0,0 @@ -package com.op.sap.domain; - -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.util.List; - - -/** - * 生产工序对象 pro_process - * - * @author yinjinlu - * @date 2022-05-12 - */ -public class SapProProcess extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 工序ID */ - private String processId; - - /** 工序编码 */ - @Excel(name = "工序编码") - private String processCode; - - /** 工序名称 */ - @Excel(name = "工序名称") - private String processName; - - /** 工艺要求 */ - @Excel(name = "工艺要求") - private String attention; - - /** 是否启用 */ - @Excel(name = "是否启用") - private String enableFlag; - - /** 预留字段1 */ - private String attr1; - - /** 预留字段2 */ - private String attr2; - - /** 预留字段3 */ - private Long attr3; - - /** 预留字段4 */ - private Long attr4; - - private String fileList; - private List files; - //s:拆分 m合并 - private String splitMerge; - //拆分合并数量 - private int splitMergNum; - //1允许多单并行 - private String sync; - //工作中心 - private String workCenter; - //工作时长 - private Double workTime; - //线体设备 - private String equipment; - - public List getFiles() { - return files; - } - - public void setFiles(List files) { - this.files = files; - } - - public String getWorkCenter() { - return workCenter; - } - - public void setWorkCenter(String workCenter) { - this.workCenter = workCenter; - } - - public Double getWorkTime() { - return workTime; - } - - public void setWorkTime(Double workTime) { - this.workTime = workTime; - } - - public String getSplitMerge() { - return splitMerge; - } - - public void setSplitMerge(String splitMerge) { - this.splitMerge = splitMerge; - } - - public int getSplitMergNum() { - return splitMergNum; - } - - public void setSplitMergNum(int splitMergNum) { - this.splitMergNum = splitMergNum; - } - - public String getSync() { - return sync; - } - - public void setSync(String sync) { - this.sync = sync; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public void setProcessId(String processId) - { - this.processId = processId; - } - - public String getProcessId() - { - return processId; - } - public void setProcessCode(String processCode) - { - this.processCode = processCode; - } - - public String getProcessCode() - { - return processCode; - } - public void setProcessName(String processName) - { - this.processName = processName; - } - - public String getProcessName() - { - return processName; - } - public void setAttention(String attention) - { - this.attention = attention; - } - - public String getAttention() - { - return attention; - } - public void setEnableFlag(String enableFlag) - { - this.enableFlag = enableFlag; - } - - public String getEnableFlag() - { - return enableFlag; - } - public void setAttr1(String attr1) - { - this.attr1 = attr1; - } - - public String getAttr1() - { - return attr1; - } - public void setAttr2(String attr2) - { - this.attr2 = attr2; - } - - public String getAttr2() - { - return attr2; - } - public void setAttr3(Long attr3) - { - this.attr3 = attr3; - } - - public Long getAttr3() - { - return attr3; - } - public void setAttr4(Long attr4) - { - this.attr4 = attr4; - } - - public Long getAttr4() - { - return attr4; - } - - public void setEquipment(String equipment) - { - this.equipment = equipment; - } - public String getEquipment() - { - return equipment; - } - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("processId", getProcessId()) - .append("processCode", getProcessCode()) - .append("processName", getProcessName()) - .append("attention", getAttention()) - .append("enableFlag", getEnableFlag()) - .append("remark", getRemark()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProProcessContent.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProProcessContent.java deleted file mode 100644 index 26ef0621..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProProcessContent.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.op.sap.domain; - -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 生产工序内容对象 pro_process_content - * - * @author yinjinlu - * @date 2022-05-12 - */ -public class SapProProcessContent extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 内容ID */ - private String contentId; - - /** 工序ID */ - @Excel(name = "工序ID") - private String processId; - - /** 顺序编号 */ - @Excel(name = "顺序编号") - private Integer orderNum; - - /** 内容说明 */ - @Excel(name = "内容说明") - private String contentText; - - /** 辅助设备 */ - @Excel(name = "辅助设备") - private String device; - - /** 辅助材料 */ - @Excel(name = "辅助材料") - private String material; - - /** 材料URL */ - @Excel(name = "材料URL") - private String docUrl; - - /** 预留字段1 */ - private String attr1; - - /** 预留字段2 */ - private String attr2; - - /** 预留字段3 */ - private Long attr3; - - /** 预留字段4 */ - private Long attr4; - - public void setContentId(String contentId) - { - this.contentId = contentId; - } - - public String getContentId() - { - return contentId; - } - public void setProcessId(String processId) - { - this.processId = processId; - } - - public String getProcessId() - { - return processId; - } - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - public Integer getOrderNum() - { - return orderNum; - } - public void setContentText(String contentText) - { - this.contentText = contentText; - } - - public String getContentText() - { - return contentText; - } - public void setDevice(String device) - { - this.device = device; - } - - public String getDevice() - { - return device; - } - public void setMaterial(String material) - { - this.material = material; - } - - public String getMaterial() - { - return material; - } - public void setDocUrl(String docUrl) - { - this.docUrl = docUrl; - } - - public String getDocUrl() - { - return docUrl; - } - public void setAttr1(String attr1) - { - this.attr1 = attr1; - } - - public String getAttr1() - { - return attr1; - } - public void setAttr2(String attr2) - { - this.attr2 = attr2; - } - - public String getAttr2() - { - return attr2; - } - public void setAttr3(Long attr3) - { - this.attr3 = attr3; - } - - public Long getAttr3() - { - return attr3; - } - public void setAttr4(Long attr4) - { - this.attr4 = attr4; - } - - public Long getAttr4() - { - return attr4; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("contentId", getContentId()) - .append("processId", getProcessId()) - .append("orderNum", getOrderNum()) - .append("contentText", getContentText()) - .append("device", getDevice()) - .append("material", getMaterial()) - .append("docUrl", getDocUrl()) - .append("remark", getRemark()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRoute.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRoute.java deleted file mode 100644 index 2e727953..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRoute.java +++ /dev/null @@ -1,319 +0,0 @@ -package com.op.sap.domain; - -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.util.List; -import java.util.Objects; - - -/** - * 工艺路线对象 pro_route - * - * @author yinjinlu - * @date 2022-05-12 - */ -public class SapProRoute extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 工艺路线ID */ - private String routeId; - - /** 工艺路线编号 */ - @Excel(name = "工艺路线编号") - private String routeCode; - - /** 工艺路线名称 */ - @Excel(name = "工艺路线名称") - private String routeName; - - /** 工艺路线说明 */ - @Excel(name = "工艺路线说明") - private String routeDesc; - - /** 是否启用 */ - @Excel(name = "是否启用") - private String enableFlag; - - /** 是否需要首检 */ - @Excel(name = "是否需要首检") - private String needCheck; - - /** 预留字段1 */ - private String attr1; - - /** 预留字段2 */ - private String attr2; - - /** 预留字段3 */ - private String attr3; - - /** 预留字段4 */ - private String attr4; - - private String tecMan; - - private String tecManUnit; - private String tecMachine; - private String tecMachineUnit; - private String tecDepreciation; - private String tecDepreciationUnit; - private String tecOther; - private String tecOtherUnit; - private String tecConfAcivity5; - private String tecConfAcivity5Unit; - private String tecConfAcivity6; - private String tecConfAcivity6Unit; - - private String fileList; - private List files; - - private List idList; - - private String routeVersion; - - public String getRouteId() { - return routeId; - } - - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getRouteCode() { - return routeCode; - } - - public void setRouteCode(String routeCode) { - this.routeCode = routeCode; - } - - public String getRouteName() { - return routeName; - } - - public void setRouteName(String routeName) { - this.routeName = routeName; - } - - public String getRouteDesc() { - return routeDesc; - } - - public void setRouteDesc(String routeDesc) { - this.routeDesc = routeDesc; - } - - public String getEnableFlag() { - return enableFlag; - } - - public void setEnableFlag(String enableFlag) { - this.enableFlag = enableFlag; - } - - public String getNeedCheck() { - return needCheck; - } - - public void setNeedCheck(String needCheck) { - this.needCheck = needCheck; - } - - public String getAttr1() { - return attr1; - } - - public void setAttr1(String attr1) { - this.attr1 = attr1; - } - - public String getAttr2() { - return attr2; - } - - public void setAttr2(String attr2) { - this.attr2 = attr2; - } - - public String getAttr3() { - return attr3; - } - - public void setAttr3(String attr3) { - this.attr3 = attr3; - } - - public String getAttr4() { - return attr4; - } - - public void setAttr4(String attr4) { - this.attr4 = attr4; - } - - public String getTecMan() { - return tecMan; - } - - public void setTecMan(String tecMan) { - this.tecMan = tecMan; - } - - public String getTecManUnit() { - return tecManUnit; - } - - public void setTecManUnit(String tecManUnit) { - this.tecManUnit = tecManUnit; - } - - public String getTecMachine() { - return tecMachine; - } - - public void setTecMachine(String tecMachine) { - this.tecMachine = tecMachine; - } - - public String getTecMachineUnit() { - return tecMachineUnit; - } - - public void setTecMachineUnit(String tecMachineUnit) { - this.tecMachineUnit = tecMachineUnit; - } - - public String getTecDepreciation() { - return tecDepreciation; - } - - public void setTecDepreciation(String tecDepreciation) { - this.tecDepreciation = tecDepreciation; - } - - public String getTecDepreciationUnit() { - return tecDepreciationUnit; - } - - public void setTecDepreciationUnit(String tecDepreciationUnit) { - this.tecDepreciationUnit = tecDepreciationUnit; - } - - public String getTecOther() { - return tecOther; - } - - public void setTecOther(String tecOther) { - this.tecOther = tecOther; - } - - public String getTecOtherUnit() { - return tecOtherUnit; - } - - public void setTecOtherUnit(String tecOtherUnit) { - this.tecOtherUnit = tecOtherUnit; - } - - public String getTecConfAcivity5() { - return tecConfAcivity5; - } - - public void setTecConfAcivity5(String tecConfAcivity5) { - this.tecConfAcivity5 = tecConfAcivity5; - } - - public String getTecConfAcivity5Unit() { - return tecConfAcivity5Unit; - } - - public void setTecConfAcivity5Unit(String tecConfAcivity5Unit) { - this.tecConfAcivity5Unit = tecConfAcivity5Unit; - } - - public String getTecConfAcivity6() { - return tecConfAcivity6; - } - - public void setTecConfAcivity6(String tecConfAcivity6) { - this.tecConfAcivity6 = tecConfAcivity6; - } - - public String getTecConfAcivity6Unit() { - return tecConfAcivity6Unit; - } - - public void setTecConfAcivity6Unit(String tecConfAcivity6Unit) { - this.tecConfAcivity6Unit = tecConfAcivity6Unit; - } - - public String getFileList() { - return fileList; - } - - public void setFileList(String fileList) { - this.fileList = fileList; - } - - public List getFiles() { - return files; - } - - public void setFiles(List files) { - this.files = files; - } - - public List getIdList() { - return idList; - } - - public void setIdList(List idList) { - this.idList = idList; - } - - public String getRouteVersion() { - return routeVersion; - } - - public void setRouteVersion(String routeVersion) { - this.routeVersion = routeVersion; - } - - @Override - public String toString() { - return "SapProRoute{" + - "routeId='" + routeId + '\'' + - ", routeCode='" + routeCode + '\'' + - ", routeName='" + routeName + '\'' + - ", routeDesc='" + routeDesc + '\'' + - ", enableFlag='" + enableFlag + '\'' + - ", needCheck='" + needCheck + '\'' + - ", attr1='" + attr1 + '\'' + - ", attr2='" + attr2 + '\'' + - ", attr3='" + attr3 + '\'' + - ", attr4='" + attr4 + '\'' + - ", tecMan='" + tecMan + '\'' + - ", tecManUnit='" + tecManUnit + '\'' + - ", tecMachine='" + tecMachine + '\'' + - ", tecMachineUnit='" + tecMachineUnit + '\'' + - ", tecDepreciation='" + tecDepreciation + '\'' + - ", tecDepreciationUnit='" + tecDepreciationUnit + '\'' + - ", tecOther='" + tecOther + '\'' + - ", tecOtherUnit='" + tecOtherUnit + '\'' + - ", tecConfAcivity5='" + tecConfAcivity5 + '\'' + - ", tecConfAcivity5Unit='" + tecConfAcivity5Unit + '\'' + - ", tecConfAcivity6='" + tecConfAcivity6 + '\'' + - ", tecConfAcivity6Unit='" + tecConfAcivity6Unit + '\'' + - ", fileList='" + fileList + '\'' + - ", files=" + files + - ", idList=" + idList + - ", routeVersion='" + routeVersion + '\'' + - '}'; - } -} - - diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRouteProcess.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRouteProcess.java deleted file mode 100644 index 25882cb8..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRouteProcess.java +++ /dev/null @@ -1,270 +0,0 @@ -package com.op.sap.domain; - -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; - -/** - * 工艺组成对象 pro_route_process - * - * @author yinjinlu - * @date 2022-05-13 - */ -public class SapProRouteProcess extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 记录ID */ - private String recordId; - - /** 工艺路线ID */ - @Excel(name = "工艺路线ID") - private String routeId; - - /** 工序ID */ - @Excel(name = "工序ID") - private String processId; - - /** 工序编码 */ - @Excel(name = "工序编码") - private String processCode; - - /** 工序名称 */ - @Excel(name = "工序名称") - private String processName; - - /** 序号 */ - @Excel(name = "序号") - private Integer orderNum; - - /** 工序ID */ - @Excel(name = "工序ID") - private String nextProcessId; - - /** 工序编码 */ - @Excel(name = "工序编码") - private String nextProcessCode; - - /** 工序名称 */ - @Excel(name = "工序名称") - private String nextProcessName; - - /** 与下一道工序关系 */ - @Excel(name = "与下一道工序关系") - private String linkType; - - /** 准备时间 */ - @Excel(name = "准备时间") - private String defaultPreTime; - - /** 等待时间 */ - @Excel(name = "等待时间") - private String defaultSufTime; - - /** 甘特图显示颜色 */ - @Excel(name = "甘特图显示颜色") - private String colorCode; - - /** 是否关键工序 */ - private String keyFlag; - - /** 预留字段1 */ - private String attr1; - - /** 预留字段2 */ - private String attr2; - - /** 预留字段3 */ - private String attr3; - - /** 预留字段4 */ - private String attr4; - - public void setRecordId(String recordId) - { - this.recordId = recordId; - } - - public String getRecordId() - { - return recordId; - } - public void setRouteId(String routeId) - { - this.routeId = routeId; - } - - public String getRouteId() - { - return routeId; - } - public void setProcessId(String processId) - { - this.processId = processId; - } - - public String getProcessId() - { - return processId; - } - public void setProcessCode(String processCode) - { - this.processCode = processCode; - } - - public String getProcessCode() - { - return processCode; - } - public void setProcessName(String processName) - { - this.processName = processName; - } - - public String getProcessName() - { - return processName; - } - public void setOrderNum(Integer orderNum) - { - this.orderNum = orderNum; - } - - public Integer getOrderNum() - { - return orderNum; - } - public void setNextProcessId(String nextProcessId) - { - this.nextProcessId = nextProcessId; - } - - public String getNextProcessId() - { - return nextProcessId; - } - public void setNextProcessCode(String nextProcessCode) - { - this.nextProcessCode = nextProcessCode; - } - - public String getNextProcessCode() - { - return nextProcessCode; - } - public void setNextProcessName(String nextProcessName) - { - this.nextProcessName = nextProcessName; - } - - public String getNextProcessName() - { - return nextProcessName; - } - public void setLinkType(String linkType) - { - this.linkType = linkType; - } - - public String getLinkType() - { - return linkType; - } - public void setDefaultPreTime(String defaultPreTime) - { - this.defaultPreTime = defaultPreTime; - } - - public String getDefaultPreTime() - { - return defaultPreTime; - } - public void setDefaultSufTime(String defaultSufTime) - { - this.defaultSufTime = defaultSufTime; - } - - public String getKeyFlag() { - return keyFlag; - } - - public void setKeyFlag(String keyFlag) { - this.keyFlag = keyFlag; - } - - public String getDefaultSufTime() - { - return defaultSufTime; - } - public void setColorCode(String colorCode) - { - this.colorCode = colorCode; - } - - public String getColorCode() - { - return colorCode; - } - - public void setAttr1(String attr1) - { - this.attr1 = attr1; - } - - public String getAttr1() - { - return attr1; - } - public void setAttr2(String attr2) - { - this.attr2 = attr2; - } - - - - public String getAttr2() - { - return attr2; - } - public void setAttr3(String attr3) - { - this.attr3 = attr3; - } - - public String getAttr3() - { - return attr3; - } - public void setAttr4(String attr4) - { - this.attr4 = attr4; - } - - public String getAttr4() - { - return attr4; - } - - @Override - public String toString() { - return "ProRouteProcess{" + - "recordId=" + recordId + - ", routeId=" + routeId + - ", processId=" + processId + - ", processCode='" + processCode + '\'' + - ", processName='" + processName + '\'' + - ", orderNum=" + orderNum + - ", nextProcessId=" + nextProcessId + - ", nextProcessCode='" + nextProcessCode + '\'' + - ", nextProcessName='" + nextProcessName + '\'' + - ", linkType='" + linkType + '\'' + - ", defaultPreTime=" + defaultPreTime + - ", defaultSufTime=" + defaultSufTime + - ", colorCode='" + colorCode + '\'' + - ", keyFlag='" + keyFlag + '\'' + - ", attr1='" + attr1 + '\'' + - ", attr2='" + attr2 + '\'' + - ", attr3=" + attr3 + - ", attr4=" + attr4 + - '}'; - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRouteProduct.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRouteProduct.java deleted file mode 100644 index 52fee73a..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/SapProRouteProduct.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.op.sap.domain; - -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.util.List; - -/** - * 工艺产品关联对象 pro_route_product - * - * @author Open Platform - * @date 2023-07-13 - */ -public class SapProRouteProduct extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 记录ID */ - private String recordId; - - /** 工艺路线ID */ - @Excel(name = "工艺路线ID") - private String routeId; - - /** 产品ID */ - @Excel(name = "产品ID") - private String itemId; - - /** 产品编码 */ - @Excel(name = "产品编码") - private String itemCode; - - /** 产品名称 */ - @Excel(name = "产品名称") - private String itemName; - - /** 预留字段1 */ - @Excel(name = "预留字段1") - private String attr1; - - /** 预留字段2 */ - @Excel(name = "预留字段2") - private String attr2; - - /** 预留字段3 */ - @Excel(name = "预留字段3") - private String attr3; - - /** 预留字段4 */ - @Excel(name = "预留字段4") - private String attr4; - - private String key; - private String label; - private List unSelect; - private List selected; - private List selectedValues; - - public List getSelectedValues() { - return selectedValues; - } - - public void setSelectedValues(List selectedValues) { - this.selectedValues = selectedValues; - } - - public List getUnSelect() { - return unSelect; - } - - public void setUnSelect(List unSelect) { - this.unSelect = unSelect; - } - - public List getSelected() { - return selected; - } - - public void setSelected(List selected) { - this.selected = selected; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public void setRecordId(String recordId) { - this.recordId = recordId; - } - - public String getRecordId() { - return recordId; - } - public void setRouteId(String routeId) { - this.routeId = routeId; - } - - public String getRouteId() { - return routeId; - } - public void setItemId(String itemId) { - this.itemId = itemId; - } - - public String getItemId() { - return itemId; - } - public void setItemCode(String itemCode) { - this.itemCode = itemCode; - } - - public String getItemCode() { - return itemCode; - } - public void setItemName(String itemName) { - this.itemName = itemName; - } - - public String getItemName() { - return itemName; - } - public void setAttr1(String attr1) { - this.attr1 = attr1; - } - - public String getAttr1() { - return attr1; - } - public void setAttr2(String attr2) { - this.attr2 = attr2; - } - - public String getAttr2() { - return attr2; - } - public void setAttr3(String attr3) { - this.attr3 = attr3; - } - - public String getAttr3() { - return attr3; - } - public void setAttr4(String attr4) { - this.attr4 = attr4; - } - - public String getAttr4() { - return attr4; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("recordId", getRecordId()) - .append("routeId", getRouteId()) - .append("itemId", getItemId()) - .append("itemCode", getItemCode()) - .append("itemName", getItemName()) - .append("remark", getRemark()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("attr4", getAttr4()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseFileMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseFileMapper.java deleted file mode 100644 index 782c828a..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseFileMapper.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.op.sap.mapper; - -import com.op.common.core.domain.BaseFileData; -import com.op.sap.domain.SapBaseFile; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 附件Mapper接口 - * - * @author Open Platform - * @date 2023-07-10 - */ -@Mapper -public interface SapBaseFileMapper { - /** - * 查询附件 - * - * @param fileId 附件主键 - * @return 附件 - */ - public SapBaseFile selectBaseFileByFileId(String fileId); - - /** - * 查询附件列表 - * - * @param baseFile 附件 - * @return 附件集合 - */ - public List selectBaseFileList(SapBaseFile baseFile); - - /** - * 新增附件 - * - * @param baseFile 附件 - * @return 结果 - */ - public int insertBaseFile(SapBaseFile baseFile); - - /** - * 修改附件 - * - * @param baseFile 附件 - * @return 结果 - */ - public int updateBaseFile(SapBaseFile baseFile); - - /** - * 删除附件 - * - * @param fileId 附件主键 - * @return 结果 - */ - public int deleteBaseFileByFileId(String fileId); - - /** - * 批量删除附件 - * - * @param fileIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBaseFileByFileIds(String[] fileIds); - - Boolean insertBaseFileBatch(@Param("baseFiles") List baseFiles); - - List getBaseFileBatch(String processId); - - void deleteBaseFileBySourceId(String processId); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseProductMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseProductMapper.java deleted file mode 100644 index 277f4581..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapBaseProductMapper.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.op.sap.mapper; - - - -import com.op.sap.domain.SapBaseProduct; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 物料信息Mapper接口 - * - * @author Open Platform - * @date 2023-07-18 - */ -@Mapper -public interface SapBaseProductMapper { - /** - * 查询物料信息 - * - * @param productId 物料信息主键 - * @return 物料信息 - */ - public SapBaseProduct selectBaseProductByProductId(String productId); - - /** - * 查询物料信息列表 - * - * @param baseProduct 物料信息 - * @return 物料信息集合 - */ - public List selectBaseProductList(SapBaseProduct baseProduct); - - /** - * 新增物料信息 - * - * @param baseProduct 物料信息 - * @return 结果 - */ - public int insertBaseProduct(SapBaseProduct baseProduct); - - /** - * 修改物料信息 - * - * @param baseProduct 物料信息 - * @return 结果 - */ - public int updateBaseProduct(SapBaseProduct baseProduct); - - /** - * 删除物料信息 - * - * @param productId 物料信息主键 - * @return 结果 - */ - public int deleteBaseProductByProductId(String productId); - - /** - * 批量删除物料信息 - * - * @param productIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBaseProductByProductIds(String[] productIds); - - public String selectBaseProductIDByProductCode(String productCode); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProProcessContentMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProProcessContentMapper.java deleted file mode 100644 index 5abab809..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProProcessContentMapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.op.sap.mapper; - -import com.op.sap.domain.SapProProcessContent; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -/** - * 生产工序内容Mapper接口 - * - * @author yinjinlu - * @date 2022-05-12 - */ -@Mapper -public interface SapProProcessContentMapper -{ - /** - * 查询生产工序内容 - * - * @param contentId 生产工序内容主键 - * @return 生产工序内容 - */ - public SapProProcessContent selectProProcessContentByContentId(String contentId); - - /** - * 查询生产工序内容列表 - * - * @param proProcessContent 生产工序内容 - * @return 生产工序内容集合 - */ - public List selectProProcessContentList(SapProProcessContent proProcessContent); - - /** - * 新增生产工序内容 - * - * @param proProcessContent 生产工序内容 - * @return 结果 - */ - public int insertProProcessContent(SapProProcessContent proProcessContent); - - /** - * 修改生产工序内容 - * - * @param proProcessContent 生产工序内容 - * @return 结果 - */ - public int updateProProcessContent(SapProProcessContent proProcessContent); - - /** - * 删除生产工序内容 - * - * @param contentId 生产工序内容主键 - * @return 结果 - */ - public int deleteProProcessContentByContentId(String contentId); - - /** - * 批量删除生产工序内容 - * - * @param contentIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteProProcessContentByContentIds(String[] contentIds); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProProcessMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProProcessMapper.java deleted file mode 100644 index 166b59af..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProProcessMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.op.sap.mapper; - -import com.op.sap.domain.SapProProcess; - -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -/** - * 生产工序Mapper接口 - * - * @author yinjinlu - * @date 2022-05-11 - */ -@Mapper -public interface SapProProcessMapper -{ - /** - * 查询生产工序 - * - * @param processId 生产工序主键 - * @return 生产工序 - */ - public SapProProcess selectProProcessByProcessId(String processId); - - /** - * 查询生产工序列表 - * - * @param proProcess 生产工序 - * @return 生产工序集合 - */ - public List selectProProcessList(SapProProcess proProcess); - - public SapProProcess checkProcessCodeUnique(SapProProcess proProcess); - public SapProProcess checkProcessNameUnique(SapProProcess proProcess); - - - /** - * 新增生产工序 - * - * @param proProcess 生产工序 - * @return 结果 - */ - public int insertProProcess(SapProProcess proProcess); - - /** - * 修改生产工序 - * - * @param proProcess 生产工序 - * @return 结果 - */ - public int updateProProcess(SapProProcess proProcess); - - /** - * 删除生产工序 - * - * @param processId 生产工序主键 - * @return 结果 - */ - public int deleteProProcessByProcessId(String processId); - - /** - * 批量删除生产工序 - * - * @param processIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteProProcessByProcessIds(String[] processIds); - - int selectProProcessByProcessName(String processName); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteMapper.java deleted file mode 100644 index 2e1fd4ae..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteMapper.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.op.sap.mapper; - -import com.op.sap.domain.SapProRoute; - -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -/** - * 工艺路线Mapper接口 - * - * @author yinjinlu - * @date 2022-05-12 - */ -@Mapper -public interface SapProRouteMapper { - /** - * 查询工艺路线 - * - * @param routeId 工艺路线主键 - * @return 工艺路线 - */ - public SapProRoute selectProRouteByRouteId(String routeId); - - /** - * 查询工艺路线列表 - * - * @param proRoute 工艺路线 - * @return 工艺路线集合 - */ - public List selectProRouteList(SapProRoute proRoute); - - /** - * 根据物料查找生效的工艺路线 - * - * @param itemId - * @return - */ - public SapProRoute getRouteByProductId(String itemId); - - public SapProRoute checkRouteCodeUnique(SapProRoute proRoute); - - /** - * 新增工艺路线 - * - * @param proRoute 工艺路线 - * @return 结果 - */ - public int insertProRoute(SapProRoute proRoute); - - /** - * 修改工艺路线 - * - * @param proRoute 工艺路线 - * @return 结果 - */ - public int updateProRoute(SapProRoute proRoute); - - /** - * 删除工艺路线 - * - * @param routeId 工艺路线主键 - * @return 结果 - */ - public int deleteProRouteByRouteId(String routeId); - - /** - * 批量删除工艺路线 - * - * @param routeIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteProRouteByRouteIds(String[] routeIds); - - /** - * 查询所有工艺信息list（不分页） - * - * @return - */ - List selectAllRoute(); - int selectProRouteByRouteCode(String routeCode); - -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteProcessMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteProcessMapper.java deleted file mode 100644 index 27093e89..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteProcessMapper.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.op.sap.mapper; - -import com.op.sap.domain.SapProRouteProcess; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -/** - * 工艺组成Mapper接口 - * - * @author yinjinlu - * @date 2022-05-13 - */ -@Mapper -public interface SapProRouteProcessMapper -{ - /** - * 查询工艺组成 - * - * @param recordId 工艺组成主键 - * @return 工艺组成 - */ - public SapProRouteProcess selectProRouteProcessByRecordId(String recordId); - - /** - * 查询工艺组成列表 - * - * @param proRouteProcess 工艺组成 - * @return 工艺组成集合 - */ - public List selectProRouteProcessList(SapProRouteProcess proRouteProcess); - - public SapProRouteProcess checkOrderNumExists(SapProRouteProcess proRouteProcess); - public SapProRouteProcess checkProcessExists(SapProRouteProcess proRouteProcess); - public SapProRouteProcess checkUpdateFlagUnique(SapProRouteProcess proRouteProcess); - - public SapProRouteProcess findPreProcess(SapProRouteProcess proRouteProcess); - - public SapProRouteProcess findNextProcess(SapProRouteProcess proRouteProcess); - /** - * 新增工艺组成 - * - * @param proRouteProcess 工艺组成 - * @return 结果 - */ - public int insertProRouteProcess(SapProRouteProcess proRouteProcess); - - /** - * 修改工艺组成 - * - * @param proRouteProcess 工艺组成 - * @return 结果 - */ - public int updateProRouteProcess(SapProRouteProcess proRouteProcess); - - /** - * 删除工艺组成 - * - * @param recordId 工艺组成主键 - * @return 结果 - */ - public int deleteProRouteProcessByRecordId(String recordId); - - /** - * 批量删除工艺组成 - * - * @param recordIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteProRouteProcessByRecordIds(String[] recordIds); - - /** - * 根据工艺路线ID删除所有工序配置 - * @param routeId - * @return - */ - public int deleteByRouteId(String routeId); - - -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteProductMapper.java b/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteProductMapper.java deleted file mode 100644 index e8636708..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/mapper/SapProRouteProductMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.op.sap.mapper; - -import com.op.sap.domain.SapProRouteProduct; - -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 工艺产品（物料）关联Mapper接口 - * - * @author Open Platform - * @date 2023-07-13 - */ -@Mapper -public interface SapProRouteProductMapper { - /** - * 查询工艺产品（物料）关联 - * - * @param recordId 工艺产品（物料）关联主键 - * @return 工艺产品（物料）关联 - */ - public SapProRouteProduct selectProRouteProductByRecordId(String recordId); - - /** - * 查询工艺产品（物料）关联列表 - * - * @param proRouteProduct 工艺产品（物料）关联 - * @return 工艺产品（物料）关联集合 - */ - public List selectProRouteProductList(SapProRouteProduct proRouteProduct); - - /** - * 新增工艺产品（物料）关联 - * - * @param proRouteProduct 工艺产品（物料）关联 - * @return 结果 - */ - public int insertProRouteProduct(SapProRouteProduct proRouteProduct); - - /** - * 修改工艺产品（物料）关联 - * - * @param proRouteProduct 工艺产品（物料）关联 - * @return 结果 - */ - public int updateProRouteProduct(SapProRouteProduct proRouteProduct); - - /** - * 删除工艺产品（物料）关联 - * - * @param recordId 工艺产品（物料）关联主键 - * @return 结果 - */ - public int deleteProRouteProductByRecordId(String recordId); - - /** - * 批量删除工艺产品（物料）关联 - * - * @param recordIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteProRouteProductByRecordIds(String[] recordIds); - - public List getRouteProdProductListUndo(SapProRouteProduct proRouteProduct); - List getRouteProdProductListDo(SapProRouteProduct proRouteProduct); - - void deleteByRouteId(SapProRouteProduct proRouteProduct); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/ISapBaseProductService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/ISapBaseProductService.java deleted file mode 100644 index 499f2ca4..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/ISapBaseProductService.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.op.sap.service; - - - -import com.op.common.core.domain.R; -import com.op.sap.domain.SapBaseProduct; - -import java.util.List; - -/** - * 物料信息Service接口 - * - * @author Open Platform - * @date 2023-07-18 - */ -public interface ISapBaseProductService { - /** - * 查询物料信息 - * - * @param productId 物料信息主键 - * @return 物料信息 - */ - public SapBaseProduct selectBaseProductByProductId(String productId); - - /** - * 查询物料信息列表 - * - * @param baseProduct 物料信息 - * @return 物料信息集合 - */ - public List selectBaseProductList(SapBaseProduct baseProduct); - - /** - * 新增物料信息 - * - * @param baseProduct 物料信息 - * @return 结果 - */ - public int insertBaseProduct(SapBaseProduct baseProduct); - - /** - * 修改物料信息 - * - * @param baseProduct 物料信息 - * @return 结果 - */ - public int updateBaseProduct(SapBaseProduct baseProduct); - - /** - * 批量删除物料信息 - * - * @param productIds 需要删除的物料信息主键集合 - * @return 结果 - */ - public int deleteBaseProductByProductIds(String[] productIds); - - /** - * 删除物料信息信息 - * - * @param productId 物料信息主键 - * @return 结果 - */ - public int deleteBaseProductByProductId(String productId); - - - - public String selectBaseProductIDByProductCode(String productCode); - - - -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapBaseFileService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapBaseFileService.java deleted file mode 100644 index f324e70f..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapBaseFileService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.op.sap.service; - -import com.op.common.core.domain.BaseFileData; -import com.op.sap.domain.SapBaseFile; - - -import java.util.List; - -/** - * 附件Service接口 - * - * @author Open Platform - * @date 2023-07-10 - */ -public interface SapBaseFileService { - /** - * 查询附件 - * - * @param fileId 附件主键 - * @return 附件 - */ - public SapBaseFile selectBaseFileByFileId(String fileId); - - /** - * 查询附件列表 - * - * @param baseFile 附件 - * @return 附件集合 - */ - public List selectBaseFileList(SapBaseFile baseFile); - - /** - * 新增附件 - * - * @param baseFile 附件 - * @return 结果 - */ - public int insertBaseFile(SapBaseFile baseFile); - - /** - * 修改附件 - * - * @param baseFile 附件 - * @return 结果 - */ - public int updateBaseFile(SapBaseFile baseFile); - - /** - * 批量删除附件 - * - * @param fileIds 需要删除的附件主键集合 - * @return 结果 - */ - public int deleteBaseFileByFileIds(String[] fileIds); - - /** - * 删除附件信息 - * - * @param fileId 附件主键 - * @return 结果 - */ - public int deleteBaseFileByFileId(String fileId); - - public Boolean insertBaseFileBatch(List baseFiles); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapProRouteProductService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapProRouteProductService.java deleted file mode 100644 index be7aa17e..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapProRouteProductService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.op.sap.service; - -import com.op.sap.domain.SapProRouteProduct; - - -import java.util.List; - -/** - * 工艺线体关联Service接口 - * - * @author Open Platform - * @date 2023-07-13 - */ -public interface SapProRouteProductService { - /** - * 查询工艺线体关联 - * - * @param recordId 工艺线体关联主键 - * @return 工艺线体关联 - */ - public SapProRouteProduct selectProRouteProductByRecordId(String recordId); - - /** - * 查询工艺线体关联列表 - * - * @param proRouteProduct 工艺线体关联 - * @return 工艺线体关联集合 - */ - public List selectProRouteProductList(SapProRouteProduct proRouteProduct); - - /** - * 新增工艺线体关联 - * - * @param proRouteProduct 工艺线体关联 - * @return 结果 - */ - public int insertProRouteProduct(SapProRouteProduct proRouteProduct); - - /** - * 修改工艺线体关联 - * - * @param proRouteProduct 工艺线体关联 - * @return 结果 - */ - public int updateProRouteProduct(SapProRouteProduct proRouteProduct); - - /** - * 批量删除工艺线体关联 - * - * @param recordIds 需要删除的工艺线体关联主键集合 - * @return 结果 - */ - public int deleteProRouteProductByRecordIds(String[] recordIds); - - /** - * 删除工艺线体关联信息 - * - * @param recordId 工艺线体关联主键 - * @return 结果 - */ - public int deleteProRouteProductByRecordId(String recordId); - - SapProRouteProduct getList(SapProRouteProduct proRouteProduct); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapProRouteService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapProRouteService.java deleted file mode 100644 index 5d25edf0..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapProRouteService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.op.sap.service; - -import com.op.sap.domain.SapProRoute; - - -import java.util.List; - -/** - * 工艺路线Service接口 - * - * @author yinjinlu - * @date 2022-05-12 - */ -public interface SapProRouteService -{ - /** - * 查询工艺路线 - * - * @param routeId 工艺路线主键 - * @return 工艺路线 - */ - public SapProRoute selectProRouteByRouteId(String routeId); - - /** - * 查询工艺路线列表 - * - * @param proRoute 工艺路线 - * @return 工艺路线集合 - */ - public List selectProRouteList(SapProRoute proRoute); - - /** - * 根据物料查找生效的工艺路线 - * @param itemId - * @return - */ - public SapProRoute getRouteByProductId(String itemId); - - public Boolean checkRouteCodeUnique(SapProRoute proRoute); - - /** - * 新增工艺路线 - * - * @param proRoute 工艺路线 - * @return 结果 - */ - public int insertProRoute(SapProRoute proRoute); - - /** - * 修改工艺路线 - * - * @param proRoute 工艺路线 - * @return 结果 - */ - public int updateProRoute(SapProRoute proRoute); - - /** - * 批量删除工艺路线 - * - * @param routeIds 需要删除的工艺路线主键集合 - * @return 结果 - */ - public int deleteProRouteByRouteIds(String[] routeIds); - - /** - * 删除工艺路线信息 - * - * @param routeId 工艺路线主键 - * @return 结果 - */ - public int deleteProRouteByRouteId(String routeId); - - public int batchInsertProRoute(SapProRoute proRoute); - - //查询工艺路线是否存在 - int selectProRrouteByRouteCode(String routeCode); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapService.java deleted file mode 100644 index e0601a97..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.op.sap.service; - -import com.op.common.core.domain.R; -import com.op.sap.domain.SapBaseProduct; -import com.op.system.api.model.SapProOrder; - -import java.util.List; - -public interface SapService { - - - - R sapItem(); - - R sapBom(); - - R sapProRoute(); - - R sapProRouteProduct(); - - R sapProRouteProcess(); - - - - List shopOrderSync(SapProOrder sapProOrder); -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBaseFileServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBaseFileServiceImpl.java deleted file mode 100644 index 16cc0a3b..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBaseFileServiceImpl.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.op.sap.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.domain.BaseFileData; -import com.op.common.core.utils.DateUtils; -import com.op.sap.domain.SapBaseFile; -import com.op.sap.mapper.SapBaseFileMapper; -import com.op.sap.service.SapBaseFileService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 附件Service业务层处理 - * - * @author Open Platform - * @date 2023-07-10 - */ -@Service -public class SapBaseFileServiceImpl implements SapBaseFileService { - @Autowired - private SapBaseFileMapper baseFileMapper; - - /** - * 查询附件 - * - * @param fileId 附件主键 - * @return 附件 - */ - @Override - @DS("#header.poolName") - public SapBaseFile selectBaseFileByFileId(String fileId) { - return baseFileMapper.selectBaseFileByFileId(fileId); - } - - /** - * 查询附件列表 - * - * @param baseFile 附件 - * @return 附件 - */ - @Override - @DS("#header.poolName") - public List selectBaseFileList(SapBaseFile baseFile) { - return baseFileMapper.selectBaseFileList(baseFile); - } - - /** - * 新增附件 - * - * @param baseFile 附件 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertBaseFile(SapBaseFile baseFile) { - baseFile.setCreateTime(DateUtils.getNowDate()); - return baseFileMapper.insertBaseFile(baseFile); - } - - /** - * 修改附件 - * - * @param baseFile 附件 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateBaseFile(SapBaseFile baseFile) { - baseFile.setUpdateTime(DateUtils.getNowDate()); - return baseFileMapper.updateBaseFile(baseFile); - } - - /** - * 批量删除附件 - * - * @param fileIds 需要删除的附件主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteBaseFileByFileIds(String[] fileIds) { - return baseFileMapper.deleteBaseFileByFileIds(fileIds); - } - - /** - * 删除附件信息 - * - * @param fileId 附件主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteBaseFileByFileId(String fileId) { - return baseFileMapper.deleteBaseFileByFileId(fileId); - } - - /** - * 新增附件 - * - * @param baseFiles 附件 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public Boolean insertBaseFileBatch(List baseFiles) { - return baseFileMapper.insertBaseFileBatch(baseFiles); - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBaseProductServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBaseProductServiceImpl.java deleted file mode 100644 index 6c9195ca..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapBaseProductServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.op.sap.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; -import com.op.common.core.domain.R; -import com.op.common.core.utils.DateUtils; -import com.op.common.security.utils.SecurityUtils; -import com.op.sap.domain.SapBaseProduct; -import com.op.sap.domain.SapConn; -import com.op.sap.mapper.SapBaseProductMapper; -import com.op.sap.service.ISapBaseProductService; -import com.op.sap.util.SAPConnUtils; -import com.op.system.api.RemotePlanService; -import com.sap.conn.jco.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * 物料信息Service业务层处理 - * - * @author Open Platform - * @date 2023-07-18 - */ -@Service -public class SapBaseProductServiceImpl implements ISapBaseProductService { - - - @Autowired - private SapBaseProductMapper baseProductMapper; - - /** - * 查询物料信息 - * - * @param productId 物料信息主键 - * @return 物料信息 - */ - @Override - @DS("#header.poolName") - public SapBaseProduct selectBaseProductByProductId(String productId) { - return baseProductMapper.selectBaseProductByProductId(productId); - } - - /** - * 查询物料信息列表 - * - * @param baseProduct 物料信息 - * @return 物料信息 - */ - @Override - @DS("#header.poolName") - public List selectBaseProductList(SapBaseProduct baseProduct) { - return baseProductMapper.selectBaseProductList(baseProduct); - } - - /** - * 新增物料信息 - * - * @param baseProduct 物料信息 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertBaseProduct(SapBaseProduct baseProduct) { - - baseProduct.setCreateTime(DateUtils.getNowDate()); - baseProduct.setCreateBy(SecurityUtils.getUsername()); - return baseProductMapper.insertBaseProduct(baseProduct); - } - - /** - * 修改物料信息 - * - * @param baseProduct 物料信息 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateBaseProduct(SapBaseProduct baseProduct) { - baseProduct.setUpdateTime(DateUtils.getNowDate()); - baseProduct.setUpdateBy(SecurityUtils.getUsername()); - return baseProductMapper.updateBaseProduct(baseProduct); - } - - /** - * 批量删除物料信息 - * - * @param productIds 需要删除的物料信息主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteBaseProductByProductIds(String[] productIds) { - return baseProductMapper.deleteBaseProductByProductIds(productIds); - } - - /** - * 删除物料信息信息 - * - * @param productId 物料信息主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteBaseProductByProductId(String productId) { - return baseProductMapper.deleteBaseProductByProductId(productId); - } - - @Override - public String selectBaseProductIDByProductCode(String productCode) { - return baseProductMapper.selectBaseProductIDByProductCode(productCode); - } - - -} 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 b685cc94..f64255d6 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 @@ -54,11 +54,11 @@ public class SapBomServiceImpl implements SapBomService { // jCoTable.setValue(Constants.OPTION, "EQ"); // jCoTable.setValue(Constants.LOW, "00012222"); - JCoTable jCoTables = func.getTableParameterList().getTable("S_MATNR"); + JCoTable jCoTables = func.getTableParameterList().getTable("S_STLNR"); jCoTables.appendRow(); jCoTables.setValue(Constants.SIGN, "I"); jCoTables.setValue(Constants.OPTION, "EQ"); - jCoTables.setValue(Constants.LOW, "000000010101000115"); + jCoTables.setValue(Constants.LOW, "00012222"); // 获取调用 RFC 函数对象 func.execute(dest); // 获取 内表 - ZMES_PRO diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 9eb143dc..6af578de 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -14,7 +14,7 @@ import com.op.sap.domain.SapBom; import com.op.system.api.model.SapProOrder; import com.sap.conn.jco.*; import org.jcp.xml.dsig.internal.dom.Utils; -import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -33,7 +33,6 @@ public class SapOrderServiceImpl implements SapOrderService { @Override public AjaxResult shopOrderSync(SapProOrder sapProOrder) { - // 连接 try { // 获取调用 RFC 函数对象 diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteProductServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteProductServiceImpl.java deleted file mode 100644 index 2671f564..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteProductServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.op.sap.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.utils.DateUtils; -import com.op.common.core.utils.uuid.IdUtils; -import com.op.common.security.utils.SecurityUtils; -import com.op.sap.domain.SapProRouteProduct; -import com.op.sap.mapper.SapProRouteProductMapper; -import com.op.sap.service.SapProRouteProductService; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * 工艺线体关联Service业务层处理 - * - * @author Open Platform - * @date 2023-07-13 - */ -@Service -public class SapProRouteProductServiceImpl implements SapProRouteProductService { - @Autowired - private SapProRouteProductMapper proRouteProductMapper; - - /** - * 查询工艺线体关联 - * - * @param recordId 工艺线体关联主键 - * @return 工艺线体关联 - */ - @Override - @DS("#header.poolName") - public SapProRouteProduct selectProRouteProductByRecordId(String recordId) { - return proRouteProductMapper.selectProRouteProductByRecordId(recordId); - } - - /** - * 查询工艺线体关联列表 - * - * @param proRouteProduct 工艺线体关联 - * @return 工艺线体关联 - */ - @Override - @DS("#header.poolName") - public List selectProRouteProductList(SapProRouteProduct proRouteProduct) { - return proRouteProductMapper.selectProRouteProductList(proRouteProduct); - } - - /** - * 新增工艺线体关联 - * - * @param proRouteProduct 工艺线体关联 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertProRouteProduct(SapProRouteProduct proRouteProduct) { - Date now = DateUtils.getNowDate(); - if(StringUtils.isNotBlank(proRouteProduct.getRouteId())){ - //删除之前的关联关系 - proRouteProductMapper.deleteByRouteId(proRouteProduct); - } - if(proRouteProduct.getSelectedValues()!=null){ - SapProRouteProduct proRouteProductDto =null; - for(String ProductCode:proRouteProduct.getSelectedValues()){ - //查询物料编码对应的各种信息 - proRouteProductDto = new SapProRouteProduct(); - proRouteProductDto.setRecordId(IdUtils.fastSimpleUUID()); - proRouteProductDto.setCreateTime(now); - proRouteProductDto.setCreateBy(SecurityUtils.getUsername()); - proRouteProductDto.setRouteId(proRouteProduct.getRouteId()); - proRouteProductDto.setItemId(proRouteProduct.getItemId()); - proRouteProductDto.setItemCode(ProductCode); - proRouteProductDto.setItemName(proRouteProduct.getItemName()); - proRouteProductMapper.insertProRouteProduct(proRouteProductDto); - } - } - //新增关联关系 - return 1; - } - - /** - * 修改工艺线体关联 - * - * @param proRouteProduct 工艺线体关联 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateProRouteProduct(SapProRouteProduct proRouteProduct) { - proRouteProduct.setUpdateTime(DateUtils.getNowDate()); - return proRouteProductMapper.updateProRouteProduct(proRouteProduct); - } - - /** - * 批量删除工艺线体关联 - * - * @param recordIds 需要删除的工艺线体关联主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteProRouteProductByRecordIds(String[] recordIds) { - return proRouteProductMapper.deleteProRouteProductByRecordIds(recordIds); - } - - /** - * 删除工艺线体关联信息 - * - * @param recordId 工艺线体关联主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteProRouteProductByRecordId(String recordId) { - return proRouteProductMapper.deleteProRouteProductByRecordId(recordId); - } - - @Override - @DS("#header.poolName") - public SapProRouteProduct getList(SapProRouteProduct proRouteProduct) { - SapProRouteProduct dto = new SapProRouteProduct(); - List unSelected = proRouteProductMapper.getRouteProdProductListUndo(proRouteProduct); - dto.setUnSelect(unSelected); - List selected= proRouteProductMapper.getRouteProdProductListDo(proRouteProduct); - dto.setSelected(selected); - return dto; - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteServiceImpl.java deleted file mode 100644 index 53e2e191..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapProRouteServiceImpl.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.op.sap.service.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.constant.UserConstants; -import com.op.common.core.domain.BaseFileData; -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.security.utils.SecurityUtils; -import com.op.sap.domain.SapBaseFile; -import com.op.sap.domain.SapProRoute; -import com.op.sap.mapper.SapBaseFileMapper; -import com.op.sap.mapper.SapProRouteMapper; -import com.op.sap.service.SapProRouteService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - - -/** - * 工艺路线Service业务层处理 - * - * @author yinjinlu - * @date 2022-05-12 - */ -@Service -public class SapProRouteServiceImpl implements SapProRouteService { - @Autowired - private SapProRouteMapper proRouteMapper; - @Autowired - private SapBaseFileMapper baseFileMapper; - - /** - * 查询工艺路线 - * - * @param routeId 工艺路线主键 - * @return 工艺路线 - */ - @Override - @DS("#header.poolName") - public SapProRoute selectProRouteByRouteId(String routeId) { - - SapProRoute p = proRouteMapper.selectProRouteByRouteId(routeId); - List files = baseFileMapper.getBaseFileBatch(routeId); - if (!CollectionUtils.isEmpty(files)) { - p.setFiles(files); - } - return p; - } - - /** - * 查询工艺路线列表 - * - * @param proRoute 工艺路线 - * @return 工艺路线 - */ - @Override - @DS("#header.poolName") - public List selectProRouteList(SapProRoute proRoute) { - return proRouteMapper.selectProRouteList(proRoute); - } - - @Override - public SapProRoute getRouteByProductId(String itemId) { - return proRouteMapper.getRouteByProductId(itemId); - } - - - @Override - @DS("#header.poolName") - public Boolean checkRouteCodeUnique(SapProRoute proRoute) { - SapProRoute route = proRouteMapper.checkRouteCodeUnique(proRoute); - String routeId = proRoute.getRouteId(); - if (StringUtils.isNotNull(route) && !route.getRouteId().equals(routeId)) { - return UserConstants.NOT_UNIQUE; - } - return UserConstants.UNIQUE; - } - - /** - * 新增工艺路线 - * - * @param proRoute 工艺路线 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertProRoute(SapProRoute proRoute) { - proRoute.setCreateTime(DateUtils.getNowDate()); - proRoute.setRouteVersion("V.1"); - //上传附件 - if (StringUtils.isNotEmpty(proRoute.getFileList())) { - String[] ids = proRoute.getFileList().split(","); - List files = new ArrayList<>(); - BaseFileData file = null; - for (String id : ids) { - file = new BaseFileData(); - file.setFileId(IdUtils.fastSimpleUUID()); - file.setFileName(id.split("&fileName=")[1]); - file.setFileAddress(id); - file.setSourceId(proRoute.getRouteId()); - file.setCreateBy(SecurityUtils.getUsername()); - file.setCreateTime(new Date()); - files.add(file); - } - baseFileMapper.insertBaseFileBatch(files); - } - - return proRouteMapper.insertProRoute(proRoute); - } - - /** - * 修改工艺路线 - * - * @param proRoute 工艺路线 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateProRoute(SapProRoute proRoute) { - proRoute.setUpdateTime(DateUtils.getNowDate()); - //上传附件 - if (StringUtils.isNotEmpty(proRoute.getFileList())) { - baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId()); - String[] ids = proRoute.getFileList().split(","); - List files = new ArrayList<>(); - BaseFileData file = null; - for (String id : ids) { - file = new BaseFileData(); - file.setFileId(IdUtils.fastSimpleUUID()); - file.setFileAddress(id); - file.setFileName(id.split("&fileName=")[1]); - file.setSourceId(proRoute.getRouteId()); - file.setCreateBy(SecurityUtils.getUsername()); - file.setCreateTime(new Date()); - files.add(file); - } - baseFileMapper.insertBaseFileBatch(files); - } - - //更新版本V.1->递增 - String nowRouteVersion = proRoute.getRouteVersion().replace("V", "") - .replace(".", ""); - int nowRouteVersionNum = Integer.parseInt(nowRouteVersion); - String newRouteVersionNum = "V." + (++nowRouteVersionNum); - proRoute.setRouteVersion(newRouteVersionNum); - return proRouteMapper.updateProRoute(proRoute); - } - - /** - * 批量删除工艺路线 - * - * @param routeIds 需要删除的工艺路线主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteProRouteByRouteIds(String[] routeIds) { - return proRouteMapper.deleteProRouteByRouteIds(routeIds); - } - - /** - * 删除工艺路线信息 - * - * @param routeId 工艺路线主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteProRouteByRouteId(String routeId) { - return proRouteMapper.deleteProRouteByRouteId(routeId); - } - - @Override - @DS("#header.poolName") - public int batchInsertProRoute(SapProRoute proRoute) { - proRoute.setCreateTime(DateUtils.getNowDate()); - if (StringUtils.isNotEmpty(proRoute.getFileList())) { - List ids = proRoute.getIdList(); -// for (int j = ids.size(); j < 1; j--) { - for (String id :ids) { - String[] f = proRoute.getFileList().split(","); - List files = new ArrayList<>(); - BaseFileData file = null; - for (String file1 : f) { - file = new BaseFileData(); - file.setFileId(IdUtils.fastSimpleUUID()); - file.setFileName(file1.split("&fileName=")[1]); - file.setFileAddress(file1); - file.setSourceId(id); - file.setCreateBy(SecurityUtils.getUsername()); - file.setCreateTime(new Date()); - files.add(file); - } - baseFileMapper.insertBaseFileBatch(files); - } - } - return 1; - } - - @Override - public int selectProRrouteByRouteCode(String routeCode) { - return proRouteMapper.selectProRouteByRouteCode(routeCode); - } -} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapServiceImpl.java deleted file mode 100644 index 4775864e..00000000 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapServiceImpl.java +++ /dev/null @@ -1,1226 +0,0 @@ -package com.op.sap.service.impl; - -import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; -import com.op.common.core.domain.R; -import com.op.common.core.utils.DateUtils; -import com.op.common.core.utils.http.HttpUtils; -import com.op.common.core.utils.uuid.IdUtils; -import com.op.common.core.utils.uuid.UUID; -import com.op.sap.domain.*; -import com.op.sap.mapper.*; -import com.op.sap.service.ISapBaseProductService; -import com.op.sap.service.SapService; -import com.op.sap.util.SAPConnUtils; -import com.op.system.api.RemoteMesService; -import com.op.system.api.RemotePlanService; -import com.op.system.api.model.SapProOrder; -import com.sap.conn.jco.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -@Service -public class SapServiceImpl implements SapService { - -// @Autowired -// private RemotePlanService remotePlanService; - - @Autowired - private ISapBaseProductService sapBaseProductService; - - @Autowired - private SapBaseProductMapper sapBaseProductMapper; - @Autowired - private SapProRouteMapper sapProRouteMapper; - @Autowired - private SapProRouteProductMapper sapProRouteProductMapper; - @Autowired - private SapProProcessMapper sapProProcessMapper; - @Autowired - private SapProProcessContentMapper sapProProcessContentMapper; - @Autowired - private SapProRouteProcessMapper sapProRouteProcessMapper; - - @Value("${sap.ashost}") - public String ashost; - - @Value("${sap.sysnr}") - public String sysnr; - - @Value("${sap.client}") - public String client; - - @Value("${sap.user}") - public String user; - - @Value("${sap.passwd}") - public String passwd; - - @Value("${sap.lang}") - public String lang; - - @Value("${sap.pool_capacity}") - public String pool_capacity; - - @Value("${sap.peak_limit}") - public String peak_limit; - - @Value("${sap.saprouter}") - public String saprouter; - - @Override - public List shopOrderSync(SapProOrder sapProOrder) { - - - // 连接 - SapConn con = new SapConn( - ashost, - sysnr, - client, - user, - passwd, - lang, - pool_capacity, - peak_limit, - saprouter - ); - JCoDestination jCoDestination = SAPConnUtils.connect(con); - try { - // 获取调用 RFC 函数对象 - JCoFunction func = jCoDestination.getRepository().getFunction("ZPPR_MES_PRO_TO"); - // 配置传入参数 - JCoParameterList importParameterList = func.getImportParameterList(); -// importParameterList.setValue("S_AUFNR",001002125255 ); - // 调用并获取返回值 - func.execute(jCoDestination); - // 获取 内表 - ZMES_PRO - JCoTable maraTable = func.getTableParameterList().getTable("ZMES_PRO"); - JCoRecordMetaData metaData = maraTable.getRecordMetaData(); - System.out.println("###" + metaData.toString()); - SapProOrder proOrder = new SapProOrder(); - List proOrderList = new ArrayList<>(); - // 循环输出 Table 数据 - for (int i = 0; i < maraTable.getNumRows(); i++) { - maraTable.setRow(i); - String AUFNR = maraTable.getString("AUFNR"); - String AUART = maraTable.getString("AUART"); - String MAUFNR = maraTable.getString("MAUFNR"); - String PLNBEZ = maraTable.getString("PLNBEZ"); - String MAKTX = maraTable.getString("MAKTX"); - String PWERK = maraTable.getString("PWERK"); - String GAMNG = maraTable.getString("GAMNG"); - String GMEIN = maraTable.getString("GMEIN"); - String PLNNR = maraTable.getString("PLNNR"); - String GSTRP = maraTable.getString("GSTRP"); - String GLTRP = maraTable.getString("GLTRP"); - String ERNAM = maraTable.getString("ERNAM"); - String ERDAT = maraTable.getString("ERDAT"); - String STTXT = maraTable.getString("STTXT"); - System.out.println("订单号：" + AUFNR + " - 订单类型：" + AUART + " - 上级订单编号：" + MAUFNR + " - 物料号：" + PLNBEZ + " - 物料描述（短文本）：" + MAKTX - + " - 订单的计划工厂：" + PWERK + " - 订单数量总计：" + GAMNG + " - 基本计量单位：" + GMEIN + " - 任务清单组码：" + PLNNR + " - 基本开始日期：" + GSTRP - + " - 基本完成日期：" + GLTRP + " - 输入者：" + ERNAM + " - 创建日期：" + ERDAT + " - 系统状态：" + STTXT); - proOrder.setId(IdUtils.fastSimpleUUID()); - proOrder.setPlanFactoryCode(PWERK); - proOrder.setOrderCode(AUFNR); - proOrder.setOrderType(AUART); - proOrder.setProdCode(PLNBEZ); - proOrder.setProdDesc(MAKTX); - proOrder.setQuantity(Long.parseLong(GAMNG.substring(0, GAMNG.indexOf(".")))); - proOrder.setUnit(GMEIN); - proOrder.setWorkerOrder(PLNNR); - proOrder.setPlanProDate(DateUtils.dateTime("yyyy-MM-dd", GSTRP)); - proOrder.setPlanComplete(DateUtils.dateTime("yyyy-MM-dd", GLTRP)); - proOrder.setParentOrder(MAUFNR); - proOrder.setCreateBy(ERNAM); - proOrder.setCreateTime(DateUtils.dateTime("yyyy-MM-dd", ERDAT)); - proOrder.setUpdateBy(ERNAM); - proOrder.setUpdateTime(DateUtils.dateTime("yyyy-MM-dd", ERDAT)); - proOrder.setStatus("0"); - proOrderList.add(proOrder); - // remotePlanService.sapAddOrder(proOrder); - // remoteMesService.sapAddOrder(proOrder); - } - return proOrderList; - } catch (Exception e) { - return null; - } - } - - - @Override - public R sapItem() { - DynamicDataSourceContextHolder.push("lanju_op_xiaolan_ds"); - // 连接 - SapConn con = new SapConn( - ashost, - sysnr, - client, - user, - passwd, - lang, - pool_capacity, - peak_limit, - saprouter - ); - JCoDestination jCoDestination = SAPConnUtils.connect(con); - try { -// // 获取调用 RFC 函数对象 -// JCoFunction func = jCoDestination.getRepository().getFunction("ZMMR_MES_MAT_GET"); -// // 配置传入参数 -// JCoParameterList importParameterList = func.getImportParameterList(); -// //importParameterList.setValue("S_AUFNR",001002125255 ); -// // 调用并获取返回值 -// func.execute(jCoDestination); -// // 获取 内表 - ZMES_PRO -// JCoTable maraTable = func.getTableParameterList().getTable("LT_MARA"); -// JCoRecordMetaData metaData = maraTable.getRecordMetaData(); -// System.out.println("###"+metaData.toString()); -// SapProOrder proOrder=new SapProOrder(); -// List proOrderList=new ArrayList<>(); -// // 循环输出 Table 数据 -// for (int i = 0; i < maraTable.getNumRows(); i++) { -// maraTable.setRow(i); -// String AUFNR = maraTable.getString("AUFNR"); -// String AUART = maraTable.getString("AUART"); -// String MAUFNR = maraTable.getString("MAUFNR"); -// String PLNBEZ = maraTable.getString("PLNBEZ"); - //获取调用 RFC 函数对象 - JCoFunction func = jCoDestination.getRepository().getFunction("ZMMR_MES_MAT_GET"); - // 配置传入参数 - JCoParameterList importParameterList = func.getImportParameterList(); - //importParameterList.setValue("S_AUFNR",001002125255 ); - // 调用并获取返回值 - func.execute(jCoDestination); - // 获取 内表 - LT_BOM - JCoTable maraTable = func.getTableParameterList().getTable("LT_MARA"); - JCoRecordMetaData metaData = maraTable.getRecordMetaData(); - System.out.println("###" + metaData.toString()); -// SapProOrder proOrder=new SapProOrder(); - SapBaseProduct baseProduct = new SapBaseProduct(); - String[] str = new String[maraTable.getNumRows()]; - List baseProductList = new ArrayList<>(); - // 循环输出 Table 数据 - for (int i = 0; i < maraTable.getNumRows(); i++) { - - 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" + MATNR + "MAKTX" + MAKTX); - baseProduct.setProductCode(MATNR); - baseProduct.setProductDescZh(MAKTX); -// baseProduct.setProductean11(EAN11); - baseProduct.setProductGroup(MATKL); - baseProduct.setProductGroupName(WGBEZ); - baseProduct.setGrossWeight(BRGEW); - baseProduct.setNetWeight(NTGEW); - baseProduct.setVolume(VOLUM); - baseProduct.setDelFlag("0"); - str[i] = baseProduct.getProductCode(); - if (i!=0){ - if (str[i].equals(str[i-1])) { - System.out.println("chongfu"); - - }else { - sapBaseProductMapper.insertBaseProduct(baseProduct); - } - } - - -// baseProductList.add(i, baseProduct); -// sapBaseProductMapper.insertBaseProduct(baseProduct); - - - } - } catch (Exception e) { - return R.fail(e.getMessage()); - } - return R.ok(); - } - - @Override - public R sapBom() { - // 连接 - SapConn con = new SapConn( - ashost, - sysnr, - client, - user, - passwd, - lang, - pool_capacity, - peak_limit, - saprouter - ); - JCoDestination jCoDestination = SAPConnUtils.connect(con); - try { - // 获取调用 RFC 函数对象 - JCoFunction func = jCoDestination.getRepository().getFunction("ZMMR_MES_MAT_GET"); - // 配置传入参数 - JCoParameterList importParameterList = func.getImportParameterList(); - //importParameterList.setValue("S_AUFNR",001002125255 ); - // 调用并获取返回值 - func.execute(jCoDestination); - // 获取 内表 - ZMES_PRO - JCoTable maraTable = func.getTableParameterList().getTable("LT_MARA"); - JCoRecordMetaData metaData = maraTable.getRecordMetaData(); - System.out.println("###" + metaData.toString()); - SapProOrder proOrder = new SapProOrder(); - List proOrderList = new ArrayList<>(); - // 循环输出 Table 数据 - for (int i = 0; i < maraTable.getNumRows(); i++) { - maraTable.setRow(i); - String AUFNR = maraTable.getString("AUFNR"); - String AUART = maraTable.getString("AUART"); - String MAUFNR = maraTable.getString("MAUFNR"); - String PLNBEZ = maraTable.getString("PLNBEZ"); - System.out.println("工厂：" + AUFNR + " - 物料号：" + AUART + " - 物料组：" - + MAUFNR + " - 生产版本：" + PLNBEZ); - } - -// sapBaseProductService.insertBaseProduct(baseProduct); - } - catch( - Exception e) - - { - return R.fail(e.getMessage()); - } - return R.ok(); -} - - @Override - public R sapProRoute() { - DynamicDataSourceContextHolder.push("lanju_op_xiaolan_ds"); - // 连接 - SapConn con = new SapConn( - ashost, - sysnr, - client, - user, - passwd, - lang, - pool_capacity, - peak_limit, - saprouter - ); - JCoDestination jCoDestination = SAPConnUtils.connect(con); - try { - // 获取调用 RFC 函数对象 - JCoFunction func = jCoDestination.getRepository().getFunction("ZPPR_MES_ROUTING"); - // 配置传入参数 - JCoParameterList importParameterList = func.getImportParameterList(); -// System.out.println(importParameterList.getListMetaData()); - // importParameterList.setValue("S_ERDAT","2019-11-07" ); - // 调用并获取返回值 - func.execute(jCoDestination); - // 获取 内表 - ZMES_PRO - JCoTable maraTable = func.getTableParameterList().getTable("LT_ROUTING"); - JCoRecordMetaData metaData = maraTable.getRecordMetaData(); - String[] str = new String[maraTable.getNumRows()]; -// System.out.println("###" + metaData.toString()); - - List proRouteList = new ArrayList<>(); - for (int i = 0; i new TreeSet<>(Comparator.comparing(SapProRoute::getRouteCode))), - ArrayList::new)); - for (int i = 0; i < proRouteList.size(); i++) { - sapProRouteMapper.insertProRoute(proRouteList.get(i)); - } - - - } - catch (Exception e){ - return R.fail(e.getMessage()); - } - return R.ok(); - } - - @Override - public R sapProRouteProduct() { - DynamicDataSourceContextHolder.push("lanju_op_xiaolan_ds"); - // 连接 - SapConn con = new SapConn( - ashost, - sysnr, - client, - user, - passwd, - lang, - pool_capacity, - peak_limit, - saprouter - ); - JCoDestination jCoDestination = SAPConnUtils.connect(con); - try { - // 获取调用 RFC 函数对象 - JCoFunction func = jCoDestination.getRepository().getFunction("ZPPR_MES_ROUTING"); - // 配置传入参数 - JCoParameterList importParameterList = func.getImportParameterList(); -// System.out.println(importParameterList.getListMetaData()); - // importParameterList.setValue("S_ERDAT","2019-11-07" ); - // 调用并获取返回值 - func.execute(jCoDestination); - // 获取 内表 - ZMES_PRO - JCoTable maraTable = func.getTableParameterList().getTable("LT_ROUTING"); - JCoRecordMetaData metaData = maraTable.getRecordMetaData(); - String[] str = new String[maraTable.getNumRows()]; -// System.out.println("###" + metaData.toString()); - List proRouteList = new ArrayList<>(); - List proRouteProductList = new ArrayList<>(); - for (int i = 0; i new TreeSet<>(Comparator.comparing(SapProRoute::getRouteCode))), - ArrayList::new)); - for (int i = 0; i < proRouteList.size(); i++) { - sapProRouteMapper.insertProRoute(proRouteList.get(i)); - } -// for (int i = 0; i sapProRouteProcess() { - DynamicDataSourceContextHolder.push("lanju_op_xiaolan_ds"); - // 连接 - SapConn con = new SapConn( - ashost, - sysnr, - client, - user, - passwd, - lang, - pool_capacity, - peak_limit, - saprouter - ); - JCoDestination jCoDestination = SAPConnUtils.connect(con); - try { - // 获取调用 RFC 函数对象 - JCoFunction func = jCoDestination.getRepository().getFunction("ZPPR_MES_ROUTING"); - // 配置传入参数 - JCoParameterList importParameterList = func.getImportParameterList(); -// System.out.println(importParameterList.getListMetaData()); - // importParameterList.setValue("S_ERDAT","2019-11-07" ); - // 调用并获取返回值 - func.execute(jCoDestination); - // 获取 内表 - ZMES_PRO - JCoTable maraTable = func.getTableParameterList().getTable("LT_ROUTING"); - JCoRecordMetaData metaData = maraTable.getRecordMetaData(); - String[] str = new String[maraTable.getNumRows()]; -// System.out.println("###" + metaData.toString()); - List proProcessList = new ArrayList<>(); - List proRouteProcessList = new ArrayList<>(); - List proProcessContentList = new ArrayList<>(); - List proRouteList = new ArrayList(); - for (int i = 0,arr1=0,arr2=0; i new TreeSet<>(Comparator.comparing(SapProProcessContent::getContentText))), -// ArrayList::new)); -// for (int j=0; jnew TreeSet<>(Comparator.comparing(SapProRouteProcess::getProcessCode))), -// ArrayList::new)); -// for (int k = 0;knew TreeSet<>(Comparator.comparing(SapProRouteProcess::getProcessCode))), -// ArrayList::new)); -// for (int k = 0;k proOrderList = new ArrayList<>(); - for (int i = 0; i < maraTable.getNumRows(); i++) { - maraTable.setRow(i); - String AUFNR = maraTable.getString("AUFNR"); - String AUART = maraTable.getString("AUART"); - String MAUFNR = maraTable.getString("MAUFNR"); - String PLNBEZ = maraTable.getString("PLNBEZ"); - String MAKTX = maraTable.getString("MAKTX"); - String PWERK = maraTable.getString("PWERK"); - String GAMNG = maraTable.getString("GAMNG"); - String GMEIN = maraTable.getString("GMEIN"); - String PLNNR = maraTable.getString("PLNNR"); - String GSTRP = maraTable.getString("GSTRP"); - String GLTRP = maraTable.getString("GLTRP"); - String ERNAM = maraTable.getString("ERNAM"); - String ERDAT = maraTable.getString("ERDAT"); - String STTXT = maraTable.getString("STTXT"); - System.out.println("订单号：" +AUFNR+" - 订单类型：" + AUART+ " - 上级订单编号：" + MAUFNR+ " - 物料号：" + PLNBEZ+ " - 物料描述（短文本）：" + MAKTX - + " - 订单的计划工厂：" + PWERK+ " - 订单数量总计：" + GAMNG+ " - 基本计量单位：" + GMEIN+ " - 任务清单组码：" + PLNNR+ " - 基本开始日期：" + GSTRP - + " - 基本完成日期：" + GLTRP+ " - 输入者：" + ERNAM+ " - 创建日期：" + ERDAT+ " - 系统状态：" + STTXT); - } - // 循环输出 Table 数据 -// for (int i = 0; i < maraTable.getNumRows(); i++) { -// 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"); -// String BRGEW = maraTable.getString("BRGEW"); -// String NTGEW = maraTable.getString("NTGEW"); -// String VOLUM = maraTable.getString("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"); -// System.out.println("物料号：" + MATNR + " - 物料描述：" + MAKTX + " - 国际文件号(EAN/UPC)：" + EAN11 + " - 物料类型：" + MTART ); -// } - } - -} diff --git a/op-modules/op-sap/src/main/resources/banner.txt b/op-modules/op-sap/src/main/resources/banner.txt index deffc073..e8a75ab1 100644 --- a/op-modules/op-sap/src/main/resources/banner.txt +++ b/op-modules/op-sap/src/main/resources/banner.txt @@ -1,10 +1,10 @@ Spring Boot Version: ${spring-boot.version} Spring Application Name: ${spring.application.name} - - ____ _____ _____ _____ - / __ \| __ \ / ____| /\ | __ \ - | | | | |__) |____| (___ / \ | |__) | - | | | | ___/______\___ \ / /\ \ | ___/ - | |__| | | ____) / ____ \| | - \____/|_| |_____/_/ \_\_| - + _ + | | + ___ _ __ ______ ___ _ _ ___| |_ ___ _ __ ___ + / _ \| '_ \______/ __| | | / __| __/ _ \ '_ ` _ \ +| (_) | |_) | \__ \ |_| \__ \ || __/ | | | | | + \___/| .__/ |___/\__, |___/\__\___|_| |_| |_| + | | __/ | + |_| |___/ diff --git a/op-modules/op-sap/src/main/resources/mapper/SapBaseFileMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapBaseFileMapper.xml deleted file mode 100644 index 17144d6f..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapBaseFileMapper.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select file_id, file_name, file_address, source_id, remark, attr1, - attr2, attr3, attr4, create_by, create_time, update_by, - update_time from base_file - - - - - - - - - insert into base_file - - file_id, - file_name, - file_address, - source_id, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - - - #{fileId}, - #{fileName}, - #{fileAddress}, - #{sourceId}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - INSERT INTO base_file(file_id, file_name, file_address, source_id, remark, create_by, create_time) - VALUES - - ( - #{baseFile.fileId}, - #{baseFile.fileName}, - #{baseFile.fileAddress}, - #{baseFile.sourceId}, - #{baseFile.remark}, - #{baseFile.createBy}, - #{baseFile.createTime} - ) - - - - - update base_file - - file_name = #{fileName}, - file_address = #{fileAddress}, - source_id = #{sourceId}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where file_id = #{fileId} - - - - delete from base_file where file_id = #{fileId} - - - - delete from base_file where file_id in - - #{fileId} - - - - delete from base_file where source_id = #{sourceId} - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapBaseProductMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapBaseProductMapper.xml deleted file mode 100644 index 9c41bc73..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapBaseProductMapper.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent from base_product - - - - - - - - - insert into base_product - - product_id, - product_code, - product_desc_zh, - product_model, - product_desc_en, - rule_code, - old_product_code, - parts_product_code, - sku_barcode, - length, - width, - height, - gross_weight, - net_weight, - tare_weight, - volume, - unit_price, - product_group, - product_group_name, - user_defined1, - user_defined2, - user_defined3, - user_defined4, - user_defined5, - user_defined6, - create_by, - create_time, - update_by, - update_time, - factory_code, - active_flag, - sync_flag, - primary_uom, - del_flag, - bstme, - basic_order, - conv_order, - ausme, - basic_issue, - conv_issue, - append_flag, - append_percent, - - - #{productId}, - #{productCode}, - #{productDescZh}, - #{productModel}, - #{productDescEn}, - #{ruleCode}, - #{oldProductCode}, - #{partsProductCode}, - #{skuBarcode}, - #{length}, - #{width}, - #{height}, - #{grossWeight}, - #{netWeight}, - #{tareWeight}, - #{volume}, - #{unitPrice}, - #{productGroup}, - #{productGroupName}, - #{userDefined1}, - #{userDefined2}, - #{userDefined3}, - #{userDefined4}, - #{userDefined5}, - #{userDefined6}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{factoryCode}, - #{activeFlag}, - #{syncFlag}, - #{primaryUom}, - #{delFlag}, - #{bstme}, - #{basicOrder}, - #{convOrder}, - #{ausme}, - #{basicIssue}, - #{convIssue}, - #{appendFlag}, - #{appendPercent}, - - - - - update base_product - - product_code = #{productCode}, - product_desc_zh = #{productDescZh}, - product_model = #{productModel}, - product_desc_en = #{productDescEn}, - rule_code = #{ruleCode}, - old_product_code = #{oldProductCode}, - parts_product_code = #{partsProductCode}, - sku_barcode = #{skuBarcode}, - length = #{length}, - width = #{width}, - height = #{height}, - gross_weight = #{grossWeight}, - net_weight = #{netWeight}, - tare_weight = #{tareWeight}, - volume = #{volume}, - unit_price = #{unitPrice}, - product_group = #{productGroup}, - product_group_name = #{productGroupName}, - user_defined1 = #{userDefined1}, - user_defined2 = #{userDefined2}, - user_defined3 = #{userDefined3}, - user_defined4 = #{userDefined4}, - user_defined5 = #{userDefined5}, - user_defined6 = #{userDefined6}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - factory_code = #{factoryCode}, - active_flag = #{activeFlag}, - sync_flag = #{syncFlag}, - primary_uom = #{primaryUom}, - del_flag = #{delFlag}, - bstme = #{bstme}, - basic_order = #{basicOrder}, - conv_order = #{convOrder}, - ausme = #{ausme}, - basic_issue = #{basicIssue}, - conv_issue = #{convIssue}, - append_flag = #{appendFlag}, - append_percent = #{appendPercent}, - - where product_id = #{productId} - - - - delete from base_product where product_id = #{productId} - - - - delete from base_product where product_id in - - #{productId} - - - - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProProcessContentMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProProcessContentMapper.xml deleted file mode 100644 index aba63e58..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProProcessContentMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select content_id, process_id, order_num, content_text, device, material, doc_url, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_process_content - - - - - - - - insert into pro_process_content - - content_id, - process_id, - order_num, - content_text, - device, - material, - doc_url, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - - - #{contentId}, - #{processId}, - #{orderNum}, - #{contentText}, - #{device}, - #{material}, - #{docUrl}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update pro_process_content - - process_id = #{processId}, - order_num = #{orderNum}, - content_text = #{contentText}, - device = #{device}, - material = #{material}, - doc_url = #{docUrl}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where content_id = #{contentId} - - - - delete from pro_process_content where content_id = #{contentId} - - - - delete from pro_process_content where content_id in - - #{contentId} - - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProProcessMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProProcessMapper.xml deleted file mode 100644 index 073783b5..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProProcessMapper.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select process_id, process_code, process_name, attention, - enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, - update_by, update_time,split_merge,split_merg_num,sync,work_center,work_time,equipment - from pro_process - - - - - - - - - - - - - - insert into pro_process - - process_id, - process_code, - process_name, - attention, - enable_flag, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - split_merge, - split_merg_num, - sync, - work_center, - work_time, - equipment, - - - #{processId}, - #{processCode}, - #{processName}, - #{attention}, - #{enableFlag}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{splitMerge}, - #{splitMergNum}, - #{sync}, - #{workCenter}, - #{workTime}, - #{equipment}, - - - - update pro_process - - process_code = #{processCode}, - process_name = #{processName}, - attention = #{attention}, - enable_flag = #{enableFlag}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - split_merge = #{splitMerge}, - split_merg_num = #{splitMergNum}, - sync = #{sync}, - work_center = #{workCenter}, - work_time = #{workTime}, - equipment = #{equipment}, - - where process_id = #{processId} - - - - delete from pro_process where process_id = #{processId} - - - - delete from pro_process where process_id in - - #{processId} - - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProRouteMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProRouteMapper.xml deleted file mode 100644 index 2da47d31..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProRouteMapper.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - select route_id, route_code, route_name, route_desc, enable_flag, remark, - attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, - route_version,need_check - from pro_route - - - - - - - - - - - - - - - insert into pro_route - - route_id, - route_code, - route_name, - route_desc, - enable_flag, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - route_version, - need_check, - - - - #{routeId}, - #{routeCode}, - #{routeName}, - #{routeDesc}, - #{enableFlag}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{routeVersion}, - #{needCheck}, - - - - - - update pro_route - - route_code = #{routeCode}, - route_name = #{routeName}, - route_desc = #{routeDesc}, - enable_flag = #{enableFlag}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - route_version = #{routeVersion}, - #{needCheck}, - - where route_id = #{routeId} - - - - delete from pro_route where route_id = #{routeId} - - - - delete from pro_route where route_id in - - #{routeId} - - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProRouteProcessMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProRouteProcessMapper.xml deleted file mode 100644 index 49ecfe8b..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProRouteProcessMapper.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select record_id, route_id, process_id, process_code, process_name, order_num, next_process_id, next_process_code, next_process_name, link_type, default_pre_time, default_suf_time, color_code,key_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_process - - - - - - - - - - - - - - - - - - - insert into pro_route_process - - record_id, - route_id, - process_id, - process_code, - process_name, - order_num, - next_process_id, - next_process_code, - next_process_name, - link_type, - default_pre_time, - default_suf_time, - color_code, - key_flag, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - - - #{recordId}, - #{routeId}, - #{processId}, - #{processCode}, - #{processName}, - #{orderNum}, - #{nextProcessId}, - #{nextProcessCode}, - #{nextProcessName}, - #{linkType}, - #{defaultPreTime}, - #{defaultSufTime}, - #{colorCode}, - #{keyFlag}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update pro_route_process - - route_id = #{routeId}, - process_id = #{processId}, - process_code = #{processCode}, - process_name = #{processName}, - order_num = #{orderNum}, - next_process_id = #{nextProcessId}, - next_process_code = #{nextProcessCode}, - next_process_name = #{nextProcessName}, - link_type = #{linkType}, - default_pre_time = #{defaultPreTime}, - default_suf_time = #{defaultSufTime}, - key_flag = #{keyFlag}, - color_code = #{colorCode}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where record_id = #{recordId} - - - - delete from pro_route_process where record_id = #{recordId} - - - - delete from pro_route_process where record_id in - - #{recordId} - - - - delete from pro_route_process where route_id = #{routeId} - - diff --git a/op-modules/op-sap/src/main/resources/mapper/SapProRouteProductMapper.xml b/op-modules/op-sap/src/main/resources/mapper/SapProRouteProductMapper.xml deleted file mode 100644 index f63d3dbc..00000000 --- a/op-modules/op-sap/src/main/resources/mapper/SapProRouteProductMapper.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select record_id, route_id, item_id, item_code, item_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into pro_route_product - - record_id, - route_id, - item_id, - item_code, - item_name, - remark, - attr1, - attr2, - attr3, - attr4, - create_by, - create_time, - update_by, - update_time, - - - #{recordId}, - #{routeId}, - #{itemId}, - #{itemCode}, - #{itemName}, - #{remark}, - #{attr1}, - #{attr2}, - #{attr3}, - #{attr4}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update pro_route_product - - route_id = #{routeId}, - item_id = #{itemId}, - item_code = #{itemCode}, - item_name = #{itemName}, - remark = #{remark}, - attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - attr4 = #{attr4}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where record_id = #{recordId} - - - - delete from pro_route_product where record_id = #{recordId} - - - - delete from pro_route_product where record_id in - - #{recordId} - - - - delete from pro_route_product where route_id = #{routeId} - -