From b17709731989263049eda40b3e1511c8ec0e9371 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 17 Apr 2025 16:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=94=A8=E4=BA=BA=E7=AE=97=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E7=B1=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SparePartsInOutStorageController.java | 97 ----- .../op/device/domain/SparePartsInStorage.java | 352 ------------------ .../op/device/domain/vo/EquipmentBoardVO.java | 43 +++ .../mapper/SparePartsInOutStorageMapper.java | 61 --- .../ISparePartsInOutStorageService.java | 60 --- .../SparePartsInOutStorageServiceImpl.java | 95 ----- .../device/SparePartsInOutStorageMapper.xml | 187 ---------- .../impl/MesReportWorkServiceImpl.java | 1 + .../mapper/mes/MesReportWorkMapper.xml | 4 +- 9 files changed, 47 insertions(+), 853 deletions(-) delete mode 100644 op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java delete mode 100644 op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java delete mode 100644 op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java deleted file mode 100644 index f9f5f329c..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.op.device.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.op.common.log.annotation.Log; -import com.op.common.log.enums.BusinessType; -import com.op.common.security.annotation.RequiresPermissions; -import com.op.device.domain.SparePartsInStorage; -import com.op.device.service.ISparePartsInOutStorageService; -import com.op.common.core.web.controller.BaseController; -import com.op.common.core.web.domain.AjaxResult; -import com.op.common.core.utils.poi.ExcelUtil; -import com.op.common.core.web.page.TableDataInfo; - -/** - * 备品备件出入库Controller - * - * @author Open Platform - * @date 2023-10-17 - */ -@RestController -@RequestMapping("/sparepartsInOutStorage") -public class SparePartsInOutStorageController extends BaseController { - @Autowired - private ISparePartsInOutStorageService sparePartsInOutStorageService; - - /** - * 查询备品备件出入库列表 - */ - @RequiresPermissions("device:sparepartsInOutStorage:list") - @GetMapping("/list") - public TableDataInfo list(SparePartsInStorage sparePartsInStorage) { - startPage(); - List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); - return getDataTable(list); - } - - /** - * 导出备品备件出入库列表 - */ - @RequiresPermissions("device:sparepartsInOutStorage:export") - @Log(title = "备品备件出入库", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, SparePartsInStorage sparePartsInStorage) { - List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); - ExcelUtil util = new ExcelUtil(SparePartsInStorage.class); - util.exportExcel(response, list, "备品备件出入库数据"); - } - - /** - * 获取备品备件出入库详细信息 - */ - @RequiresPermissions("device:sparepartsInOutStorage:query") - @GetMapping(value = "/{rawOrderInSnId}") - public AjaxResult getInfo(@PathVariable("rawOrderInSnId") String rawOrderInSnId) { - return success(sparePartsInOutStorageService.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId)); - } - - /** - * 新增备品备件出入库 - */ - @RequiresPermissions("device:sparepartsInOutStorage:add") - @Log(title = "备品备件出入库", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody SparePartsInStorage sparePartsInStorage) { - return toAjax(sparePartsInOutStorageService.insertSparePartsInStorage(sparePartsInStorage)); - } - - /** - * 修改备品备件出入库 - */ - @RequiresPermissions("device:sparepartsInOutStorage:edit") - @Log(title = "备品备件出入库", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody SparePartsInStorage sparePartsInStorage) { - return toAjax(sparePartsInOutStorageService.updateSparePartsInStorage(sparePartsInStorage)); - } - - /** - * 删除备品备件出入库 - */ - @RequiresPermissions("device:sparepartsInOutStorage:remove") - @Log(title = "备品备件出入库", businessType = BusinessType.DELETE) - @DeleteMapping("/{rawOrderInSnIds}") - public AjaxResult remove(@PathVariable String[] rawOrderInSnIds) { - return toAjax(sparePartsInOutStorageService.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds)); - } -} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java deleted file mode 100644 index 83edcdcce..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java +++ /dev/null @@ -1,352 +0,0 @@ -package com.op.device.domain; - -import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -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; - -/** - * 备品备件出入库对象 wms_raw_order_in_sn - * - * @author Open Platform - * @date 2023-10-17 - */ -public class SparePartsInStorage extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 唯一序列号 */ - private String rawOrderInSnId; - - /** 仓库编码 */ - @Excel(name = "仓库编码") - private String whCode; - - /** 库区编码 */ - @Excel(name = "库区编码") - private String waCode; - - /** 库位编码 */ - @Excel(name = "库位编码") - private String wlCode; - - /** 入库单号 */ - @Excel(name = "入库单号") - private String orderNo; - - /** 采购订单号 */ - @Excel(name = "采购订单号") - private String poNo; - - /** 采购订单行项目 */ - @Excel(name = "采购订单行项目") - private String poLine; - - /** 物料号 */ - @Excel(name = "物料号") - private String materialCode; - - /** 物料描述 */ - @Excel(name = "物料描述") - private String materialDesc; - - /** sn/LPN */ - @Excel(name = "sn/LPN") - private String sn; - - /** 数量 */ - @Excel(name = "数量") - private BigDecimal amount; - - /** 备用1 */ - @Excel(name = "备用1") - private String userDefined1; - - /** 备用2 */ - @Excel(name = "备用2") - private String userDefined2; - - /** 备用3 */ - @Excel(name = "备用3") - private String userDefined3; - - /** 备用4 */ - @Excel(name = "备用4") - private String userDefined4; - - /** 备用5 */ - @Excel(name = "备用5") - private String userDefined5; - - /** 备用6 */ - @Excel(name = "备用6") - private String userDefined6; - - /** 备用7 */ - @Excel(name = "备用7") - private String userDefined7; - - /** 备用8 */ - @Excel(name = "备用8") - private String userDefined8; - - /** 备用9 */ - @Excel(name = "备用9") - private String userDefined9; - - /** 备用10 */ - @Excel(name = "备用10") - private String userDefined10; - - /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date gmtCreate; - - /** 最后更新人 */ - @Excel(name = "最后更新人") - private String lastModifiedBy; - - /** 最后更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date gmtModified; - - /** 有效标记 */ - @Excel(name = "有效标记") - private String activeFlag; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String factoryCode; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String sapFactoryCode; - - public void setRawOrderInSnId(String rawOrderInSnId) { - this.rawOrderInSnId = rawOrderInSnId; - } - - public String getRawOrderInSnId() { - return rawOrderInSnId; - } - public void setWhCode(String whCode) { - this.whCode = whCode; - } - - public String getWhCode() { - return whCode; - } - public void setWaCode(String waCode) { - this.waCode = waCode; - } - - public String getWaCode() { - return waCode; - } - public void setWlCode(String wlCode) { - this.wlCode = wlCode; - } - - public String getWlCode() { - return wlCode; - } - public void setOrderNo(String orderNo) { - this.orderNo = orderNo; - } - - public String getOrderNo() { - return orderNo; - } - public void setPoNo(String poNo) { - this.poNo = poNo; - } - - public String getPoNo() { - return poNo; - } - public void setPoLine(String poLine) { - this.poLine = poLine; - } - - public String getPoLine() { - return poLine; - } - public void setMaterialCode(String materialCode) { - this.materialCode = materialCode; - } - - public String getMaterialCode() { - return materialCode; - } - public void setMaterialDesc(String materialDesc) { - this.materialDesc = materialDesc; - } - - public String getMaterialDesc() { - return materialDesc; - } - public void setSn(String sn) { - this.sn = sn; - } - - public String getSn() { - return sn; - } - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public BigDecimal getAmount() { - return amount; - } - public void setUserDefined1(String userDefined1) { - this.userDefined1 = userDefined1; - } - - public String getUserDefined1() { - return userDefined1; - } - public void setUserDefined2(String userDefined2) { - this.userDefined2 = userDefined2; - } - - public String getUserDefined2() { - return userDefined2; - } - public void setUserDefined3(String userDefined3) { - this.userDefined3 = userDefined3; - } - - public String getUserDefined3() { - return userDefined3; - } - public void setUserDefined4(String userDefined4) { - this.userDefined4 = userDefined4; - } - - public String getUserDefined4() { - return userDefined4; - } - public void setUserDefined5(String userDefined5) { - this.userDefined5 = userDefined5; - } - - public String getUserDefined5() { - return userDefined5; - } - public void setUserDefined6(String userDefined6) { - this.userDefined6 = userDefined6; - } - - public String getUserDefined6() { - return userDefined6; - } - public void setUserDefined7(String userDefined7) { - this.userDefined7 = userDefined7; - } - - public String getUserDefined7() { - return userDefined7; - } - public void setUserDefined8(String userDefined8) { - this.userDefined8 = userDefined8; - } - - public String getUserDefined8() { - return userDefined8; - } - public void setUserDefined9(String userDefined9) { - this.userDefined9 = userDefined9; - } - - public String getUserDefined9() { - return userDefined9; - } - public void setUserDefined10(String userDefined10) { - this.userDefined10 = userDefined10; - } - - public String getUserDefined10() { - return userDefined10; - } - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - public Date getGmtCreate() { - return gmtCreate; - } - public void setLastModifiedBy(String lastModifiedBy) { - this.lastModifiedBy = lastModifiedBy; - } - - public String getLastModifiedBy() { - return lastModifiedBy; - } - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - public Date getGmtModified() { - return gmtModified; - } - public void setActiveFlag(String activeFlag) { - this.activeFlag = activeFlag; - } - - public String getActiveFlag() { - return activeFlag; - } - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getFactoryCode() { - return factoryCode; - } - public void setSapFactoryCode(String sapFactoryCode) { - this.sapFactoryCode = sapFactoryCode; - } - - public String getSapFactoryCode() { - return sapFactoryCode; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("rawOrderInSnId", getRawOrderInSnId()) - .append("whCode", getWhCode()) - .append("waCode", getWaCode()) - .append("wlCode", getWlCode()) - .append("orderNo", getOrderNo()) - .append("poNo", getPoNo()) - .append("poLine", getPoLine()) - .append("materialCode", getMaterialCode()) - .append("materialDesc", getMaterialDesc()) - .append("sn", getSn()) - .append("amount", getAmount()) - .append("userDefined1", getUserDefined1()) - .append("userDefined2", getUserDefined2()) - .append("userDefined3", getUserDefined3()) - .append("userDefined4", getUserDefined4()) - .append("userDefined5", getUserDefined5()) - .append("userDefined6", getUserDefined6()) - .append("userDefined7", getUserDefined7()) - .append("userDefined8", getUserDefined8()) - .append("userDefined9", getUserDefined9()) - .append("userDefined10", getUserDefined10()) - .append("createBy", getCreateBy()) - .append("gmtCreate", getGmtCreate()) - .append("lastModifiedBy", getLastModifiedBy()) - .append("gmtModified", getGmtModified()) - .append("activeFlag", getActiveFlag()) - .append("factoryCode", getFactoryCode()) - .append("sapFactoryCode", getSapFactoryCode()) - .toString(); - } -} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquipmentBoardVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquipmentBoardVO.java index dd8f1213c..482d0707d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquipmentBoardVO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquipmentBoardVO.java @@ -26,6 +26,49 @@ public class EquipmentBoardVO { //点检总数 private BigDecimal spotInspectionTotal; + //保养总数 + private BigDecimal maintenanceTotal; + + //保养完成数量 + private BigDecimal maintenanceFinish; + + //维修总数 + private BigDecimal repairTotal; + //维修完成数 + private BigDecimal repairFinish; + + public BigDecimal getRepairTotal() { + return repairTotal; + } + + public void setRepairTotal(BigDecimal repairTotal) { + this.repairTotal = repairTotal; + } + + public BigDecimal getRepairFinish() { + return repairFinish; + } + + public void setRepairFinish(BigDecimal repairFinish) { + this.repairFinish = repairFinish; + } + + public BigDecimal getMaintenanceTotal() { + return maintenanceTotal; + } + + public void setMaintenanceTotal(BigDecimal maintenanceTotal) { + this.maintenanceTotal = maintenanceTotal; + } + + public BigDecimal getMaintenanceFinish() { + return maintenanceFinish; + } + + public void setMaintenanceFinish(BigDecimal maintenanceFinish) { + this.maintenanceFinish = maintenanceFinish; + } + // 获取时间维度的值 public BigDecimal getTimeDimension() { return timeDimension; diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java deleted file mode 100644 index 3c04e3698..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.op.device.mapper; - -import java.util.List; - -import com.op.device.domain.SparePartsInStorage; - -/** - * 备品备件出入库Mapper接口 - * - * @author Open Platform - * @date 2023-10-17 - */ -public interface SparePartsInOutStorageMapper { - /** - * 查询备品备件出入库 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 备品备件出入库 - */ - public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); - - /** - * 查询备品备件出入库列表 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 备品备件出入库集合 - */ - public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage); - - /** - * 新增备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage); - - /** - * 修改备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage); - - /** - * 删除备品备件出入库 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 结果 - */ - public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); - - /** - * 批量删除备品备件出入库 - * - * @param rawOrderInSnIds 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); -} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java deleted file mode 100644 index db0055079..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.op.device.service; - -import java.util.List; -import com.op.device.domain.SparePartsInStorage; - -/** - * 备品备件出入库Service接口 - * - * @author Open Platform - * @date 2023-10-17 - */ -public interface ISparePartsInOutStorageService { - /** - * 查询备品备件出入库 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 备品备件出入库 - */ - public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); - - /** - * 查询备品备件出入库列表 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 备品备件出入库集合 - */ - public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage); - - /** - * 新增备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage); - - /** - * 修改备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage); - - /** - * 批量删除备品备件出入库 - * - * @param rawOrderInSnIds 需要删除的备品备件出入库主键集合 - * @return 结果 - */ - public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); - - /** - * 删除备品备件出入库信息 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 结果 - */ - public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); -} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java deleted file mode 100644 index 1685a2439..000000000 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.op.device.service.impl; - -import java.util.List; - -import com.baomidou.dynamic.datasource.annotation.DS; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.op.device.mapper.SparePartsInOutStorageMapper; -import com.op.device.domain.SparePartsInStorage; -import com.op.device.service.ISparePartsInOutStorageService; - -/** - * 备品备件出入库Service业务层处理 - * - * @author Open Platform - * @date 2023-10-17 - */ -@Service -public class SparePartsInOutStorageServiceImpl implements ISparePartsInOutStorageService { - @Autowired - private SparePartsInOutStorageMapper sparePartsInOutStorageMapper; - - /** - * 查询备品备件出入库 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 备品备件出入库 - */ - @Override - @DS("#header.poolName") - public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) { - return sparePartsInOutStorageMapper.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId); - } - - /** - * 查询备品备件出入库列表 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 备品备件出入库 - */ - @Override - @DS("#header.poolName") - public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage) { - return sparePartsInOutStorageMapper.selectSparePartsInStorageList(sparePartsInStorage); - } - - /** - * 新增备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage) { - - return sparePartsInOutStorageMapper.insertSparePartsInStorage(sparePartsInStorage); - } - - /** - * 修改备品备件出入库 - * - * @param sparePartsInStorage 备品备件出入库 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage) { - return sparePartsInOutStorageMapper.updateSparePartsInStorage(sparePartsInStorage); - } - - /** - * 批量删除备品备件出入库 - * - * @param rawOrderInSnIds 需要删除的备品备件出入库主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds) { - return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds); - } - - /** - * 删除备品备件出入库信息 - * - * @param rawOrderInSnId 备品备件出入库主键 - * @return 结果 - */ - @Override - @DS("#header.poolName") - public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) { - return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnId(rawOrderInSnId); - } -} diff --git a/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml deleted file mode 100644 index 2d7903eef..000000000 --- a/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select raw_order_in_sn_id, wh_code, wa_code, wl_code, order_no, po_no, po_line, material_code, material_desc, sn, amount, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_raw_order_in_sn - - - - - - - - insert into wms_raw_order_in_sn - - raw_order_in_sn_id, - wh_code, - wa_code, - wl_code, - order_no, - po_no, - po_line, - material_code, - material_desc, - sn, - amount, - user_defined1, - user_defined2, - user_defined3, - user_defined4, - user_defined5, - user_defined6, - user_defined7, - user_defined8, - user_defined9, - user_defined10, - create_by, - gmt_create, - last_modified_by, - gmt_modified, - active_flag, - factory_code, - sap_factory_code, - - - #{rawOrderInSnId}, - #{whCode}, - #{waCode}, - #{wlCode}, - #{orderNo}, - #{poNo}, - #{poLine}, - #{materialCode}, - #{materialDesc}, - #{sn}, - #{amount}, - #{userDefined1}, - #{userDefined2}, - #{userDefined3}, - #{userDefined4}, - #{userDefined5}, - #{userDefined6}, - #{userDefined7}, - #{userDefined8}, - #{userDefined9}, - #{userDefined10}, - #{createBy}, - #{gmtCreate}, - #{lastModifiedBy}, - #{gmtModified}, - #{activeFlag}, - #{factoryCode}, - #{sapFactoryCode}, - - - - - update wms_raw_order_in_sn - - wh_code = #{whCode}, - wa_code = #{waCode}, - wl_code = #{wlCode}, - order_no = #{orderNo}, - po_no = #{poNo}, - po_line = #{poLine}, - material_code = #{materialCode}, - material_desc = #{materialDesc}, - sn = #{sn}, - amount = #{amount}, - user_defined1 = #{userDefined1}, - user_defined2 = #{userDefined2}, - user_defined3 = #{userDefined3}, - user_defined4 = #{userDefined4}, - user_defined5 = #{userDefined5}, - user_defined6 = #{userDefined6}, - user_defined7 = #{userDefined7}, - user_defined8 = #{userDefined8}, - user_defined9 = #{userDefined9}, - user_defined10 = #{userDefined10}, - create_by = #{createBy}, - gmt_create = #{gmtCreate}, - last_modified_by = #{lastModifiedBy}, - gmt_modified = #{gmtModified}, - active_flag = #{activeFlag}, - factory_code = #{factoryCode}, - sap_factory_code = #{sapFactoryCode}, - - where raw_order_in_sn_id = #{rawOrderInSnId} - - - - delete from wms_raw_order_in_sn where raw_order_in_sn_id = #{rawOrderInSnId} - - - - delete from wms_raw_order_in_sn where raw_order_in_sn_id in - - #{rawOrderInSnId} - - - \ No newline at end of file diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index 84bbc5dc8..4c8aa0495 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -1,6 +1,7 @@ package com.op.mes.service.impl; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; 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 4f39a1d35..1f7be2ec3 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 @@ -851,7 +851,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"