diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java index 680f81b7..f5840b14 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java @@ -6,6 +6,7 @@ import com.op.system.api.factory.RemoteOpenFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.Map; @@ -16,8 +17,12 @@ import java.util.Map; */ @FeignClient(contextId = "remoteOpenService", value = ServiceNameConstants.OPEN_SERVICE, fallbackFactory = RemoteOpenFallbackFactory.class) public interface RemoteOpenService { - /**提交ZL0010-来料检验不合格控制流程**/ + /**提交流程**/ @PostMapping("/openInterface/OAInspection") public AjaxResult OAInspection(@RequestBody(required = false) Map paramMap); + /**获取流程信息**/ + + @PostMapping("/openInterface/GetOaNodeInfo") + public AjaxResult GetOaNodeInfo(@RequestParam String requestId); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java index b3d5bc63..8ef1ae4d 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java @@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.Map; @@ -20,7 +21,12 @@ public class RemoteOpenFallbackFactory implements FallbackFactory paramMap) { - return AjaxResult.error("提交ZL0010-来料检验不合格控制流程失败"+throwable.getMessage()); + return AjaxResult.error("提交流程失败"+throwable.getMessage()); + } + + @Override + public AjaxResult GetOaNodeInfo(@RequestParam String requestId) { + return AjaxResult.error("获取流程失败"+throwable.getMessage()); } }; } diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/constant/Constants.java b/op-common/op-common-core/src/main/java/com/op/common/core/constant/Constants.java index 81d7b51f..55d6df0a 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/constant/Constants.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/constant/Constants.java @@ -148,9 +148,11 @@ public class Constants { //领料 public static final Integer LL=261; - //来料检验不合格控制流程workflowId + //ZL0010-来料检验不合格控制流程 - public static final Integer WORKFLOWID=26235; + public static final Integer WORKFLOWID_ZL0010=26235; + + //ZL0020-成品检验控制流程 + public static final Integer WORKFLOWID_ZL0020=26234; - //过程检验不合格控制流程workflowId } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index 18d6e43d..e5426032 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -72,8 +72,7 @@ public class DevicePDAController extends BaseController { return devicePDAService.updateInspectionRecord(equOrder); } - //报修 - + //////////报修 /** * 新增手持报修记录 * @@ -85,8 +84,7 @@ public class DevicePDAController extends BaseController { return devicePDAService.addRepairRecord(equRepairOrder); } - //维修 - + //////////维修 /** * 获取维修记录（待处理） * @@ -120,7 +118,6 @@ public class DevicePDAController extends BaseController { return devicePDAService.updateDowntime(equRepairWorkOrder); } - /** * 获取设备管理详细信息 */ @@ -198,6 +195,4 @@ public class DevicePDAController extends BaseController { public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) { return devicePDAService.selectEquFaultReasonList(equFaultReason); } - - } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java index 22668daf..a9f42b88 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java @@ -95,6 +95,14 @@ public class EquOperation extends BaseEntity { /** 删除标识 */ private String delFlag; + /** 故障次数 */ + @Excel(name = "故障次数") + private Integer failureTimes; + + /** 停机次数 */ + @Excel(name = "停机次数") + private Integer shutdownTimes; + // 创建日期范围list private List createTimeArray; @@ -353,6 +361,22 @@ public class EquOperation extends BaseEntity { return intactRate; } + //故障次数 + public void setFailureTimes(Integer failureTimes) { + this.failureTimes = failureTimes; + } + public Integer getFailureTimes() { + return failureTimes; + } + + //停机次数 + public void setShutdownTimes(Integer shutdownTimes) { + this.shutdownTimes = shutdownTimes; + } + public Integer getShutdownTimes() { + return shutdownTimes; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 9777cee0..791fcedf 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -99,7 +99,40 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult getTodayTask(PDADTO pdadto) { List orderList = equOrderMapper.selectTodayTask(pdadto); - return success(orderList); + List handleList = new ArrayList<>(); + long nowTime = DateUtils.getNowDate().getTime(); + long dayMs = 86400000l; + if (orderList!=null) { + for (EquOrder order : orderList) { + long diff = nowTime - order.getCreateTime().getTime(); + if (order.getPlanLoopType().equals("day")){ + if (diff < (dayMs * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + } + if (order.getPlanLoopType().equals("week")){ + if (diff < (dayMs*7 * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + } + if (order.getPlanLoopType().equals("month")){ + if (diff < (dayMs*30 * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + } + if (order.getPlanLoopType().equals("season")){ + if (diff < (dayMs*30*3 * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + } + if (order.getPlanLoopType().equals("year")){ + if (diff < (dayMs*365 * Long.valueOf(order.getPlanLoop()))) { + handleList.add(order); + } + } + } + } + return success(handleList); } /** @@ -752,18 +785,20 @@ public class DevicePDAServiceImpl implements IDevicePDAService { //2.3修改完好率报表 if(equOperation != null){ - DecimalFormat df = new DecimalFormat("#.##"); - //实际运行时间 = 实际运行时间 - 故障时间 - double result = Double.parseDouble(equOperation.getActualOperationTime()) - hour; - //故障时间 = 原来的故障时间 + 这次的故障时间 - double faultTime = Double.parseDouble(equOperation.getFaultTime()) + hour; - equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 - equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 - - BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 - BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());// 运行时间 - - equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + if (list.getWorkDownMachine().equals("1")) { + DecimalFormat df = new DecimalFormat("#.##"); + //实际运行时间 = 实际运行时间 - 故障时间 + double result = Double.parseDouble(equOperation.getActualOperationTime()) - hour; + //故障时间 = 原来的故障时间 + 这次的故障时间 + double faultTime = Double.parseDouble(equOperation.getFaultTime()) + hour; + BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 + BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());//运行时间 + equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 + equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 + equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + equOperation.setShutdownTimes(equOperation.getShutdownTimes()+1);//停机次数加1 + } + equOperation.setFailureTimes(equOperation.getFailureTimes()+1);//故障次数加1 equOperation.setUpdateBy(SecurityUtils.getUsername()); equOperation.setUpdateTime(DateUtils.getNowDate()); equOperationMapper.updateEquOperation(equOperation); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index eea0cbf3..bbe336e4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -234,22 +234,25 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService String time = sdf.format(equRepairWorkOrder.getWorkEndTime()); EquOperation equOperation = equOperationMapper.selectEquipmentIntegrityRate(time,equRepairWorkOrder.getEquipmentCode()); - if(equOperation != null){ - DecimalFormat df = new DecimalFormat("#.##"); - //实际运行时间 = 实际运行时间 - 故障时间 - double result = Double.parseDouble(equOperation.getActualOperationTime()) - Double.parseDouble(hours); - //故障时间 = 原来的故障时间 + 这次的故障时间 - double faultTime = Double.parseDouble(equOperation.getFaultTime()) + Double.parseDouble(hours); - equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 - equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 - - BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 - BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());// 运行时间 - - // 故障率计算（故障时间/运行时间） - equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + if(equOperation != null){ + if (equRepairWorkOrder.getWorkDownMachine().equals("1")) { + DecimalFormat df = new DecimalFormat("#.##"); + //实际运行时间 = 实际运行时间 - 故障时间 + double result = Double.parseDouble(equOperation.getActualOperationTime()) - Double.parseDouble(hours); + //故障时间 = 原来的故障时间 + 这次的故障时间 + double faultTime = Double.parseDouble(equOperation.getFaultTime()) + Double.parseDouble(hours); + BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 + BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());// 运行时间 + equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 + equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 + // 故障率计算（故障时间/运行时间） + equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + equOperation.setShutdownTimes(equOperation.getShutdownTimes()+1);//停机次数加1 + } equOperation.setUpdateBy(SecurityUtils.getUsername()); equOperation.setUpdateTime(DateUtils.getNowDate()); + //故障次数增加，但是停机次数可能不增加 + equOperation.setFailureTimes(equOperation.getFailureTimes()+1);//故障次数加1 equOperationMapper.updateEquOperation(equOperation); } } @@ -258,7 +261,6 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService // BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); // BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); // equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); - return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); } 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 48089a27..0cbc365c 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 @@ -77,11 +77,14 @@ diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml index a190ac18..4189a69a 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceTaskMapper.xml @@ -29,6 +29,7 @@ from equ_plan ep left join equ_plan_equ epe on ep.plan_code = epe.plan_code where ep.del_flag = '0' and epe.del_flag = '0' and ep.plan_status = '0' + and epe.equipment_code in ( select be.equipment_code from base_equipment be where be.del_flag = '0' ) and ep.plan_type = #{planType} and CONVERT(varchar(10),GETDATE(), 120) >= CONVERT(varchar(10),ep.plan_loop_start, 120) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml index 12795702..40eef969 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultDescriptionMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_by like concat('%', #{updateBy}, '%') and del_flag = '0' + ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER) SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_description - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) + WHERE del_flag = '0' \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml index eaafe629..6f98ab3b 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_by like concat('%', #{updateBy}, '%') and del_flag = '0' + ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER) SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_measures - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) + WHERE del_flag = '0' \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml index 10b95ba1..4d1539d2 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and update_by like concat('%', #{updateBy}, '%') and del_flag = '0' + ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER) SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_reason - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) + WHERE del_flag = '0' \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml index b9268d5f..99fc05b3 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml @@ -50,7 +50,7 @@ and update_by like concat('%', #{updateBy}, '%') and del_flag = '0' - ORDER BY create_time DESC + ORDER BY CAST(RIGHT(fault_code, 4) AS INTEGER) SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_type - WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) + WHERE del_flag = '0' diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml index cad74285..6da1e004 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml @@ -29,6 +29,8 @@ + + @@ -55,7 +57,9 @@ create_by, create_time, update_by, - update_time + update_time, + failure_times, + shutdown_times from equ_operation @@ -159,6 +163,8 @@ create_time, update_by, update_time, + failure_times, + shutdown_times, #{id}, @@ -185,6 +191,8 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{failureTimes}, + #{shutdownTimes}, @@ -236,6 +244,8 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + failure_times = #{failureTimes}, + shutdown_times = #{shutdownTimes}, where id = #{id} diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 2fe00c62..af0d332b 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -185,7 +185,7 @@ where del_flag = '0' and user_name = #{userId} GROUP BY order_code) - order by eo.plan_loop_type, eo.plan_loop, eo.create_time, eo.equipment_code + order by eo.plan_loop_type, eo.plan_loop, eo.create_time desc, eo.equipment_code + insert into mes_report_work diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml index a57d2a12..c79b86c5 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml @@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select qct.record_id, qct.check_no, qct.income_batch_no, - qct.order_no, 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.sample_quality, - qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, - q.type_code,q.check_name + qct.order_no, 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.sample_quality, + qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, + q.type_code,q.check_name from qc_check_task qct left join qc_check_type q on q.id = qct.check_type @@ -143,8 +143,27 @@ 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 = #{recordId} + - + insert into qc_check_task record_id, diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 77edb220..31eb4ce1 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -11,9 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + @@ -35,9 +33,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -266,4 +299,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java index 5602fa84..a9fe28d0 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java @@ -318,28 +318,8 @@ public class SapItemSyncImpl implements SapItemSyncService { throw new RuntimeException("Function does not exist in SAP"); } JCoTable L_ITEM = func.getTableParameterList().getTable("L_ITEM"); - - // System.out.println(L_ITEM); - -// -// int successNum = 0; -// int failureNum = 0; -// StringBuilder successMsg = new StringBuilder(); -// StringBuilder failureMsg = new StringBuilder(); log.info("反冲物料开始过账----------------------------------------"); - -// for (int i = 0; i < sapBackflushMPQueryList.size(); i++) { -// L_ITEM.setRow(i); -// L_ITEM.appendRow(); -// L_ITEM.setValue("MATNR",sfp.getMatnr()); -// } for (SapBackflushMPQuery sfp:sapBackflushMPQueryList){ -// if (StringUtils.isEmpty(sfp.getMatnr())){ -// return R.fail("物料号为空!"); -// } -// if (StringUtils.isEmpty(sfp.getPlant())){ -// -// } L_ITEM.appendRow(); L_ITEM.setValue("MATNR",sfp.getMatnr()); L_ITEM.setValue("PLANT",sfp.getPlant()); @@ -350,7 +330,6 @@ public class SapItemSyncImpl implements SapItemSyncService { L_ITEM.setValue("MEINS",sfp.getMeins()); L_ITEM.setValue("BATCH",sfp.getBatch()); L_ITEM.setValue("MOVE_BATCH",sfp.getMove_batch()); - } func.execute(dest); JCoTable maraTable = func.getTableParameterList().getTable("LT_RETURN"); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java index 5b78ff86..d47e3894 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java @@ -47,6 +47,10 @@ public class SysFactory extends TreeEntity { @Excel(name = "工厂编码") private String factoryCode; + /** 工厂建模类型 */ + @Excel(name = "工厂建模类型") + private String fType; + //虚拟字段 private List> workCenter; private String value; @@ -111,6 +115,13 @@ public class SysFactory extends TreeEntity { this.factoryCode = factoryCode; } + public String getFType() { + return fType; + } + public void setFType(String fType) { + this.fType = fType; + } + public String getValue() { return value; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml index f8f26d4e..72b70fd8 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml @@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code,del_flag from sys_factory + select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code,del_flag , f_type from sys_factory @@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, factory_code, + f_type, #{parentId}, @@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{factoryCode}, + #{fType}, @@ -102,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, factory_code = #{factoryCode}, + f_type = #{fType}, where factory_id = #{factoryId}