From 0ea0a7181d8024e6597d514049a74bcb70ce0192 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 29 Jan 2024 14:22:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?wms=E5=87=BA=E5=BA=93=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B924=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/wms/OdsProcureOutOrderMapper.xml | 50 +++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 39c851edd..b14b8f023 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ods_procure_out_order WHERE Active = '1' - and Produce_Code = #{produceCode} + and Produce_Code like concat('%', #{produceCode}, '%') and User_Defined1 = #{userDefined1} AND User_Defined3 !='x' @@ -76,12 +76,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ods_procure_out_order WHERE Active = '1' - and Produce_Code = #{produceCode} + and Produce_Code like concat('%', #{produceCode}, '%') and User_Defined1 = #{userDefined1} AND User_Defined3 ='x' + From 2931ab8646a7ac8c913259a84c0af064b109e2f9 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 26 Feb 2024 10:12:59 +0800 Subject: [PATCH 3/6] =?UTF-8?q?wms=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/wms/OdsProcureOutOrderMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index f87df4290..a3c495cb3 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -50,7 +50,8 @@ SELECT + mur.id, mur.workorder_code, mur.workorder_code_sap, mur.product_code, mur.product_name, + mur.line_code, + mur.attr1 AS real_wages, + be.equipment_name, mur.nick_name, mur.childprocess_code, mup.childprocess_name, mrw.total_quantity, mup.attr1, - mrw.total_quantity * mup.attr1 AS result + CAST(CAST(mrw.total_quantity AS DECIMAL(18,2)) * CAST(mup.attr1 AS DECIMAL(18,5)) AS DECIMAL(18, 6)) AS result, + COUNT(*) OVER (PARTITION BY mur.workorder_code_sap, mur.childprocess_code) AS head_count, + ROUND( + CAST ( + CAST(CAST(mrw.total_quantity AS DECIMAL(18,2)) * CAST(mup.attr1 AS DECIMAL(18,5)) AS DECIMAL(18, 6)) / NULLIF ( COUNT ( * ) OVER ( PARTITION BY mur.workorder_code_sap, mur.childprocess_code ), 0 ) AS DECIMAL ( 18, 4 ) + ), + 4 + ) AS avg_result FROM mes_unitprice_report mur LEFT JOIN mes_unit_price mup ON RIGHT(mur.product_code, 11) = mup.product_code AND mur.childprocess_code = mup.childprocess_code - LEFT JOIN - (SELECT - workorder_code, - SUM(quantity) AS total_quantity - FROM - mes_report_work - + LEFT JOIN base_equipment be ON be.equipment_code=mur.line_code + LEFT JOIN ( SELECT parent_order, SUM ( quantity ) AS total_quantity FROM mes_report_work GROUP BY parent_order ) mrw ON mur.workorder_code = mrw.parent_order and workorder_code = #{workorderCode} - and workorder_code_sap = + and mur.workorder_code_sap = #{workorderCodeSap} - and product_name like concat('%', #{productName}, + and mur.product_name like concat('%', #{productName}, '%') - and product_code = #{productCode} + and mur.product_code = #{productCode} and user_name like concat('%', #{userName}, '%') and nick_name like concat('%', #{nickName}, '%') and childprocess_code = @@ -74,12 +86,14 @@ and attr3 = #{attr3} GROUP BY - workorder_code) mrw ON mur.workorder_code = mrw.workorder_code - GROUP BY + mur.id, mur.workorder_code, mur.workorder_code_sap, mur.product_code, mur.product_name, + mur.attr1, + mur.line_code, + be.equipment_name, mur.nick_name, mur.childprocess_code, mup.childprocess_name, @@ -138,21 +152,21 @@ update mes_unitprice_report - workorder_code = #{workorderCode}, - workorder_code_sap = #{workorderCodeSap}, - product_name = #{productName}, - product_code = #{productCode}, - user_name = #{userName}, - nick_name = #{nickName}, - childprocess_code = #{childprocessCode}, - childprocess_name = #{childprocessName}, + + + + + + + + attr1 = #{attr1}, - attr2 = #{attr2}, - attr3 = #{attr3}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, + + + + + + remark = #{remark}, where id = #{id} diff --git a/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java b/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java index 89ecbca40..1de0a9f3e 100644 --- a/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java +++ b/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java @@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletResponse; import com.op.system.domain.SysMenu; import com.op.system.mapper.SysMenuMapper; import org.apache.commons.lang3.ArrayUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; From 24905c34acd314c17ef990db1a6de561233390e7 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 27 Feb 2024 14:22:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?2024-2-27=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquRepairOrderController.java | 7 +++- .../com/op/device/domain/EquEquipment.java | 18 ++++++++++ .../op/device/mapper/EquEquipmentMapper.java | 2 ++ .../service/impl/EquPlanServiceImpl.java | 11 ++++-- .../mapper/device/EquEquipmentMapper.xml | 34 +++++++++++++------ 5 files changed, 59 insertions(+), 13 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java index bb3089d69..082f86cc1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java @@ -114,6 +114,12 @@ public class EquRepairOrderController extends BaseController { @GetMapping("/getEquipmentList") public TableDataInfo getEquipmentList(EquEquipment equEquipment) { startPage(); + if(equEquipment.getItemCode() != null){ + equEquipment.setEquipmentCode(equEquipment.getItemCode()); + } + if(equEquipment.getItemName()!= null){ + equEquipment.setEquipmentName(equEquipment.getItemName()); + } List list = equRepairOrderService.selectEquEquipmentList(equEquipment); return getDataTable(list); } @@ -123,7 +129,6 @@ public class EquRepairOrderController extends BaseController { */ @GetMapping("/getEquipmentTypeList") public TableDataInfo getEquipmentTypeList(EquEquipment equEquipment) { - startPage(); List list = equRepairOrderService.getEquipmentTypeList(equEquipment); return getDataTable(list); } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java index a294a912e..46647fcba 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java @@ -240,6 +240,24 @@ public class EquEquipment extends BaseEntity { // 组线名称 private String groupLineName; + //虚拟字段 + private String itemCode; + private String itemName; + + public String getItemCode() { + return itemCode; + } + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemName() { + return itemName; + } + public void setItemName(String itemName) { + this.itemName = itemName; + } + public String getGroupLineName() { return groupLineName; } 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 bbfb394d8..8023245c0 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 @@ -70,4 +70,6 @@ public interface EquEquipmentMapper { // 查询设备信息 List selectEquipmentList(EquEquipment equEquipment); + //查询组线为空的设备列表 + List selectGroupLineNullList(EquEquipment equEquipment); } \ No newline at end of file diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index af8980f12..30a965369 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -243,8 +243,15 @@ public class EquPlanServiceImpl implements IEquPlanService { @Override @DS("#header.poolName") public List getEquList(EquEquipment equEquipment) { - equEquipment.setEquipmentCategory("0"); - return equEquipmentMapper.selectEquipmentList(equEquipment); + //如果组线不为空 + if(equEquipment.getGroupLine() != null){ + equEquipment.setEquipmentCategory("0"); + List list = equEquipmentMapper.selectEquipmentList(equEquipment); + return list; + }else{ + List list = equEquipmentMapper.selectGroupLineNullList(equEquipment); + return list; + } } /** diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml index 6ae7a5ad9..c357cfd82 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml @@ -111,12 +111,14 @@ and equipment_category = #{equipmentCategory} + and del_flag = '0' @@ -272,6 +274,7 @@ from base_equipment where del_flag = '0' group by equipment_type_code,equipment_type_name + order by equipment_type_name desc + + From 3f7ec60948158ece78d3ce8ed77d021250d3620b Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Tue, 27 Feb 2024 14:42:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesUnitPriceReportController.java | 12 ++--- .../com/op/mes/domain/MesUnitpriceReport.java | 51 +++++++++++-------- .../mapper/mes/MesUnitpriceReportMapper.xml | 10 +++- 3 files changed, 45 insertions(+), 28 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java index aaf942d28..548bda2d9 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java @@ -38,7 +38,7 @@ public class MesUnitPriceReportController extends BaseController { /** * 查询计件工资统计列表 */ - @RequiresPermissions("system:report:list") + @RequiresPermissions("unitPriceReport:report:list") @GetMapping("/list") public TableDataInfo list(MesUnitpriceReport mesUnitpriceReport) { startPage(); @@ -49,7 +49,7 @@ public class MesUnitPriceReportController extends BaseController { /** * 导出计件工资统计列表 */ - @RequiresPermissions("system:report:export") + @RequiresPermissions("unitPriceReport:report:export") @Log(title = "计件工资统计", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, MesUnitpriceReport mesUnitpriceReport) { @@ -61,7 +61,7 @@ public class MesUnitPriceReportController extends BaseController { /** * 获取计件工资统计详细信息 */ - @RequiresPermissions("system:report:query") + @RequiresPermissions("unitPriceReport:report:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { return success(mesUnitpriceReportService.selectMesUnitpriceReportById(id)); @@ -70,7 +70,7 @@ public class MesUnitPriceReportController extends BaseController { /** * 新增计件工资统计 */ - @RequiresPermissions("system:report:add") + @RequiresPermissions("unitPriceReport:report:add") @Log(title = "计件工资统计", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody MesUnitpriceReport mesUnitpriceReport) { @@ -80,7 +80,7 @@ public class MesUnitPriceReportController extends BaseController { /** * 修改计件工资统计 */ - @RequiresPermissions("system:report:edit") + @RequiresPermissions("unitPriceReport:report:edit") @Log(title = "计件工资统计", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody MesUnitpriceReport mesUnitpriceReport) { @@ -90,7 +90,7 @@ public class MesUnitPriceReportController extends BaseController { /** * 删除计件工资统计 */ - @RequiresPermissions("system:report:remove") + @RequiresPermissions("unitPriceReport:report:remove") @Log(title = "计件工资统计", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable String[] ids) { diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java index a77d0560d..893eee6ec 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesUnitpriceReport.java @@ -32,63 +32,72 @@ public class MesUnitpriceReport extends BaseEntity { */ @Excel(name = "SAP订单编码") private String workorderCodeSap; - + /** + * 产品编号 + */ + @Excel(name = "产品编号") + private String productCode; /** * 产品名称 */ @Excel(name = "产品名称") private String productName; - /** - * 产品编号 - */ - @Excel(name = "产品编号") - private String productCode; + @Excel(name = "产线编码") private String lineCode; + @Excel(name = "产线名称") private String equipmentName; + /** + * 用户昵称 + */ + @Excel(name = "操作者") + private String nickName; + /** + * 子工序名称 + */ + @Excel(name = "子工序名称") + private String childprocessName; + @Excel(name = "工序单价") + private String attr1; + @Excel(name = "件数") private String totalQuantity; + @Excel(name = " 薪酬（元）") private BigDecimal result; + @Excel(name = "人数") private String headCount; + @Excel(name = "平均工资") private String avgResult; + @Excel(name = "实际工资") private String realWages; /** * 用户账号 */ - @Excel(name = "用户账号") + // @Excel(name = "用户账号") private String userName; - /** - * 用户昵称 - */ - @Excel(name = "用户昵称") - private String nickName; + /** * 子工序编码 */ - @Excel(name = "子工序编码") + //@Excel(name = "子工序编码") private String childprocessCode; - /** - * 子工序名称 - */ - @Excel(name = "子工序名称") - private String childprocessName; + /** * $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - private String attr1; + /** * $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + // @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String attr2; public String getRealWages() { diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml index c0e2c26a7..fcbd41450 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml @@ -72,7 +72,9 @@ and mur.product_name like concat('%', #{productName}, '%') - and mur.product_code = #{productCode} + and mur.product_code like concat('%', #{productCode}, + '%') + and user_name like concat('%', #{userName}, '%') and nick_name like concat('%', #{nickName}, '%') and childprocess_code = @@ -81,6 +83,12 @@ and childprocess_name like concat('%', #{childprocessName}, '%') + and mur.line_code like concat('%', + #{lineCode}, '%') + + and be.equipment_name like concat('%', + #{equipmentName}, '%') + and attr1 = #{attr1} and attr2 = #{attr2} and attr3 = #{attr3}