From 72614e6264dc271dc3574b59e32105e2f3db1c91 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 11 Dec 2023 20:04:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20add=E6=B8=85=E5=8D=95=E7=8E=87?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aucma/base/domain/BaseProductLine.java | 13 ++++++ .../com/aucma/base/domain/BaseStoreInfo.java | 28 +++++++++++++ .../aucma/base/utils/MaterialConstants.java | 5 +++ .../mapper/base/BaseProductLineMapper.xml | 5 +++ .../mapper/base/BaseStoreInfoMapper.xml | 8 ++++ .../ProductionReportController.java | 37 +++++++++++++++++ .../report/mapper/GeneralReportMapper.java | 27 +++++++++++++ .../service/IProductionReportService.java | 24 +++++++++++ .../impl/ProductionReportServiceImpl.java | 33 +++++++++++++++ .../mapper/report/GeneralReportMapper.xml | 40 +++++++++++++++++++ 10 files changed, 220 insertions(+) create mode 100644 aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java create mode 100644 aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java create mode 100644 aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java create mode 100644 aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java index dff9844..3fa484a 100644 --- a/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseProductLine.java @@ -111,6 +111,19 @@ public class BaseProductLine extends BaseEntity { */ private String workCenterName; + /** + * 执行顺序 + */ + private String executionSort; + + public String getExecutionSort() { + return executionSort; + } + + public void setExecutionSort(String executionSort) { + this.executionSort = executionSort; + } + public String getWorkCenterCode() { return workCenterCode; } diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseStoreInfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseStoreInfo.java index 1cbe3e7..c60e8e1 100644 --- a/aucma-base/src/main/java/com/aucma/base/domain/BaseStoreInfo.java +++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseStoreInfo.java @@ -96,6 +96,34 @@ public class BaseStoreInfo extends BaseEntity { @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date updatedTime; + /** + * 产线编号 + */ + @Excel(name = "产线编号") + private String productLineCode; + + /** + * 产线名称 + */ + @Excel(name = "产线名称") + private String productLineName; + + public String getProductLineName() { + return productLineName; + } + + public void setProductLineName(String productLineName) { + this.productLineName = productLineName; + } + + public String getProductLineCode() { + return productLineCode; + } + + public void setProductLineCode(String productLineCode) { + this.productLineCode = productLineCode; + } + public String getPlantCode() { return plantCode; } diff --git a/aucma-base/src/main/java/com/aucma/base/utils/MaterialConstants.java b/aucma-base/src/main/java/com/aucma/base/utils/MaterialConstants.java index cbe7327..623d340 100644 --- a/aucma-base/src/main/java/com/aucma/base/utils/MaterialConstants.java +++ b/aucma-base/src/main/java/com/aucma/base/utils/MaterialConstants.java @@ -42,6 +42,11 @@ public class MaterialConstants { */ public static final String AFTER_MATERIAL_TYPE = "700"; + /** + * 其他物料类型 + */ + public static final String OTHER_MATERIAL_TYPE = "900"; + /** * SAP物料成品 diff --git a/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml index 2307c7d..48e17d8 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseProductLineMapper.xml @@ -22,6 +22,7 @@ + @@ -37,6 +38,7 @@ bpl.created_time, bpl.updated_by, bpl.updated_time, + bpl.execution_sort, bpl.PARENT_ID, bpl.work_center_code, bpl.work_center_name, @@ -102,6 +104,7 @@ station_type, work_center_code, work_center_name, + execution_sort, #{objId}, @@ -118,6 +121,7 @@ #{stationType}, #{workCenterCode}, #{workCenterName}, + #{executionSort}, @@ -137,6 +141,7 @@ station_type = #{stationType}, work_center_code = #{workCenterCode}, work_center_name = #{workCenterName}, + execution_sort = #{executionSort}, where obj_id = #{objId} diff --git a/aucma-base/src/main/resources/mapper/base/BaseStoreInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseStoreInfoMapper.xml index fc554c7..d043241 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseStoreInfoMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseStoreInfoMapper.xml @@ -18,6 +18,8 @@ + + @@ -32,10 +34,12 @@ si.created_time, si.updated_by, si.updated_time, + pl.product_line_name, si.factory_code, bf.factory_name from base_storeinfo si left join base_factory bf on bf.factory_code = si.factory_code + left join BASE_PRODUCTLINE pl on pl.product_line_code = si.product_line_code @@ -79,6 +84,7 @@ updated_by, updated_time, factory_code, + product_line_code, #{objId}, @@ -93,6 +99,7 @@ #{updatedBy}, #{updatedTime}, #{plantCode}, + #{productLineCode}, @@ -110,6 +117,7 @@ updated_by = #{updatedBy}, updated_time = #{updatedTime}, factory_code = #{plantCode}, + product_line_code = #{productLineCode}, where obj_id = #{objId} diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java new file mode 100644 index 0000000..9e95a42 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java @@ -0,0 +1,37 @@ +package com.aucma.report.controller; + +import com.aucma.common.core.controller.BaseController; +import com.aucma.common.core.domain.AjaxResult; +import com.aucma.common.core.page.TableDataInfo; + +import com.aucma.report.service.IProductionReportService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * PDA管理Controller + * + * @author Yinq + * @date 2023-11-21 + */ +@RestController +@RequestMapping("/report/productionReport") +public class ProductionReportController extends BaseController { + @Autowired + private IProductionReportService productionReportService; + + /** + * 查询清单率报表 + */ + @GetMapping("/inventoryRateReportList") + public AjaxResult inventoryRateReportList(@RequestParam(required = false) Map hashMap) { + List> list = productionReportService.inventoryRateReportList(hashMap); + return success(list); + } + + +} diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java new file mode 100644 index 0000000..7dac0b0 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java @@ -0,0 +1,27 @@ +package com.aucma.report.mapper; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 通用报表Mapper接口 + * + * @Author YinQ + * @create 2023-10-26 10:53 + */ +public interface GeneralReportMapper { + + + /** + * 查询清单率报表 + * @param hashMap + * @return + */ + List> inventoryRateReportList(Map hashMap); + + + + + +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java new file mode 100644 index 0000000..c991127 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java @@ -0,0 +1,24 @@ +package com.aucma.report.service; + +import com.aucma.report.domain.BasePdaRecord; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * PDA管理Service接口 + * + * @author Yinq + * @date 2023-11-21 + */ +public interface IProductionReportService +{ + + /** + * 查询清单率报表 + */ + List> inventoryRateReportList(Map hashMap); + + +} diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java new file mode 100644 index 0000000..6ce2035 --- /dev/null +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java @@ -0,0 +1,33 @@ +package com.aucma.report.service.impl; + +import com.aucma.report.domain.BasePdaRecord; +import com.aucma.report.mapper.GeneralReportMapper; +import com.aucma.report.service.IProductionReportService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * PDA管理Service业务层处理 + * + * @author Yinq + * @date 2023-11-21 + */ +@Service +public class ProductionReportServiceImpl implements IProductionReportService { + @Autowired + private GeneralReportMapper reportMapper; + + /** + * 查询清单率报表 + */ + @Override + public List> inventoryRateReportList(Map hashMap) { + return reportMapper.inventoryRateReportList(hashMap); + } + + +} diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml new file mode 100644 index 0000000..0da8f1a --- /dev/null +++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + +