diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java index 6b8d2a27..7c1c73cf 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java @@ -40,7 +40,7 @@ public interface RemoteSapService { /**关闭订单**/ @PostMapping("/sap/sapCloseOrder") - public R sapCloseOrder(@RequestParam("shopOrder") String shopOrder); + public R sapCloseOrder(@RequestBody SapCloseOrderQuery sapCloseOrderQuery); /**报工**/ @PostMapping("/sap/sapRFWOrder") diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkConsumeDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkConsumeDTO.java new file mode 100644 index 00000000..abfbf4cf --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkConsumeDTO.java @@ -0,0 +1,197 @@ +package com.op.system.api.domain.mes; + +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; + +/** + * 生产报工物料消耗对象 mes_report_work_consume + * + * @author Open Platform + * @date 2023-08-24 + */ +public class MesReportWorkConsumeDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String recordId; + + /** 工单编码 */ + @Excel(name = "工单编码") + private String workorderCode; + + /** 物料编号 */ + @Excel(name = "物料编号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料规格型号 */ + @Excel(name = "物料规格型号") + private String materialSpc; + + /** 数量 */ + @Excel(name = "数量") + private Long quantity; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 预留字段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; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 工厂编码 */ + @Excel(name = "报工编码") + private String reportCode; + + //虚拟字段 + private String id; + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + + public void setWorkorderCode(String workorderCode) { + this.workorderCode = workorderCode; + } + public String getWorkorderCode() { + return workorderCode; + } + + public void setReportCode(String reportCode) { + this.reportCode = reportCode; + } + public String getReportCode() { + return reportCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialName() { + return materialName; + } + public void setMaterialSpc(String materialSpc) { + this.materialSpc = materialSpc; + } + + public String getMaterialSpc() { + return materialSpc; + } + public void setQuantity(Long quantity) { + this.quantity = quantity; + } + + public Long getQuantity() { + return quantity; + } + public void setUnit(String unit) { + this.unit = unit; + } + + public String getUnit() { + return unit; + } + 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; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + //虚拟字段 + public void setId(String factoryCode) { + this.id = id; + } + + public String getId() { + return id; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("id", getId()) + .append("reportCode", getReportCode()) + .append("workorderCode", getWorkorderCode()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("materialSpc", getMaterialSpc()) + .append("quantity", getQuantity()) + .append("unit", getUnit()) + .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()) + .append("factoryCode", getFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapCloseOrderQuery.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java similarity index 91% rename from op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapCloseOrderQuery.java rename to op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java index effeb118..f051c15a 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapCloseOrderQuery.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapCloseOrderQuery.java @@ -1,4 +1,4 @@ -package com.op.sap.domain.vo; +package com.op.system.api.domain.sap; public class SapCloseOrderQuery { diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java index fb002c67..6f90361c 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java @@ -40,7 +40,7 @@ public class RemoteSapFallbackFactory implements FallbackFactory selectRepairRecordByEquipmentCode(String equipmentCode); + + /** + * 设备看板刷新时间 + * 初始值：5分钟 + */ + String getDeviceRefreshTime(EquOperationRecord equOperationRecord); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java index 466671e2..db04b539 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java @@ -39,4 +39,10 @@ public interface IDeviceInterfaceService { * @return */ AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord); + + /** + * 设备看板刷新时间 + * 初始值：5分钟 + */ + public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index a58cb137..da8fba1c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -206,4 +206,15 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { EquOperationRecord equipmentIntactRate = equOperationRecordMapper.getEquipmentIntactRate(equOperationRecord); return success(equipmentIntactRate); } + + /** + * 看板刷新时间 + */ + @Override + @DS("master") + public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) { + String refreshTime = deviceInterfaceMapper.getDeviceRefreshTime(equOperationRecord); + int time = Integer.parseInt(refreshTime); + return success(time); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index d72e0b73..b137c4ea 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -264,26 +264,29 @@ public class EquPlanServiceImpl implements IEquPlanService { if (equCheckItemList.size() > 0) { List detailList = new ArrayList<>(); for (EquCheckItem checkItem : equCheckItemList) { - EquPlanDetail detail = new EquPlanDetail(); - BeanUtils.copyProperties(checkItem,detail); - - if (!detail.getItemCode().isEmpty()) { - itemTempName.append(detail.getItemName()).append(","); - // 获取检查项详情list - List equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode()); - if (equCheckItemList.size() > 0) { - List standardList = new ArrayList<>(); - for (EquCheckItemDetail standardTemp : equCheckItemDetailList) { - EquPlanStandard standard = new EquPlanStandard(); - BeanUtils.copyProperties(standardTemp,standard); - - standard.setShowFlag(true); - standardList.add(standard); + // 只需要循环周期一致的检查项 + if(checkItem.getItemLoop() == data.getItemLoop() && checkItem.getItemLoopType().equals(data.getItemLoopType())) { + EquPlanDetail detail = new EquPlanDetail(); + BeanUtils.copyProperties(checkItem,detail); + + if (!detail.getItemCode().isEmpty()) { + itemTempName.append(detail.getItemName()).append(","); + // 获取检查项详情list + List equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode()); + if (equCheckItemList.size() > 0) { + List standardList = new ArrayList<>(); + for (EquCheckItemDetail standardTemp : equCheckItemDetailList) { + EquPlanStandard standard = new EquPlanStandard(); + BeanUtils.copyProperties(standardTemp,standard); + + standard.setShowFlag(true); + standardList.add(standard); + } + detail.setEquPlanStandardList(standardList); } - detail.setEquPlanStandardList(standardList); } + detailList.add(detail); } - detailList.add(detail); } data.setEquPlanDetailList(detailList); data.setItemTempName(itemTempName.toString()); @@ -365,6 +368,8 @@ public class EquPlanServiceImpl implements IEquPlanService { List standardList = equPlanStandardMapper.selectEquPlanStandardListByParentCode(detail.getId()); for (EquPlanStandard standard : standardList) { standard.setShowFlag(true); + standard.setItemLoop(detail.getItemLoop()); + standard.setItemLoopType(detail.getItemLoopType()); } // 置入标准 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java index 869c5b83..7301bc0a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java @@ -46,26 +46,29 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService { if (equCheckItemList.size() > 0) { List detailList = new ArrayList<>(); for (EquCheckItem checkItem : equCheckItemList) { - EquPlanDetail detail = new EquPlanDetail(); - BeanUtils.copyProperties(checkItem,detail); - - if (!detail.getItemCode().isEmpty()) { - itemTempName.append(detail.getItemName()).append(","); - // 获取检查项详情list - List equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode()); - if (equCheckItemList.size() > 0) { - List standardList = new ArrayList<>(); - for (EquCheckItemDetail standardTemp : equCheckItemDetailList) { - EquPlanStandard standard = new EquPlanStandard(); - BeanUtils.copyProperties(standardTemp,standard); - - standard.setShowFlag(true); - standardList.add(standard); + // 只需要循环周期一致的检查项 + if(checkItem.getItemLoop() == data.getItemLoop() && checkItem.getItemLoopType().equals(data.getItemLoopType())) { + EquPlanDetail detail = new EquPlanDetail(); + BeanUtils.copyProperties(checkItem,detail); + + if (!detail.getItemCode().isEmpty()) { + itemTempName.append(detail.getItemName()).append(","); + // 获取检查项详情list + List equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode()); + if (equCheckItemList.size() > 0) { + List standardList = new ArrayList<>(); + for (EquCheckItemDetail standardTemp : equCheckItemDetailList) { + EquPlanStandard standard = new EquPlanStandard(); + BeanUtils.copyProperties(standardTemp,standard); + + standard.setShowFlag(true); + standardList.add(standard); + } + detail.setEquPlanStandardList(standardList); } - detail.setEquPlanStandardList(standardList); } + detailList.add(detail); } - detailList.add(detail); } data.setEquPlanDetailList(detailList); data.setItemTempName(itemTempName.toString()); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java index 77c4783d..ce0a9008 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java @@ -182,26 +182,29 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { if (equCheckItemList.size() > 0) { List detailList = new ArrayList<>(); for (EquCheckItem checkItem : equCheckItemList) { - EquPlanDetail detail = new EquPlanDetail(); - BeanUtils.copyProperties(checkItem,detail); - - if (!detail.getItemCode().isEmpty()) { - itemTempName.append(detail.getItemName()).append(","); - // 获取检查项详情list - List equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode()); - if (equCheckItemList.size() > 0) { - List standardList = new ArrayList<>(); - for (EquCheckItemDetail standardTemp : equCheckItemDetailList) { - EquPlanStandard standard = new EquPlanStandard(); - BeanUtils.copyProperties(standardTemp,standard); - - standard.setShowFlag(true); - standardList.add(standard); + // 只需要循环周期一致的检查项 + if(checkItem.getItemLoop() == data.getItemLoop() && checkItem.getItemLoopType().equals(data.getItemLoopType())) { + EquPlanDetail detail = new EquPlanDetail(); + BeanUtils.copyProperties(checkItem,detail); + + if (!detail.getItemCode().isEmpty()) { + itemTempName.append(detail.getItemName()).append(","); + // 获取检查项详情list + List equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode()); + if (equCheckItemList.size() > 0) { + List standardList = new ArrayList<>(); + for (EquCheckItemDetail standardTemp : equCheckItemDetailList) { + EquPlanStandard standard = new EquPlanStandard(); + BeanUtils.copyProperties(standardTemp,standard); + + standard.setShowFlag(true); + standardList.add(standard); + } + detail.setEquPlanStandardList(standardList); } - detail.setEquPlanStandardList(standardList); } + detailList.add(detail); } - detailList.add(detail); } data.setEquPlanDetailList(detailList); data.setItemTempName(itemTempName.toString()); diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index 27dfd636..06c2b7f8 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -21,7 +21,7 @@ + + \ No newline at end of file diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index e9ddc3d9..edc31d23 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -9,13 +9,11 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.utils.http.HttpUtils; import com.op.common.core.utils.uuid.IdUtils; -import com.op.mes.domain.BufferInfoParam; -import com.op.mes.domain.MesReportWork; -import com.op.mes.domain.MesShift; -import com.op.mes.domain.ProOrderWorkorder; +import com.op.mes.domain.*; import com.op.mes.domain.buffer.JsonRootBean; import com.op.mes.domain.dto.LGInfoDto; import com.op.mes.mapper.MesMapper; +import com.op.mes.mapper.MesReportWorkConsumeMapper; import com.op.mes.mapper.MesReportWorkMapper; import com.op.mes.mapper.ProRfidProcessDetailMapper; import com.op.mes.service.IWCSInterfaceService; @@ -28,6 +26,7 @@ import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataDTO; import com.op.system.api.domain.mes.ProRfidProcessDetail; +import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapRFW; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -69,6 +68,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { @Autowired private RemoteSapService remoteSapService; + @Autowired + private MesReportWorkConsumeMapper mesReportWorkConsumeMapper; + /**下一工序机台集合获取 * JSON * { @@ -305,21 +307,27 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { ltgs.setConf_activity6(work.getSac6()); sapRFW.setLt_gs(ltgs); List lt_hwList =new ArrayList<>(); - SapRFW.lt_hw lthw = sapRFW.new lt_hw();//MES生产订单报工货物移动修改 - lthw.setEntry_qnt(work.getQuantityFeedback().toString());//TODO; - lthw.setMaterial(work.getProcessCode()); - lt_hwList.add(lthw); + logger.info(work.getWorkorderCodeSap()+"母sap工单报工：报工数量"+sapRFW.getGamng()); + MesReportWorkConsume consumeqo = new MesReportWorkConsume(); + consumeqo.setWorkorderCode(work.getWorkorderCode()); + List consumes = mesReportWorkConsumeMapper.selectMesReportWorkConsumeList(consumeqo); + if(!CollectionUtils.isEmpty(consumes)){ + for(MesReportWorkConsume consume:consumes){ + logger.info(work.getWorkorderCodeSap()+"母sap工单报工：【原料损耗】"+ + consume.getMaterialCode()+"|"+consume.getQuantity()); + SapRFW.lt_hw lthw = sapRFW.new lt_hw();//MES生产订单报工货物移动修改 + lthw.setEntry_qnt(consume.getQuantity()+"");//数量 + lthw.setMaterial(consume.getMaterialCode());//物料编码 + lt_hwList.add(lthw); + } + }else{ + logger.info(work.getWorkorderCodeSap()+"母sap工单报工：工单"+work.getWorkorderCode()+"mes_report_work_consume没有数据"); + return R.fail("mes_report_work_consume没有数据"); + } sapRFW.setLt_hwList(lt_hwList); - //添加调用sap日志 - SysSapLog sysSapLog = new SysSapLog(); - sysSapLog.setId(IdUtils.fastSimpleUUID()); - sysSapLog.setMesssge(sapRFW.toString()); - sysSapLog.setMethod("reportWork"); - sysSapLog.setReqcode("请求"); - sysSapLog.setCreateTime(DateUtils.getNowDate()); - mesMapper.addSapLog(sysSapLog); R r = remoteSapService.sapRFWOrder(sapRFW); + logger.info(work.getWorkorderCodeSap()+"母sap工单报工结果："+r.getCode()+","+r.getData()+","+r.getMsg()); //上传成功，更改mes_report_work状态 if (r.getCode() == 200) { work.setUploadStatus("1"); @@ -339,10 +347,16 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { logger.info("工单请求关闭：调用remoteSapService.sapCloseOrder,参数："+work.getWorkorderCodeSap()); //工单完成，关闭工单 List sapWorkOrders = mesReportWorkMapper.getSapWorkOrder(work.getWorkorderCode());//根据belong_work_order找到所有要关闭的虚拟工单 - for(String sapWorkOrder:sapWorkOrders){ - R r2= remoteSapService.sapCloseOrder(sapWorkOrder); - logger.info("工单"+work.getWorkorderCode()+",sapworkorder:"+sapWorkOrder+",sap关闭"+r.getCode()+",返回信息:"+r.getMsg()); - } + //关闭母子订单//订单的订单编码 + SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery(); + sapCloseOrderQuery.setLeadOrder(sapWorkOrders.get(0)); + sapCloseOrderQuery.setOrder(sapWorkOrders.get(1)); + R closeR = remoteSapService.sapCloseOrder(sapCloseOrderQuery); + logger.info(work.getWorkorderCodeSap()+"报工后关闭母子工单"+sapCloseOrderQuery.getLeadOrder()+":"+ + sapCloseOrderQuery.getOrder()+":"+ + closeR.getCode()+","+ + closeR.getMsg()+","+ + closeR.getData()); work.setStatus("w3"); work.setUpdateTime(DateUtils.getNowDate()); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index c10cc1b8..f6ae8139 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -275,18 +275,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_factory where f_type = 'c' diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java index ab213853..c7396d17 100644 --- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java +++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java @@ -2,6 +2,7 @@ package com.op.open.mapper; import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.dto.WCSDTO; +import com.op.system.api.domain.mes.MesReportWorkConsumeDTO; import com.op.system.api.domain.mes.MesReportWorkDTO; import com.op.system.api.domain.mes.ProOrderWorkorderDTO; import com.op.system.api.domain.mes.ProRfidProcessDetail; @@ -43,5 +44,7 @@ public interface OpenMapper { List getLGInfo(WCSDTO wcsDTO); List getSapWorkOrder(String workorderCode); + + List selectMesReportWorkConsumeList(MesReportWorkConsumeDTO consumeqo); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index eef5e8e8..ebdcc7bd 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -1,6 +1,7 @@ package com.op.open.service.impl; import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; @@ -12,9 +13,11 @@ import com.op.system.api.RemoteSapService; import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataDTO; +import com.op.system.api.domain.mes.MesReportWorkConsumeDTO; import com.op.system.api.domain.mes.MesReportWorkDTO; import com.op.system.api.domain.mes.ProOrderWorkorderDTO; import com.op.system.api.domain.mes.ProRfidProcessDetail; +import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapRFW; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -173,20 +176,28 @@ public class OpenServiceImpl implements OpenService { ltgs.setConf_activity5(work.getSac5());//折旧 ltgs.setConf_activity6(work.getSac6()); sapRFW.setLt_gs(ltgs); - SapRFW.lt_hw lthw = sapRFW.new lt_hw();//MES生产订单报工货物移动修改 - lthw.setEntry_qnt(work.getQuantityFeedback().toString());//TODO; - lthw.setMaterial(work.getProcessCode()); - sapRFW.setLt_hw(lthw); - //添加调用sap日志 - SysSapLog sysSapLog = new SysSapLog(); - sysSapLog.setId(IdUtils.fastSimpleUUID()); - sysSapLog.setMesssge(sapRFW.toString()); - sysSapLog.setMethod("reportWork"); - sysSapLog.setReqcode("请求"); - sysSapLog.setCreateTime(DateUtils.getNowDate()); - openMapper.addSapLog(sysSapLog); - + List lt_hwList =new ArrayList<>(); + logger.info(work.getWorkorderCodeSap()+"母sap工单报工：报工数量"+sapRFW.getGamng()); + MesReportWorkConsumeDTO consumeqo = new MesReportWorkConsumeDTO(); + consumeqo.setWorkorderCode(work.getWorkorderCode()); + List consumes = openMapper.selectMesReportWorkConsumeList(consumeqo); + if(!CollectionUtils.isEmpty(consumes)){ + for(MesReportWorkConsumeDTO consume:consumes){ + logger.info(work.getWorkorderCodeSap()+"母sap工单报工：【原料损耗】"+ + consume.getMaterialCode()+"|"+consume.getQuantity()); + SapRFW.lt_hw lthw = sapRFW.new lt_hw();//MES生产订单报工货物移动修改 + lthw.setEntry_qnt(consume.getQuantity()+"");//数量 + lthw.setMaterial(consume.getMaterialCode());//物料编码 + lt_hwList.add(lthw); + } + }else{ + logger.info(work.getWorkorderCodeSap()+"母sap工单报工：工单"+work.getWorkorderCode()+"==mes_report_work_consume没有数据"); + //return R.fail("mes_report_work_consume没有数据"); + } + sapRFW.setLt_hwList(lt_hwList); + logger.info(work.getWorkorderCodeSap()+"母sap工单报工请求："+ JSONObject.toJSONString(sapRFW)); R r = remoteSapService.sapRFWOrder(sapRFW); + logger.info(work.getWorkorderCodeSap()+"母sap工单报工结果："+r.getCode()+","+r.getData()+","+r.getMsg()); //上传成功，更改mes_report_work状态 if (r.getCode() == 200) { work.setUploadStatus("1"); @@ -199,18 +210,21 @@ public class OpenServiceImpl implements OpenService { //工单完成数量>工单数量：关闭订单 MesReportWorkDTO proResult = openMapper.getProdResult(work); //ProOrderWorkorderDTO topOrder = this.getTopOrder(work.getWorkorderCode()); - if(proResult.getQuantityFeedback().compareTo(work.getQuantitySplit())>=0 - || - "1".equals(work.getEndReport())//最终报工标识 + if(proResult.getQuantityFeedback().compareTo(work.getQuantitySplit())>=0||"1".equals(work.getEndReport())//最终报工标识 ){ logger.info("工单请求关闭：调用remoteSapService.sapCloseOrder,参数："+work.getWorkorderCodeSap()); - //工单完成，关闭母工单 List sapWorkOrders = openMapper.getSapWorkOrder(work.getWorkorderCode());//根据belong_work_order找到所有要关闭的虚拟工单 - for(String sapWorkOrder:sapWorkOrders){ - R rclose = remoteSapService.sapCloseOrder(sapWorkOrder); - logger.info("工单"+work.getWorkorderCode()+",sapworkorder:"+sapWorkOrder+",sap关闭"+r.getCode()+",返回信息:"+r.getMsg()); - } + //关闭母子订单//订单的订单编码 + SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery(); + sapCloseOrderQuery.setLeadOrder(sapWorkOrders.get(0)); + sapCloseOrderQuery.setOrder(sapWorkOrders.get(1)); + R closeR = remoteSapService.sapCloseOrder(sapCloseOrderQuery); + logger.info(work.getWorkorderCodeSap()+"下发工单后关闭母子工单"+sapCloseOrderQuery.getLeadOrder()+":"+ + sapCloseOrderQuery.getOrder()+":"+ + closeR.getCode()+","+ + closeR.getMsg()+","+ + closeR.getData()); work.setStatus("w3"); work.setUpdateTime(DateUtils.getNowDate()); //pro_work_order status->w3报工--belong_work_order diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index 6057fab1..ec32eebf 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -124,7 +124,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 5c041426..9a00d021 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -21,6 +21,7 @@ import com.op.system.api.RemoteSapService; import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.dto.MesPrepareDTO; import com.op.system.api.domain.dto.MesPrepareDetailDTO; +import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapCreateOrder; import com.op.system.api.domain.sap.SapMaterialPreparation; import com.op.system.api.domain.sap.SapShopOrderQuery; @@ -306,14 +307,14 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { sapList.add(sap); //添加调用sap日志 - SysSapLog sysSapLog = new SysSapLog(); - sysSapLog.setId(IdUtils.fastSimpleUUID()); - sysSapLog.setMesssge(Arrays.asList(sapList).toString()); - sysSapLog.setMethod("downProOrderWorkorderByWorkorderIds"); - sysSapLog.setReqcode("请求"); - sysSapLog.setCreateTime(DateUtils.getNowDate()); - proOrderMapper.addSapLog(sysSapLog); - +// SysSapLog sysSapLog = new SysSapLog(); +// sysSapLog.setId(IdUtils.fastSimpleUUID()); +// sysSapLog.setMesssge(Arrays.asList(sapList).toString()); +// sysSapLog.setMethod("downProOrderWorkorderByWorkorderIds"); +// sysSapLog.setReqcode("请求"); +// sysSapLog.setCreateTime(DateUtils.getNowDate()); +// proOrderMapper.addSapLog(sysSapLog); + logger.info(whiteOrder.getWorkorderCode()+"sap工单回传sap虚拟工单号开始："+Arrays.asList(sapList).toString()); R>> r = remoteSapService.SapCreateOrder(sapList); logger.info("sap工单回传：" + r.getMsg()); if (500 == r.getCode()) { @@ -328,7 +329,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { } Date updateTime = DateUtils.getNowDate(); if (!CollectionUtils.isEmpty(returnCodes)) { - logger.info("sap工单回传sap虚拟工单号：" + StringUtils.join(returnCodes, ",")); + logger.info("sap工单回传sap虚拟工单号结束：" + StringUtils.join(returnCodes, ",")); //按照母子顺序进行更新 for (int m=0;m list = qcProCheckService.getCheckTaskList(qcCheckTaskIncome); + return getDataTable(list); } /** * 获取待检验信息列表 @@ -204,13 +204,44 @@ public class QuaController extends BaseController { } return success(qcProCheckService.getCheckTaskDetailList(qcCheckTaskDetail)); } - /**检测结果提交**/ - @PostMapping("/commitCheckResults") - public AjaxResult commitCheckResults(@RequestBody List details) { - if(CollectionUtils.isEmpty(details)){ + + /** + * 获取待检验信息列表 + */ + @PostMapping(value = "commitCheckResults") + public AjaxResult commitCheckResults(@RequestBody List qcCheckTaskDetails) { + if(CollectionUtils.isEmpty(qcCheckTaskDetails)){ return error("[List]不能为空"); } - return toAjax(qcCheckTaskIncomeService.commitCheckResults(details)); + return success(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskDetails)); + } + /** + * 检验单位 + */ + @GetMapping(value = "getQcUnitList") + public TableDataInfo getQcUnitList(SysDictData sysDictData) { + startPage(); + List list = qcProCheckService.getQcUnitList(sysDictData); + return getDataTable(list); + } + /** + * 检验项目 + */ + @GetMapping("/pdaMaterialTree") + public AjaxResult pdaMaterialTree(QcMaterialGroup materialGroup) { + DynamicDataSourceContextHolder.push("ds_"+materialGroup.getFactoryCode()); + return success(qcMaterialGroupService.selectQcMaterialTreeList(materialGroup)); } + /** + * 查询物料检验项目维护列表 + */ + + @GetMapping("/getCheckTypeProjectList") + public TableDataInfo list(QcCheckTypeProject qcCheckTypeProject) { + DynamicDataSourceContextHolder.push("ds_"+qcCheckTypeProject.getFactoryCode()); + startPage(); + List list = qcMaterialGroupService.getCheckTypeProjectList(qcCheckTypeProject); + return getDataTable(list); + } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java index 72b8ac8d..4517e562 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -95,6 +95,15 @@ public class QcCheckTaskDetail extends BaseEntity { private List actualValues; private String typeProjectId; private String defectCode; + private String checkType; + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } public String getDefectCode() { return defectCode; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java index bc93b9a0..5619b9b9 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java @@ -70,10 +70,48 @@ public class QcCheckTypeProject extends BaseEntity { @Excel(name = "物料编码") private String materialCode; + private String materialName; + private Integer sort; private String projectNo; + private String checkTool; + private String checkMode; + private String uint; + + public String getUint() { + return uint; + } + + public void setUint(String uint) { + this.uint = uint; + } + + public String getCheckTool() { + return checkTool; + } + + public void setCheckTool(String checkTool) { + this.checkTool = checkTool; + } + + public String getCheckMode() { + return checkMode; + } + + public void setCheckMode(String checkMode) { + this.checkMode = checkMode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + public Integer getSort() { return sort; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java index f5b04059..bfe82357 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java @@ -6,6 +6,7 @@ import com.op.quality.domain.QcBomComponent; import com.op.quality.domain.QcCheckTaskDetail; import com.op.quality.domain.QcCheckTaskIncome; import com.op.quality.domain.QcSupplier; +import com.op.system.api.domain.SysDictData; import com.op.system.api.domain.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -79,4 +80,6 @@ public interface QcCheckTaskIncomeMapper { int updateQcCheckTask(QcCheckTaskIncome qcCheckTask); int updateQcCheckTaskDetails(@Param("list") List details); + + List getQcUnitList(SysDictData sysDictData); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeProjectMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeProjectMapper.java index 16969171..15c7b8f3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeProjectMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTypeProjectMapper.java @@ -1,9 +1,12 @@ package com.op.quality.mapper; import java.util.List; +import java.util.Map; import com.op.quality.domain.QcCheckTaskDetail; import com.op.quality.domain.QcCheckTypeProject; +import com.op.system.api.domain.SysDictData; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; /** @@ -65,4 +68,8 @@ public interface QcCheckTypeProjectMapper { List getTPByTypeMaterial(QcCheckTypeProject qctp); List getTPByTypeGroup(QcCheckTypeProject qctp); + + List getCheckTypeProjectList(QcCheckTypeProject qcCheckTypeProject); + @MapKey("dictValue") + Map getDictMap(SysDictData sysDictData); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupService.java index 1ed5f635..32d573c9 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcMaterialGroupService.java @@ -1,20 +1,22 @@ package com.op.quality.service; import java.util.List; + +import com.op.quality.domain.QcCheckTypeProject; import com.op.quality.domain.QcMaterialGroup; import com.op.quality.domain.vo.TreeSelect; import com.op.system.api.domain.SysDept; /** * 物料组Service接口 - * + * * @author materialGroup * @date 2023-10-16 */ public interface IQcMaterialGroupService { /** * 查询物料组 - * + * * @param id 物料组主键 * @return 物料组 */ @@ -22,7 +24,7 @@ public interface IQcMaterialGroupService { /** * 查询物料组列表 - * + * * @param qcMaterialGroup 物料组 * @return 物料组集合 */ @@ -38,7 +40,7 @@ public interface IQcMaterialGroupService { /** * 新增物料组 - * + * * @param qcMaterialGroup 物料组 * @return 结果 */ @@ -46,7 +48,7 @@ public interface IQcMaterialGroupService { /** * 修改物料组 - * + * * @param qcMaterialGroup 物料组 * @return 结果 */ @@ -54,7 +56,7 @@ public interface IQcMaterialGroupService { /** * 批量删除物料组 - * + * * @param ids 需要删除的物料组主键集合 * @return 结果 */ @@ -62,11 +64,13 @@ public interface IQcMaterialGroupService { /** * 删除物料组信息 - * + * * @param id 物料组主键 * @return 结果 */ public int deleteQcMaterialGroupById(String id); public boolean validationData(String id); + + List getCheckTypeProjectList(QcCheckTypeProject qcCheckTypeProject); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java index 46bb5cc0..785a37c3 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java @@ -6,6 +6,7 @@ import com.op.quality.domain.QcCheckTaskDetail; import com.op.quality.domain.QcCheckTaskIncome; import com.op.quality.domain.QcCheckTypeProject; import com.op.quality.domain.QcProCheck; +import com.op.system.api.domain.SysDictData; import java.util.List; @@ -34,4 +35,6 @@ public interface QcProCheckService { List getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome); List getCheckTaskDetailList(QcCheckTaskDetail qcCheckTaskDetail); + + List getQcUnitList(SysDictData sysDictData); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckProjectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckProjectServiceImpl.java similarity index 97% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckProjectServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckProjectServiceImpl.java index c37f5bc5..6e6fd606 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckProjectServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckProjectServiceImpl.java @@ -1,4 +1,4 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import java.util.List; @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest; /** * 检验项目维护Service业务层处理 - * + * * @author Open Platform * @date 2023-10-13 */ @@ -30,7 +30,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { /** * 查询检验项目维护 - * + * * @param id 检验项目维护主键 * @return 检验项目维护 */ @@ -42,7 +42,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { /** * 查询检验项目维护列表 - * + * * @param qcCheckProject 检验项目维护 * @return 检验项目维护 */ @@ -54,7 +54,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { /** * 新增检验项目维护 - * + * * @param qcCheckProject 检验项目维护 * @return 结果 */ @@ -77,7 +77,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { /** * 修改检验项目维护 - * + * * @param qcCheckProject 检验项目维护 * @return 结果 */ @@ -91,7 +91,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { /** * 批量删除检验项目维护 - * + * * @param ids 需要删除的检验项目维护主键 * @return 结果 */ @@ -103,7 +103,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { /** * 删除检验项目维护信息 - * + * * @param id 检验项目维护主键 * @return 结果 */ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java similarity index 99% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportIncomeServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java index aeb97d41..7cec9cea 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java @@ -1,4 +1,4 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import com.alibaba.fastjson2.JSONArray; import com.baomidou.dynamic.datasource.annotation.DS; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java similarity index 99% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportProduceServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 1feb3952..0dd13d13 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -1,4 +1,4 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportProductServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java similarity index 95% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportProductServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java index 8c34e2c2..3dbfaf3d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckReportProductServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java @@ -1,4 +1,4 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; @@ -102,12 +102,12 @@ public class QcCheckReportProductServiceImpl implements IQcCheckReportProductSer qctp.setTypeId(qcCheckReportIncome.getCheckType());//生产过程检验 qctp.setMaterialCode(qcCheckReportIncome.getMaterialCode());//特性 /**qc_check_type_project**/ - List items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp); - if(CollectionUtils.isEmpty(items)){ - /**qc_material_group_detail**/ + List items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp); + if(CollectionUtils.isEmpty(items)){ + /**qc_material_group_detail**/ QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckReportIncome.getMaterialCode()); if(group == null){ - return 0;//没有找到检测项目 + return 0;//没有找到检测项目 } qctp.setGroupId(group.getGroupId());//共性 items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 584aa143..b1544f82 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -296,6 +296,7 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { String factoryCode = details.get(0).getFactoryCode(); String updateBy = details.get(0).getUpdateBy(); String belongId = details.get(0).getBelongTo(); + String checkType = details.get(0).getCheckType(); //默认合格 String result = "Y"; @@ -318,22 +319,23 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService { logger.info("qc_check_task:"+n); /**更新qc_check_task_detail**/ for(QcCheckTaskDetail detail:details){ - + detail.setUpdateTime(nowTime); } - n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details);; + n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details); logger.info("更新qc_check_task_detail:"+n); //不合格处理 if("N".equals(result)){ -// QcCheckUnqualified unqualified = new QcCheckUnqualified(); -// unqualified.setId(IdUtils.fastSimpleUUID()); -// unqualified.setTaskId(qcCheckTaskIncome.getRecordId()); -// unqualified.setCreateTime(DateUtils.getNowDate()); -// unqualified.setCreateBy(qcCheckTaskIncome.getUpdateBy()); -// unqualified.setFactoryCode(factoryCode); -// unqualified.setType(qcCheckTaskIncome.getCheckType()); -// /**qc_check_unqualified**/ -// qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); + QcCheckUnqualified unqualified = new QcCheckUnqualified(); + unqualified.setId(IdUtils.fastSimpleUUID()); + unqualified.setTaskId(belongId); + unqualified.setCreateTime(DateUtils.getNowDate()); + unqualified.setCreateBy(updateBy); + unqualified.setFactoryCode(factoryCode); + unqualified.setType(checkType); + /**qc_check_unqualified**/ + n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified); + logger.info("qc_check_unqualified:"+n); } return n ; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeProjectServiceImpl.java similarity index 84% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeProjectServiceImpl.java index adc747b7..14244499 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeProjectServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeProjectServiceImpl.java @@ -1,11 +1,14 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import java.util.List; +import java.util.Map; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; 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.system.api.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.quality.mapper.QcCheckTypeProjectMapper; @@ -18,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; /** * 物料检验项目维护Service业务层处理 - * + * * @author Open Platform * @date 2023-10-17 */ @@ -29,7 +32,7 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService /** * 查询物料检验项目维护 - * + * * @param id 物料检验项目维护主键 * @return 物料检验项目维护 */ @@ -41,19 +44,29 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService /** * 查询物料检验项目维护列表 - * + * * @param qcCheckTypeProject 物料检验项目维护 * @return 物料检验项目维护 */ @Override @DS("#header.poolName") public List selectQcCheckTypeProjectList(QcCheckTypeProject qcCheckTypeProject) { - return qcCheckTypeProjectMapper.selectQcCheckTypeProjectList(qcCheckTypeProject); + List dtos = qcCheckTypeProjectMapper.selectQcCheckTypeProjectList(qcCheckTypeProject); + DynamicDataSourceContextHolder.push("master"); + SysDictData sData = new SysDictData(); + sData.setDictType("unit"); + Map dictMap = qcCheckTypeProjectMapper.getDictMap(sData); + if(dictMap != null){ + for(QcCheckTypeProject dto:dtos){ + dto.setUint(dictMap.get(dto.getUint()).getDictLabel()); + } + } + return dtos; } /** * 新增物料检验项目维护 - * + * * @param qcCheckTypeProject 物料检验项目维护 * @return 结果 */ @@ -71,7 +84,7 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService /** * 修改物料检验项目维护 - * + * * @param qcCheckTypeProject 物料检验项目维护 * @return 结果 */ @@ -85,7 +98,7 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService /** * 批量删除物料检验项目维护 - * + * * @param ids 需要删除的物料检验项目维护主键 * @return 结果 */ @@ -97,7 +110,7 @@ public class QcCheckTypeProjectServiceImpl implements IQcCheckTypeProjectService /** * 删除物料检验项目维护信息 - * + * * @param id 物料检验项目维护主键 * @return 结果 */ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeServiceImpl.java similarity index 98% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeServiceImpl.java index 0c7ff187..88ee8cb9 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcCheckTypeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import java.util.List; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupDetailServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java similarity index 97% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupDetailServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java index 5867ad43..0d8325da 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupDetailServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import java.util.List; @@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest; /** * 物料组成员Service业务层处理 - * + * * @author Open Platform * @date 2023-10-18 */ @@ -29,7 +29,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS /** * 查询物料组成员 - * + * * @param id 物料组成员主键 * @return 物料组成员 */ @@ -41,7 +41,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS /** * 查询物料组成员列表 - * + * * @param qcMaterialGroupDetail 物料组成员 * @return 物料组成员 */ @@ -53,7 +53,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS /** * 新增物料组成员 - * + * * @param qcMaterialGroupDetail 物料组成员 * @return 结果 */ @@ -71,7 +71,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS /** * 修改物料组成员 - * + * * @param qcMaterialGroupDetail 物料组成员 * @return 结果 */ @@ -84,7 +84,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS /** * 批量删除物料组成员 - * + * * @param ids 需要删除的物料组成员主键 * @return 结果 */ @@ -96,7 +96,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS /** * 删除物料组成员信息 - * + * * @param id 物料组成员主键 * @return 结果 */ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java similarity index 85% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java index 4307a3bc..08c509b4 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcMaterialGroupServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java @@ -1,4 +1,4 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -7,13 +7,17 @@ import java.util.Map; import java.util.stream.Collectors; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.SpringUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.datascope.annotation.DataScope; import com.op.common.security.utils.SecurityUtils; +import com.op.quality.domain.QcCheckTypeProject; import com.op.quality.domain.vo.TreeSelect; +import com.op.quality.mapper.QcCheckTypeProjectMapper; +import com.op.system.api.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.quality.mapper.QcMaterialGroupMapper; @@ -26,7 +30,7 @@ import javax.servlet.http.HttpServletRequest; /** * 物料组Service业务层处理 - * + * * @author materialGroup * @date 2023-10-16 */ @@ -34,10 +38,12 @@ import javax.servlet.http.HttpServletRequest; public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { @Autowired private QcMaterialGroupMapper qcMaterialGroupMapper; + @Autowired + private QcCheckTypeProjectMapper qcCheckTypeProjectMapper; /** * 查询物料组 - * + * * @param id 物料组主键 * @return 物料组 */ @@ -46,7 +52,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { return qcMaterialGroupMapper.selectQcMaterialGroupById(id); } @Override - @DataScope(deptAlias = "d") + //@DataScope(deptAlias = "d") @DS("#header.poolName") public List selectQcMaterialGroupList(QcMaterialGroup qcMaterialGroup) { return qcMaterialGroupMapper.selectQcMaterialGroupList(qcMaterialGroup); @@ -54,7 +60,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { /** * 查询物料树列表 - * + * * @param qcMaterialGroup 物料组 * @return 物料组 */ @@ -119,7 +125,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { /** * 新增物料组 - * + * * @param qcMaterialGroup 物料组 * @return 结果 */ @@ -137,7 +143,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { /** * 修改物料组 - * + * * @param qcMaterialGroup 物料组 * @return 结果 */ @@ -151,7 +157,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { /** * 批量删除物料组 - * + * * @param ids 需要删除的物料组主键 * @return 结果 */ @@ -163,7 +169,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { /** * 删除物料组信息 - * + * * @param id 物料组主键 * @return 结果 */ @@ -179,6 +185,21 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { return qcMaterialGroupMapper.validationData(id).size() > 0; } + @Override + public List getCheckTypeProjectList(QcCheckTypeProject qcCheckTypeProject) { + List dtos = qcCheckTypeProjectMapper.getCheckTypeProjectList(qcCheckTypeProject); + DynamicDataSourceContextHolder.push("master"); + SysDictData sData = new SysDictData(); + sData.setDictType("unit"); + Map dictMap = qcCheckTypeProjectMapper.getDictMap(sData); + if(dictMap != null){ + for(QcCheckTypeProject dto:dtos){ + dto.setUint(dictMap.get(dto.getUint()).getDictLabel()); + } + } + return dtos; + } + private boolean hasChild(List list, QcMaterialGroup t) { return getChildList(list, t).size() > 0 ? true : false; } 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/impl/QcProCheckServiceImpl.java similarity index 93% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index 005a118d..12f7129a 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/impl/QcProCheckServiceImpl.java @@ -1,5 +1,6 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.BaseFileData; import com.op.common.core.domain.R; @@ -14,6 +15,7 @@ import com.op.quality.domain.QcProCheck; import com.op.quality.mapper.QcCheckTaskIncomeMapper; import com.op.quality.mapper.QcProCheckMapper; import com.op.quality.service.QcProCheckService; +import com.op.system.api.domain.SysDictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -127,4 +129,10 @@ public class QcProCheckServiceImpl implements QcProCheckService { return qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); } + @Override + @DS("master") + public List getQcUnitList(SysDictData sysDictData) { + return qcCheckTaskIncomeMapper.getQcUnitList(sysDictData); + } + } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java similarity index 98% rename from op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java rename to op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java index 1e4a3379..016f5a27 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java @@ -1,4 +1,4 @@ -package com.op.quality.service.serviceImpl; +package com.op.quality.service.impl; import java.util.Date; import java.util.List; @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest; /** * 人员物料绑定Service业务层处理 - * + * * @author Open Platform * @date 2023-10-09 */ @@ -35,7 +35,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { /** * 查询人员物料绑定 - * + * * @param userCode 人员物料绑定主键 * @return 人员物料绑定 */ @@ -53,7 +53,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { /** * 查询人员物料绑定列表 - * + * * @param qcUserMaterial 人员物料绑定 * @return 人员物料绑定 */ @@ -65,7 +65,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { /** * 新增人员物料绑定 - * + * * @param qcUserMaterial 人员物料绑定 * @return 结果 */ @@ -105,7 +105,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { /** * 修改人员物料绑定 - * + * * @param qcUserMaterial 人员物料绑定 * @return 结果 */ @@ -118,7 +118,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { /** * 批量删除人员物料绑定 - * + * * @param userCodes 需要删除的人员物料绑定主键 * @return 结果 */ @@ -130,7 +130,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { /** * 删除人员物料绑定信息 - * + * * @param qcUserMaterial 人员物料绑定 * @return 结果 */ diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index 37ede2ca..01fc9767 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -131,7 +131,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" td.create_time createTime, td.update_by updateBy, td.update_time updateTime, - td.update_time updateTime, td.belong_to belongTo, qctp.upper_diff upperDiff, qctp.down_diff downDiff, @@ -140,8 +139,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join qc_check_type_project qctp on td.type_project_id = qctp.id where td.belong_to = #{belongTo} and td.del_flag='0' and qctp.del_flag = '0' + - + insert into qc_check_task record_id, @@ -258,14 +264,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update qc_check_task_detail set - zh_desc = #{item.name1}, - contact_phone = #{item.telf1}, - address = #{item.stras}, - factory_code = #{item.bukrs}, - create_time= #{item.erdat}, - update_time = #{item.erdat} + actual_value = #{item.actualValue}, + status = #{item.status}, + update_by = #{item.updateBy}, + update_time = #{item.updateTime} where - supplier_code = #{item.lifnr} + record_id = #{item.recordId} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index dc43d312..231ccdbc 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -26,7 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, project_id, type_id, standard_value, upper_diff, down_diff, sample, status, attr1, create_by, create_time, update_by, update_time, factory_code, del_flag, group_id, material_code, sample_num from qc_check_type_project + select id, project_id, type_id, standard_value, upper_diff, down_diff, sample, status, attr1, + create_by, create_time, update_by, update_time, factory_code, del_flag, group_id, material_code, sample_num + from qc_check_type_project - + + insert into qc_check_type_project diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml index 9e36c0ea..6d96fc3a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml @@ -248,12 +248,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.material_code, qct.material_name, qct.quality, qct.unit, qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status, qct.check_man_code,qct.check_man_name, qct.check_time, qct.check_result, - qct.status,qct.create_by,qct.create_time + qct.status,qct.create_by,qct.create_time,qct.check_type from qc_check_task qct and qct.del_flag = '0' and qct.check_type = #{checkType} and qct.check_man_code = #{checkManCode} + and qct.check_status in (#{checkStatus}) order by qct.create_time desc diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java index 8e061ada..945ab3e6 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/SapOrderService.java @@ -2,8 +2,8 @@ package com.op.sap.service; import com.op.common.core.domain.R; -import com.op.sap.domain.vo.SapCloseOrderQuery; import com.op.sap.domain.vo.SapPurchaseOrderQuery; +import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapCreateOrder; import com.op.system.api.domain.sap.SapRFW; import com.op.system.api.domain.sap.SapShopOrderQuery; 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 e3dca482..d81cd2c5 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 @@ -7,11 +7,11 @@ 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.sap.domain.vo.SapCloseOrderQuery; import com.op.sap.domain.vo.SapPurchaseOrderQuery; import com.op.sap.service.SapOrderService; import com.op.sap.util.SAPConnUtils; +import com.op.system.api.domain.sap.SapCloseOrderQuery; import com.op.system.api.domain.sap.SapCreateOrder; import com.op.system.api.domain.sap.SapRFW; import com.op.system.api.domain.sap.SapShopOrderQuery;