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 4eacd38fb..ed59282a4 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 @@ -92,7 +92,17 @@ public interface RemoteSapService { @PostMapping("/sap/sapPOrderGoodsReceipt") public R sapPOrderGoodsReceipt(@RequestBody(required = false) List> mapList); - /**101类型订单收货*/ + /** + * 智慧工厂101类型订单收货 + * 订单为母订单 + * * AUFNR CHAR12 订单号 必填 + * * WERKS 工厂 + * * LGORT CHAR4 库位 必填 + * * QUANTITY 数量 + * * ERFME UNIT 条目单位 + * * BATCH 批号 + * * HSDAT DATS8 生产日期 必填 + */ @PostMapping("/sap/sapOrderReceipt") public R sapOrderReceipt(@RequestBody(required = false) List> mapList); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartSeriesDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartSeriesDTO.java index 24e016d77..2751d6c1e 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartSeriesDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartSeriesDTO.java @@ -12,6 +12,24 @@ public class ChartSeriesDTO { private List yAxisData; private List series; + private List legendData; + private List xAxisData; + + public List getxAxisData() { + return xAxisData; + } + + public void setxAxisData(List xAxisData) { + this.xAxisData = xAxisData; + } + + public List getLegendData() { + return legendData; + } + + public void setLegendData(List legendData) { + this.legendData = legendData; + } public List getyAxisData() { return yAxisData; 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 c6bbdb7f3..18d6e43dd 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 @@ -124,9 +124,9 @@ public class DevicePDAController extends BaseController { /** * 获取设备管理详细信息 */ - @GetMapping(value = "/queryEquipment/{equipmentId}") - public AjaxResult queryEquipment(@PathVariable("equipmentId") Long equipmentId) { - return devicePDAService.selectEquEquipmentByEquEquipmentId(equipmentId); + @GetMapping(value = "/queryEquipment/{equipmentCode}") + public AjaxResult queryEquipment(@PathVariable("equipmentCode") String equipmentCode) { + return devicePDAService.selectEquEquipmentByEquEquipmentCode(equipmentCode); } /** @@ -198,4 +198,6 @@ 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/EquSpareApply.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java index 30e6caed4..66a0b26e4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSpareApply.java @@ -114,6 +114,28 @@ public class EquSpareApply extends BaseEntity { @Excel(name = "物料描述") private String materialDesc; + /** 单价 */ + @Excel(name = "单价") + private BigDecimal unitPrice; + + /** 总价 */ + @Excel(name = "总价") + private BigDecimal totalPrice; + + public void setUnitPrice(BigDecimal unitPrice) { + this.unitPrice = unitPrice; + } + public BigDecimal getUnitPrice() { + return unitPrice; + } + + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + public BigDecimal getTotalPrice() { + return totalPrice; + } + public void setMaterialCode(String materialCode) { this.materialCode = materialCode; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java index 0e2a72971..72bdb7a39 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java @@ -32,6 +32,8 @@ public interface EquCheckItemMapper { */ public List selectEquCheckItemList(EquCheckItem equCheckItem); + public List selectPrecisionEquCheckItemList(EquCheckItem equCheckItem); + /** * 新增检查项维护 * diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java index e258c0d1a..bbfb394d8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java @@ -17,10 +17,10 @@ public interface EquEquipmentMapper { /** * 查询设备管理 * - * @param equipmentId 设备管理主键 + * @param equipmentCode * @return 设备管理 */ - public EquEquipment selectEquEquipmentByEquEquipmentId(Long equipmentId); + public EquEquipment selectEquEquipmentByEquEquipmentCode(String equipmentCode); /** * 查询设备管理列表 diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java index 7b142378a..65767b1e3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java @@ -86,4 +86,10 @@ public interface EquOperationMapper { // 分批次删除 int deleteOperation(@Param("delSize") int delSize); + + /** + * 查找设备对应完好率 + * @return + */ + public EquOperation selectEquipmentIntegrityRate(@Param("time")String time, @Param("equipmentCode")String equipmentCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index 0fe60052d..70054be92 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -86,10 +86,10 @@ public interface IDevicePDAService { /** * 查询设备详细信息 * - * @param equipmentId + * @param equipmentCode * @return */ - public AjaxResult selectEquEquipmentByEquEquipmentId(Long equipmentId); + public AjaxResult selectEquEquipmentByEquEquipmentCode(String equipmentCode); /** * 查询维修工单 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 ffe5ad7d1..336385f6b 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 @@ -22,8 +22,13 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.temporal.ChronoUnit; import java.util.*; import static com.op.common.core.web.domain.AjaxResult.error; @@ -81,6 +86,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Autowired private EquFaultReasonMapper equFaultReasonMapper; + @Autowired + private EquOperationMapper equOperationMapper; + /** * 获取今日任务工单list-状态不为已完成 @@ -91,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); } /** @@ -366,7 +407,13 @@ public class DevicePDAServiceImpl implements IDevicePDAService { // 费用 BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equOrder.getOrderCode()); BigDecimal orderCost = equOrder.getOrderCost(); - equOrder.setOrderCost(sparePartsCost.add(orderCost)); + if (orderCost!=null) { + if (sparePartsCost==null) { + equOrder.setOrderCost(orderCost); + }else { + equOrder.setOrderCost(sparePartsCost.add(orderCost)); + } + } // 更新设备状态为正常运行 equ.setStatus("1"); @@ -621,14 +668,14 @@ public class DevicePDAServiceImpl implements IDevicePDAService { /** * 查询设备 - * @param equipmentId + * @param equipmentCode * @return */ @Override @DS("#header.poolName") - public AjaxResult selectEquEquipmentByEquEquipmentId(Long equipmentId) { + public AjaxResult selectEquEquipmentByEquEquipmentCode(String equipmentCode) { try { - EquEquipment list = equEquipmentMapper.selectEquEquipmentByEquEquipmentId(equipmentId); + EquEquipment list = equEquipmentMapper.selectEquEquipmentByEquEquipmentCode(equipmentCode); return success(list); } catch (Exception e) { return error(); @@ -699,7 +746,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { try { - //判断是否停机 + //1.判断是否停机 EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); if (list.getWorkDownMachine().equals("1")) { //维修真正停机时间 @@ -708,10 +755,55 @@ public class DevicePDAServiceImpl implements IDevicePDAService { //维修工单结束时间 equRepairWorkOrder.setWorkEndTime(DateUtils.getNowDate()); - //计算维修工单用时 - //获取工单的开始时间 + //2.计算维修工单用时 + if(list.getWorkStartTime()!= null && equRepairWorkOrder.getWorkEndTime()!= null){ - ////更新每一项点检/巡检检查项信息 + //2.1计算日期差值 + ZoneId zoneId = ZoneId.systemDefault(); + LocalDateTime start = LocalDateTime.ofInstant(list.getWorkStartTime().toInstant(), zoneId); + LocalDateTime end = LocalDateTime.ofInstant(equRepairWorkOrder.getWorkEndTime().toInstant(), zoneId); + LocalDateTime tempDateTime = LocalDateTime.from(start); + +// long years = tempDateTime.until(end, ChronoUnit.YEARS); +// tempDateTime = tempDateTime.plusYears(years); +// long months = tempDateTime.until(end, ChronoUnit.MONTHS); +// tempDateTime = tempDateTime.plusMonths(months); +// long days = tempDateTime.until(end, ChronoUnit.DAYS); +// tempDateTime = tempDateTime.plusDays(days); + + double hours = tempDateTime.until(end, ChronoUnit.HOURS); +// tempDateTime = tempDateTime.plusHours(hours); + double minutes = ((tempDateTime.until(end, ChronoUnit.MINUTES)*1.0)%60)/60; +// tempDateTime = tempDateTime.plusMinutes(minutes); + double seconds = ((tempDateTime.until(end, ChronoUnit.SECONDS)*1.0)%3600)/3600; + double hour = BigDecimal.valueOf(hours + minutes + seconds).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + + //2.2查询完好率报表 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String time = sdf.format(equRepairWorkOrder.getWorkEndTime()); + EquOperation equOperation = equOperationMapper.selectEquipmentIntegrityRate(time,equRepairWorkOrder.getEquipmentCode()); + + //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()+"%"); + equOperation.setUpdateBy(SecurityUtils.getUsername()); + equOperation.setUpdateTime(DateUtils.getNowDate()); + equOperationMapper.updateEquOperation(equOperation); + } + } + + ////3.更新每一项点检/巡检检查项信息 //判空 if(StringUtils.isNotEmpty(equRepairWorkOrder.getDetailList())){ List checkLists = equRepairWorkOrder.getDetailList(); @@ -752,7 +844,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } } - ////新建申领单 + ////4.新建申领单 //判空 if(StringUtils.isNotEmpty(equRepairWorkOrder.getApplyList())){ List equSpareApplies = equRepairWorkOrder.getApplyList(); @@ -782,6 +874,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; //工厂号 + //备件费用？？？？？ equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); equSpareApplyMapper.insertEquSpareApply(equSpareApply); @@ -796,7 +889,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } } - ////增加多个维修后照片 + ////5.增加多个维修后照片 //先删除每个维修工单对应图片 equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId()); if (StringUtils.isNotEmpty(equRepairWorkOrder.getFileList())) { @@ -818,7 +911,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairWorkOrderMapper.insertBaseFileBatch(files); } - ////更新维修工单 + ////6.更新维修工单 //维修状态 equRepairWorkOrder.setWorkStatus("1"); //维修人 @@ -832,11 +925,11 @@ public class DevicePDAServiceImpl implements IDevicePDAService { EquRepairWorkOrder example = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); // 费用 - BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); - BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); - equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); +// BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); +// BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); +// equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); - //修改设备状态 由维修中改为正常运行 + //7.修改设备状态 由维修中改为正常运行 EquEquipment equEquipment = new EquEquipment(); equEquipment.setEquipmentCode(example.getEquipmentCode()); equEquipment.setEquipmentStatus("1"); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java index af72ccf5d..0eca1f914 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java @@ -112,7 +112,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { EquCheckItem checkItem = new EquCheckItem(); checkItem.setItemType(equCheckItemDTO.getItemType()); checkItem.setItemName(equCheckItemDTO.getItemName()); - List check = equCheckItemMapper.selectEquCheckItemList(checkItem); + List check = equCheckItemMapper.selectPrecisionEquCheckItemList(checkItem); if (check.size() > 0) { return error(500, "检查项已存在！新增失败！"); } @@ -165,7 +165,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService { EquCheckItem checkQuery = new EquCheckItem(); checkQuery.setItemType(equCheckItemDTO.getItemType()); checkQuery.setItemName(equCheckItemDTO.getItemName()); - List check = equCheckItemMapper.selectEquCheckItemList(checkQuery); + List check = equCheckItemMapper.selectPrecisionEquCheckItemList(checkQuery); if (check.size()>0) { if (!check.get(0).getItemCode().equals(equCheckItemDTO.getItemCode())) { return error(500,"检查项已存在！不可修改！"); 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 4af8f276b..eea0cbf36 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 @@ -1,6 +1,8 @@ package com.op.device.service.impl; import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -47,6 +49,9 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService @Autowired private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private EquOperationMapper equOperationMapper; + /** * 查询维修工单 * @@ -152,18 +157,19 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService * 修改维修工单 * * @param equRepairWorkOrder 维修工单 - * @return 结果outSourcePerson + * @return */ @Override @DS("#header.poolName") public int updateEquRepairWorkOrder(EquRepairWorkOrder equRepairWorkOrder) { + //1.是否停机 if(equRepairWorkOrder.getWorkDownMachine().equals("0")){ equRepairWorkOrder.setWorkPlanDownTime(null); } equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); - //先删除每个维修工单对应图片 + //2.先删除每个维修工单对应图片，再新增照片 equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId()); if (StringUtils.isNotEmpty(equRepairWorkOrder.getAfterRepairFile())) { String[] ids = equRepairWorkOrder.getAfterRepairFile().split(","); @@ -184,7 +190,7 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService equRepairWorkOrderMapper.insertBaseFileBatch(files); } - //更新标准表 + //3.更新标准表 for(EquOrderStandard equOrderStandard:equRepairWorkOrder.getStandardList()){ //先删除每个检查项标准图片 String imageType = "4"; @@ -214,18 +220,44 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService equOrderStandardMapper.updateStandardAfterRepair(equOrderStandard); } + //5.更新设备状态 if(equRepairWorkOrder.getWorkStatus().equals("1")){ - //修改设备状态 由维修中改为正常运行 + //5.1修改设备状态 由维修中改为正常运行 EquEquipment equEquipment = new EquEquipment(); equEquipment.setEquipmentCode(equRepairWorkOrder.getEquipmentCode()); equEquipment.setEquipmentStatus("1"); equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); + + //5.2维修完成后 相应的设备完好率重新计算 小时计算 保留一位小数 实际故障时间 换算成小时 + String hours = equRepairWorkOrder.getWorkCostTime().substring(0,equRepairWorkOrder.getWorkCostTime().length()-2); //截掉后两位 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + 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()+"%"); + equOperation.setUpdateBy(SecurityUtils.getUsername()); + equOperation.setUpdateTime(DateUtils.getNowDate()); + equOperationMapper.updateEquOperation(equOperation); + } } - // 费用 - BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); - BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); - equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); + // 备件费用 +// 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/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java index 8e17be26e..a40ad2149 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java @@ -95,6 +95,8 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { String code = applyList.getWorkCode(); applyList.setApplyCode("AW" + code.substring(2) + serialNum); } + //总价 +// applyList.setTotalPrice(applyList.getAmount().multiply(applyList.getUnitPrice())); //领用时间 applyList.setApplyTime(DateUtils.getNowDate()); //申领人 diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml index c3f2095da..3a0f38087 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml @@ -57,6 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY create_time DESC + + - - where equipment_id = #{equipmentId} + where equipment_code = #{equipmentCode} 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 127957020..40eef9692 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 eaafe629a..6f98ab3b2 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 10b95ba12..4d1539d2d 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 b9268d5f0..99fc05b3c 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 1eda9f706..cad742854 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 @@ -105,13 +105,17 @@ + + where CONVERT(varchar,create_time,21) like concat('%',#{time}, '%') + and equipment_code = #{equipmentCode} + and del_flag = '0' + + \ No newline at end of file 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 cefc46014..af0d332bf 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 @@ -48,6 +48,7 @@ + @@ -138,17 +139,103 @@ @@ -55,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and attr2 = #{attr2} and attr3 = #{attr3} and factory_code = #{factoryCode} + and unit_price = #{unitPrice} + and total_price = #{totalPrice} and del_flag = '0' ORDER BY apply_time DESC @@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, factory_code, + unit_price, + total_price, #{applyId}, @@ -117,6 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{factoryCode}, + #{unitPrice}, + #{totalPrice}, @@ -145,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, factory_code = #{factoryCode}, + unit_price = #{unitPrice}, + total_price = #{totalPrice}, where apply_id = #{applyId} @@ -210,7 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 6656b4425..38a294a90 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -118,9 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" equ.equipment_type_code 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 + 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 @@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and CONVERT(varchar(30),qct.check_time, 120) >= #{checkTimeStart} and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120) and q.type_code = #{typeCode} + and qct.check_type = #{checkType} @@ -139,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 1ad7a3206..31eb4ce1d 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,7 +33,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qct.create_by,qct.create_time, qct.update_by, qct.update_time, qct.check_type,qct.sample_quality,qct.noOk_quality, qct.aNoOkquality,qct.bNoOkquality,qct.cNoOkquality, - q.type_code + q.type_code,q.check_name from qc_check_task qct left join qc_check_type q on q.id = qct.check_type @@ -108,33 +143,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where type_code = #{typeCode} and del_flag='0' @@ -271,4 +299,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{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 672a754e6..6563430fb 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 @@ -63,9 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ctp.sample_num, ctp.sort FROM qc_check_type_project ctp - LEFT JOIN qc_check_project cp ON ctp.project_id = cp.id AND cp.del_flag = '0' + LEFT JOIN qc_check_project cp ON ctp.project_id = cp.id - AND ctp.del_flag = '0' + AND ctp.del_flag = '0' AND cp.del_flag = '0' and ctp.project_id = #{projectId} and ctp.type_id = #{typeId} and ctp.standard_value like concat('%', #{standardValue}, '%') diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml index fb48d98d4..95970101a 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml @@ -15,10 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, project_type_code, project_type_name, attr1, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_project_type + select id, project_type_code, project_type_name, attr1, create_by, create_time, update_by, update_time, + factory_code, del_flag, standard_no, version from qc_project_type @@ -49,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, factory_code, del_flag, + standard_no, + version = #{version} #{id}, @@ -61,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{factoryCode}, #{delFlag}, + #{standardNo} + #{version} @@ -76,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, factory_code = #{factoryCode}, del_flag = #{delFlag}, + standard_no = #{standardNo}, + version = #{version}, where id = #{id} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 739fe1347..6379bb687 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -106,8 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_factory where f_type = 'c' select qctd.project_id projectId, qctd.status, - SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5), + CONVERT(VARCHAR(5),qctd.create_time, 108), concat(qctd.project_id, - case when '09:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '08:00' then '08' - when '10:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '09:00' then '09' - when '11:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '10:00' then '10' - when '12:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '11:00' then '11' - when '13:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '12:30' then '12' - when '14:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '13:30' then '13' - when '15:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '14:30' then '14' - when '16:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '15:30' then '15' - when '17:30'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '16:30' then '16' - when '19:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '18:00' then '18' - when '20:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '19:00' then '19' - when '21:00'>= SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5) and SUBSTRING(CONVERT(varchar(18),qctd.create_time, 120), 12, 5)> '20:00' then '20' + case when '09:00'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '08:00' then '08' + when '10:00'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '09:00' then '09' + when '11:00'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '10:00' then '10' + when '12:00'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '11:00' then '11' + when '13:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '12:30' then '12' + when '14:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '13:30' then '13' + when '15:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '14:30' then '14' + when '16:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '15:30' then '15' + when '17:30'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '16:30' then '16' + when '19:00'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '18:00' then '18' + when '20:00'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '19:00' then '19' + when '21:00'>= CONVERT(VARCHAR(5),qctd.create_time, 108) and CONVERT(VARCHAR(5),qctd.create_time, 108)> '20:00' then '20' else '-' end )ymdms from qc_check_task qct - left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to - where qct.income_batch_no = #{incomeBatchNo} and qct.check_type = 'checkTypeSCXJ' + left join qc_check_task_detail qctd on qct.record_id = qctd.belong_to + where qct.order_no = #{orderNo} and qct.check_type = 'checkTypeSCXJ' order by qctd.create_time + + + + + + + + + diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml index e1c22cd15..211da1df5 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysDatasourceMapper.xml @@ -66,8 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_datasource sud on sd.id = sud.datasource_id left join sys_user su on su.user_id = sud.user_id where sud.user_id is not null - - AND su.nick_name like concat('%', #{nickName}, '%') + + AND su.nick_name like concat('%', #{userName}, '%') AND sd.id = #{datasourceId} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java index 164e6814a..ceb07217f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -248,4 +248,24 @@ public class BaseEquipmentController extends BaseController { return getDataTable(list); } + /** + * 查询维修记录 + */ + @GetMapping("/getWXRecordsList") + public TableDataInfo getWXRecordsList(BaseEquipment baseEquipment) { + startPage(); + List list = baseEquipmentService.selectWXRecordsList(baseEquipment); + return getDataTable(list); + } + + /** + * 查询保养记录 + */ + @GetMapping("/getBYRecordsList") + public TableDataInfo getBYRecordsList(BaseEquipment baseEquipment) { + startPage(); + List list = baseEquipmentService.selectBYRecordsList(baseEquipment); + return getDataTable(list); + } + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java index 180d35cf7..9527a2fcf 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsProductPutController.java @@ -88,6 +88,17 @@ public class WmsProductPutController extends BaseController { public AjaxResult remove(@PathVariable String[] ids) { return toAjax(wmsProductPutService.deleteWmsProductPutByIds(ids)); } + /** + * 成品过账 + * + */ + @PostMapping("/WmsProductPutByWorkOrderConfirmSAPPosting") + public AjaxResult WmsProductPutByWorkOrderConfirmSAPPosting(@RequestBody List wmsProductPut){ + return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderConfirmSAPPosting(wmsProductPut)); + } + + + /** * 手持接口：根据报工单号查询 @@ -96,12 +107,5 @@ public class WmsProductPutController extends BaseController { public AjaxResult selectWmsProductPutByWorkOrder(@PathVariable("workOrder") String workOrder){ return AjaxResult.success(wmsProductPutService.selectWmsProductPutByWorkOrder(workOrder)); } - /** - * 手持接口：根据报工单号查询 - */ - @PostMapping("/s/WmsProductPutByWorkOrderquery") - public AjaxResult WmsProductPutByWorkOrderquery(@RequestBody WmsProductPut wmsProductPut){ - return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderquery(wmsProductPut)); - } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 945a80500..4ff5a911c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -11,6 +11,7 @@ import com.op.common.log.enums.BusinessType; import com.op.wms.domain.*; import com.op.wms.service.IBaseWarehouseService; import com.op.wms.service.IOdsProcureOrderService; +import com.op.wms.service.IWmsProductPutService; import com.op.wms.service.IWmsToWCSmissionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,7 +23,8 @@ import static com.op.common.core.web.domain.AjaxResult.success; @RestController @RequestMapping("/WmsToWCSmission") public class WmsToWCSmissionController { - + @Autowired + private IWmsProductPutService wmsProductPutService; @Autowired private IWmsToWCSmissionService iWmsToWCSmissionService; @Autowired @@ -95,6 +97,8 @@ public WmsToWCSDTO packingMaterialsOutBoundCompleted(@RequestBody WmsToWCSDTO wc @PostMapping("/PurchaseOrderdeliPda") public AjaxResult PurchaseOrderdeliPda(@RequestBody OdsProcureOrder odsProcureOrder) { +// odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); +// return success(); int tem =odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder); return success(tem); } @@ -196,4 +200,23 @@ public WmsToWCSDTO packingMaterialsOutBoundCompleted(@RequestBody WmsToWCSDTO wc AjaxResult result= odsProcureOrderService.sapPurchaseOrderSync(odsProcureOrder); return result; } + + + + /** + * 成品 + * 手持接口：根据报工单号查询－－新 + */ + @PostMapping("/WmsProductPutByWorkOrderquery") + public AjaxResult WmsProductPutByWorkOrderquery(@RequestBody WmsProductPut wmsProductPut){ + return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderquery(wmsProductPut)); + } + /** + * 成品 + * 手持接口：确认 + */ + @PostMapping("/WmsProductPutByWorkOrderConfirm") + public AjaxResult WmsProductPutByWorkOrderConfirm(@RequestBody WmsProductPut wmsProductPut){ + return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderConfirm(wmsProductPut)); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java index 34486ed0e..8f6d121be 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -1,11 +1,14 @@ package com.op.wms.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.op.common.core.domain.BaseFileData; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -259,6 +262,190 @@ public class BaseEquipment extends BaseEntity { //返回已经绑定辅助设备列表 private List selectedEquipmentData; +/////////////////////////维修记录 + /** 维修单号 */ + private String workCode; + + /** 维修人员 */ + private String workPerson; + + /** 维修组 */ + private String workTeam; + + /** 原因分析 */ + private String workReason; + + /** 故障描述 */ + private String workFaultDesc; + + /** 设备维修措施 */ + private String repairMeasures; + + /** 维修开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date workStartTime; + + /** 维修结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date workEndTime; + + /** 维修状态 */ + private String workStatus; + + /////////////////////////保养记录 + /** 单号 */ + private String orderCode; + + /** 循环周期 */ + private String planLoop; + + /** 实际开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date orderStart; + + /** 实际结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date orderEnd; + + /** 工单状态 */ + private String orderStatus; + + /** 工单费用 */ + private BigDecimal orderCost; + + /** 责任人 */ + private String planPerson; + + /** 工单用时 */ + private String orderCostTime; + + /** 签字 */ + private String orderSignPerson; +/////////////////////////////////// + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; +} + public String getOrderCode() { + return orderCode; + } + + public void setPlanLoop(String planLoop) { + this.planLoop = planLoop; + } + public String getPlanLoop() { + return planLoop; + } + + public void setOrderStart(Date orderStart) { + this.orderStart = orderStart; + } + public Date getOrderStart() { + return orderStart; + } + + public void setOrderEnd(Date orderEnd) { + this.orderEnd = orderEnd; + } + public Date getOrderEnd() { + return orderEnd; + } + + public void setOrderStatus(String orderStatus) { + this.orderStatus = orderStatus; + } + public String getOrderStatus() { + return orderStatus; + } + + public void setOrderCost(BigDecimal orderCost) { + this.orderCost = orderCost; + } + public BigDecimal getOrderCost() { + return orderCost; + } + + public void setPlanPerson(String planPerson) { + this.planPerson = planPerson; + } + public String getPlanPerson() { + return planPerson; + } + + public void setOrderCostTime(String orderCostTime) { + this.orderCostTime = orderCostTime; + } + public String getOrderCostTime() { + return orderCostTime; + } + + public void setOrderSignPerson(String orderSignPerson) { + this.orderSignPerson = orderSignPerson; + } + public String getOrderSignPerson() { + return orderSignPerson; + } + /////////////////////////////// + public String getRepairMeasures() { + return repairMeasures; + } + public void setRepairMeasures(String repairMeasures) { this.repairMeasures = repairMeasures; } + + public void setWorkFaultDesc(String workFaultDesc) { + this.workFaultDesc = workFaultDesc; + } + public String getWorkFaultDesc() { + return workFaultDesc; + } + + public void setWorkReason(String workReason) { + this.workReason = workReason; + } + public String getWorkReason() { + return workReason; + } + + public void setWorkStatus(String workStatus) { + this.workStatus = workStatus; + } + public String getWorkStatus() { + return workStatus; + } + + public void setWorkPerson(String workPerson) { + this.workPerson = workPerson; + } + public String getWorkPerson() { + return workPerson; + } + + public void setWorkTeam(String workTeam) { + this.workTeam = workTeam; + } + public String getWorkTeam() { + return workTeam; + } + + public void setWorkCode(String workCode) { + this.workCode = workCode; + } + public String getWorkCode() { + return workCode; + } + + public void setWorkStartTime(Date workStartTime) { + this.workStartTime = workStartTime; + } + public Date getWorkStartTime() { + return workStartTime; + } + + public void setWorkEndTime(Date workEndTime) { + this.workEndTime = workEndTime; + } + public Date getWorkEndTime() { + return workEndTime; + } + public void setSelectedEquipmentData(List selectedEquipmentData) { this.selectedEquipmentData = selectedEquipmentData; } 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 5b78ff86a..d47e38948 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/java/com/op/wms/domain/WmsProductPut.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java index 1d42825b4..a7084322a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java @@ -1,6 +1,9 @@ package com.op.wms.domain; +import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -9,7 +12,7 @@ import com.op.common.core.web.domain.BaseEntity; /** * 成品生产入库对象 wms_product_put - * + * * @author Open Platform * @date 2023-08-31 */ @@ -65,15 +68,26 @@ public class WmsProductPut extends BaseEntity { /** 计划入库数量 */ @Excel(name = "计划入库数量") - private Long planQuantity; + private BigDecimal planQuantity; /** 入库数量 */ @Excel(name = "入库数量") - private Long putQuantity; + private BigDecimal putQuantity; /** 入库状态 */ @Excel(name = "入库状态") private String status; + /** 箱数 */ + @Excel(name = "箱数") + private String number; + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } /** 过账SAP状态 */ @Excel(name = "过账SAP状态") @@ -131,6 +145,24 @@ public class WmsProductPut extends BaseEntity { /** 预留字段10 */ @Excel(name = "预留字段10") private String attr10; + List wmsProductPut; + private String sn; + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public List getWmsProductPut() { + return wmsProductPut; + } + + public void setWmsProductPut(List wmsProductPut) { + this.wmsProductPut = wmsProductPut; + } public void setId(String id) { this.id = id; @@ -216,20 +248,23 @@ public class WmsProductPut extends BaseEntity { public String getUnitOfMeasure() { return unitOfMeasure; } - public void setPlanQuantity(Long planQuantity) { + + public BigDecimal getPlanQuantity() { + return planQuantity; + } + + public void setPlanQuantity(BigDecimal planQuantity) { this.planQuantity = planQuantity; } - public Long getPlanQuantity() { - return planQuantity; + public BigDecimal getPutQuantity() { + return putQuantity; } - public void setPutQuantity(Long putQuantity) { + + public void setPutQuantity(BigDecimal putQuantity) { this.putQuantity = putQuantity; } - public Long getPutQuantity() { - return putQuantity; - } public void setStatus(String status) { this.status = status; } @@ -265,14 +300,14 @@ public class WmsProductPut extends BaseEntity { public Date getPutDate() { return putDate; } - public void setBatchNumber(String batchNumber) { - this.batchNumber = batchNumber; - } public String getBatchNumber() { return batchNumber; } + public void setBatchNumber(String batchNumber) { + this.batchNumber = batchNumber; + } public String getProductDate() { return productDate; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java index d77bd1290..d58080b39 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java @@ -120,4 +120,10 @@ public interface BaseEquipmentMapper { //查询组线/辅助设备 List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment); + + //查询维修记录 + List selectWXRecordsList(BaseEquipment baseEquipment); + + //查询保养记录 + List selectBYRecordsList(BaseEquipment baseEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 5ec180822..d57a17007 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -64,5 +64,7 @@ public interface WmsProductPutMapper { */ public WmsProductPut selectWmsProductPutByWorkOrder(String workOrder); - WmsProductPut selectMesReportWork(WmsProductPut wmsProductPut); + public WmsProductPut selectMesReportWork(WmsProductPut wmsProductPut); + + public WmsProductPut selectWmsProductPutSAPById(String id); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java index df5334814..927b76cc9 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java @@ -83,4 +83,10 @@ public interface IBaseEquipmentService { //查询组线下的辅助设备 List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment); + + //查询维修记录 + List selectWXRecordsList(BaseEquipment baseEquipment); + + //查看保养记录 + List selectBYRecordsList(BaseEquipment baseEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index 8f7a54b2f..3d8152ab0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -64,4 +64,8 @@ public interface IWmsProductPutService { public WmsProductPut selectWmsProductPutByWorkOrder(String workOrder); public WmsProductPut WmsProductPutByWorkOrderquery(WmsProductPut wmsProductPut); + + String WmsProductPutByWorkOrderConfirm(WmsProductPut wmsProductPut); + + String WmsProductPutByWorkOrderConfirmSAPPosting(List wmsProductPut); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java index 7f01eb2aa..8451c6f76 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java @@ -569,4 +569,27 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { return baseEquipmentMapper.selectAuxiliaryEquipmentList(equBindAuxiliaryEquipment); } + /** + * 查询维修记录 + * + * @param baseEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List selectWXRecordsList(BaseEquipment baseEquipment) { + return baseEquipmentMapper.selectWXRecordsList(baseEquipment); + } + + /** + * 查询保养记录 + * + * @param baseEquipment + * @return + */ + @Override + @DS("#header.poolName") + public List selectBYRecordsList(BaseEquipment baseEquipment) { + return baseEquipmentMapper.selectBYRecordsList(baseEquipment); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index df3322f82..f3304753e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -593,7 +593,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { odsProcureOutOrder.setUserDefined9(userDefined9); odsProcureOutOrder.setUserDefined10("2");//成功 odsProcureOutOrderMapper.updateOdsProcureOutOrderByid(odsProcureOutOrder); - }else {// odsProcureOutOrder.setUserDefined9(""); odsProcureOutOrder.setUserDefined10("3");//失败 @@ -693,7 +692,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { qcCheckTaskIncomeDTO.setOrderType("bc"); qcCheckTaskIncomeDTO.setUnit("ST"); qcCheckTaskIncomeDTO.setQuality(new BigDecimal("10")); - qcCheckTaskIncomeDTO.setMaterialCode("000000040000015968"); + qcCheckTaskIncomeDTO.setMaterialCode("000000010900001055"); qcCheckTaskIncomeDTO.setMaterialName("榄菊植物力量蚊液（33mL+送12mL）*2瓶装纸盒(2201)"); qcCheckTaskIncomeDTO.setIncomeBatchNo("202312250001"); qcCheckTaskIncomeDTO.setOrderNo("4500297568"); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index b3e316982..e3215c0e6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1,20 +1,22 @@ package com.op.wms.service.impl; -import java.util.List; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.TimeUnit; 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.wms.domain.WmsProductPutTray; -import com.op.wms.domain.WmsProductPutTrayCode; -import com.op.wms.mapper.WmsProductPutTrayMapper; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.system.api.RemoteSapService; +import com.op.wms.domain.*; +import com.op.wms.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; -import com.op.wms.mapper.WmsProductPutMapper; -import com.op.wms.domain.WmsProductPut; import com.op.wms.service.IWmsProductPutService; /** @@ -29,7 +31,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { private WmsProductPutMapper wmsProductPutMapper; @Autowired private RedisTemplate redisTemplate; - + @Autowired + private WmsProductPutRecordsMapper wmsProductPutRecordsMapper; + @Autowired + private WmsFpStorageNewsSnMapper wmsFpStorageNewsSnMapper; + @Autowired + private WmsFpStorageNewsMapper wmsFpStorageNewsMapper; + @Autowired + private RemoteSapService remoteSapService; /** * 查询成品生产入库 * @@ -131,4 +140,135 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { WmsProductPut wmsProductPut1= wmsProductPutMapper.selectMesReportWork(wmsProductPut); return wmsProductPut1; } + + /** + * 入库－－wms_product_put_records入库记录表（记录每次入库的单子和入库数量） + * ，wms_fp_storage_news_sn明细表（入库明细－托盘，库位）， + * wms_fp_storage_news（物料）库存主表 + * ，wms_product_put（记录单子）入库单 + *其中他这个要生成批次， + * @param wmsProductPut + * @return + */ + @Override + public String WmsProductPutByWorkOrderConfirm(WmsProductPut wmsProductPut) { + DynamicDataSourceContextHolder.push("ds_" +wmsProductPut.getFactoryCode()); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); + Date date = new Date(); + String formattedDate = dateFormat.format(date);//批次 + List wmsProductPutList= wmsProductPut.getWmsProductPut(); + WmsProductPut wmsProductPutk=new WmsProductPut(); + //wms_product_put + wmsProductPutk.setId(IdUtils.fastSimpleUUID()); + wmsProductPutk.setWorkOrder(wmsProductPut.getWorkOrder()); + wmsProductPutk.setFactoryCode(wmsProductPut.getFactoryCode()); + wmsProductPutk.setWhCode(wmsProductPut.getWhCode());//仓库编码 + wmsProductPutk.setProductName(wmsProductPut.getProductName()); + wmsProductPutk.setProductCode(wmsProductPut.getProductCode()); + wmsProductPutk.setProductOrder(wmsProductPut.getProductOrder()); + wmsProductPutk.setPlanQuantity(wmsProductPut.getPlanQuantity()); + wmsProductPutk.setPutQuantity(wmsProductPut.getPutQuantity()); + wmsProductPutk.setStatus("1"); + wmsProductPutk.setSapStatus("0"); + wmsProductPutk.setBatchNumber(wmsProductPut.getBatchNumber());// + wmsProductPutk.setAttr3(formattedDate);// + wmsProductPutk.setCreateBy(wmsProductPut.getCreateBy()); + wmsProductPutk.setCreateTime(new Date()); + wmsProductPutk.setUnitOfMeasure(wmsProductPut.getUnitOfMeasure()); + wmsProductPutMapper.insertWmsProductPut(wmsProductPutk); + + String SUCCESS="操作成功"; + for (WmsProductPut wmsProductPut1: + wmsProductPutList) { + WmsProductPutRecords wmsProductPutRecords=new WmsProductPutRecords(); + wmsProductPutRecords.setWorkOrder(wmsProductPut.getWorkOrder()); + wmsProductPutRecords.setProductOrder(wmsProductPut.getProductOrder()); + wmsProductPutRecords.setProductName(wmsProductPut.getProductName()); + wmsProductPutRecords.setProductCode(wmsProductPut.getProductCode()); + wmsProductPutRecords.setWhCode(wmsProductPut.getWhCode());//仓库编码 + wmsProductPutRecords.setId(IdUtils.fastSimpleUUID()); + wmsProductPutRecords.setWlCode(wmsProductPut1.getWlCode()); + wmsProductPutRecords.setSn(wmsProductPut1.getSn()); + wmsProductPutRecords.setNumber(wmsProductPut1.getNumber()); + wmsProductPutRecords.setCreateBy(wmsProductPut.getCreateBy()); + wmsProductPutRecords.setCreateTime(new Date()); + wmsProductPutRecordsMapper.insertWmsProductPutRecords(wmsProductPutRecords); + //wms_fp_storage_news_sn + WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + wmsFpStorageNewsSn.setStorageId(IdUtils.fastSimpleUUID()); + wmsFpStorageNewsSn.setFactoryCode(wmsProductPut.getFactoryCode()); + wmsFpStorageNewsSn.setWhCode(wmsProductPut.getWhCode());//仓库编码 + wmsFpStorageNewsSn.setWlCode(wmsProductPut1.getWlCode()); + wmsFpStorageNewsSn.setOrderNo(wmsProductPutk.getId()); + wmsFpStorageNewsSn.setProductCode(wmsProductPut.getProductCode()); + wmsFpStorageNewsSn.setProductName(wmsProductPut.getProductName()); + wmsFpStorageNewsSn.setSn(wmsProductPut1.getSn()); + wmsFpStorageNewsSn.setAmount(new BigDecimal(wmsProductPut1.getNumber())); + wmsFpStorageNewsSn.setBatchNumber(wmsProductPut.getBatchNumber()); + wmsFpStorageNewsSn.setUserDefined2(formattedDate); + wmsFpStorageNewsSn.setCreateBy(wmsProductPut.getCreateBy()); + wmsFpStorageNewsSn.setCreateTime(new Date()); + wmsFpStorageNewsSn.setActiveFlag("1"); + wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn); +// wms_fp_storage_news + WmsFpStorageNews wmsFpStorageNews=new WmsFpStorageNews(); + + wmsFpStorageNews.setWhCode(wmsProductPut.getWhCode());//仓库编码 + wmsFpStorageNews.setWlCode(wmsProductPut1.getWlCode()); + wmsFpStorageNews.setStorageType("成品"); + wmsFpStorageNews.setProductCode(wmsProductPut.getProductCode()); + wmsFpStorageNews.setProductName(wmsProductPut.getProductName()); + wmsFpStorageNews.setFactoryCode(wmsProductPut.getFactoryCode()); + wmsFpStorageNews.setActiveFlag("1"); + wmsFpStorageNews.setUserDefined1(wmsProductPut.getUnitOfMeasure()); + List wmsFpStorageNewsList= wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews); + wmsFpStorageNews.setStorageId(IdUtils.fastSimpleUUID()); + wmsFpStorageNews.setAmount(new BigDecimal(wmsProductPut1.getNumber())); + wmsFpStorageNews.setCreateBy(wmsProductPut.getCreateBy()); + wmsFpStorageNews.setCreateTime(new Date()); + if (wmsFpStorageNewsList.size()>0){ + WmsFpStorageNews wmsFpStorageNews1= wmsFpStorageNewsList.get(0); + BigDecimal amount= wmsFpStorageNews1.getAmount(); + BigDecimal amountAdd= amount.add(wmsFpStorageNews.getAmount()); + wmsFpStorageNews1.setAmount(amountAdd); + wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews1); + }else { + wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews); + } + } + return SUCCESS; + } + + @Override + @DS("#header.poolName") + public String WmsProductPutByWorkOrderConfirmSAPPosting(List wmsProductPut) { + String msgs="操作完成"; + for (WmsProductPut wmsProductPut1: + wmsProductPut) { + WmsProductPut wmsProductPut2= wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId()); + List> mapList = new ArrayList<>(); + Map map = new HashMap<>(); + map.put("AUFNR",wmsProductPut2.getProductOrder()); + map.put("WERKS",wmsProductPut2.getFactoryCode()); + map.put("LGORT",wmsProductPut2.getWhCode()); + map.put("QUANTITY",wmsProductPut2.getPutQuantity()); + map.put("ERFME",wmsProductPut2.getUnitOfMeasure()); + map.put("BATCH",wmsProductPut2.getAttr3()); + map.put("HSDAT",wmsProductPut2.getProductDate()); + mapList.add(map); + R result= remoteSapService.sapOrderReceipt(mapList); + int code= result.getCode(); + String msg= result.getMsg(); + wmsProductPut2.setSapMessage(msg); + if (code==200) {//过账成功 + String date= (String) result.getData(); + wmsProductPut2.setSapProof(date); + wmsProductPut2.setSapStatus("1"); + }else { + wmsProductPut2.setSapStatus("2"); + } + wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); + } + return msgs; + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index 37311781a..4e90a2db6 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -622,4 +622,38 @@ where ebac.equipment_code = #{equipmentCode} + + + + + \ No newline at end of file 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 f8f26d4e9..72b70fd88 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} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 5ea7ec9b3..a5e86342e 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -152,8 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sapProof}, #{sapMessage}, #{putDate}, - #{batch_number}, - #{product_date}, + #{batchNumber}, + #{productDate}, #{attr3}, #{attr4}, #{attr5}, @@ -220,17 +221,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +