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 bb3089d6..082f86cc 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 a294a912..46647fcb 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 bbfb394d..8023245c 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 af8980f1..30a96536 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 6ae7a5ad..c357cfd8 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 + + 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 aaf942d2..548bda2d 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 266dc00e..893eee6e 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 @@ -5,6 +5,8 @@ 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; + /** * 计件工资统计对象 mes_unitprice_report * @@ -30,58 +32,123 @@ 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() { + return realWages; + } + + public void setRealWages(String realWages) { + this.realWages = realWages; + } + + public String getHeadCount() { + return headCount; + } + + public void setHeadCount(String headCount) { + this.headCount = headCount; + } + + public String getAvgResult() { + return avgResult; + } + + public void setAvgResult(String avgResult) { + this.avgResult = avgResult; + } + + + public BigDecimal getResult() { + return result; + } + + public void setResult(BigDecimal result) { + this.result = result; + } + + public String getTotalQuantity() { + return totalQuantity; + } + + public void setTotalQuantity(String totalQuantity) { + this.totalQuantity = totalQuantity; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + public String getLineCode() { return lineCode; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java index f16dd946..13a2260a 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java @@ -3,7 +3,9 @@ package com.op.mes.service.impl; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.utils.DateUtils; +import com.op.common.security.utils.SecurityUtils; import com.op.mes.domain.MesUnitpriceReport; import com.op.mes.mapper.MesUnitpriceReportMapper; import com.op.mes.service.IMesUnitpriceReportService; @@ -29,6 +31,7 @@ public class MesUnitpriceReportServiceImpl implements IMesUnitpriceReportService * @return 计件工资统计 */ @Override + @DS("#header.poolName") public MesUnitpriceReport selectMesUnitpriceReportById(String id) { return mesUnitpriceReportMapper.selectMesUnitpriceReportById(id); } @@ -52,6 +55,7 @@ public class MesUnitpriceReportServiceImpl implements IMesUnitpriceReportService * @return 结果 */ @Override + public int insertMesUnitpriceReport(MesUnitpriceReport mesUnitpriceReport) { mesUnitpriceReport.setCreateTime(DateUtils.getNowDate()); return mesUnitpriceReportMapper.insertMesUnitpriceReport(mesUnitpriceReport); @@ -64,8 +68,10 @@ public class MesUnitpriceReportServiceImpl implements IMesUnitpriceReportService * @return 结果 */ @Override + @DS("#header.poolName") public int updateMesUnitpriceReport(MesUnitpriceReport mesUnitpriceReport) { mesUnitpriceReport.setUpdateTime(DateUtils.getNowDate()); + mesUnitpriceReport.setUpdateBy(SecurityContextHolder.getUserName()); return mesUnitpriceReportMapper.updateMesUnitpriceReport(mesUnitpriceReport); } 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 7c6c4684..fcbd4145 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 @@ -11,11 +11,17 @@ + + + + + + @@ -31,36 +37,44 @@ - SELECT - Produce_Code, - User_Defined1 - FROM - ods_procure_out_order - where - Active='1' - and Produce_Code like concat('%', #{produceCode}, '%') + - - - - + and User_Defined1 = #{userDefined1} + GROUP BY Produce_Code,User_Defined1 + ORDER BY + Create_Date DESC; + + + + + - + - - insert into ods_procure_out_order - - Site_code, - ID, - Produce_Code, - Material_Code, - Material_Desc, - Plan_Date, - Plan_Number, - Unit, - Out_Number, - Loc_Code, - Loc_Desc, - Production_Line_Desc, - Production_Line_Code, - Order_Status, - User_Defined1, - User_Defined2, - User_Defined3, - User_Defined4, - User_Defined5, - User_Defined6, - User_Defined7, - User_Defined8, - User_Defined9, - User_Defined10, - User_Defined11, - Supplier_Code, - Supplier_Name, - Create_By, - Create_Date, - Last_Update_By, - Last_Update_Date, - Active, - Enterprise_Id, - Enterprise_Code, - - - #{siteCode}, - #{ID}, - #{produceCode}, - #{materialCode}, - #{materialDesc}, - #{planDate}, - #{planNumber}, - #{Unit}, - #{outNumber}, - #{locCode}, - #{locDesc}, - #{productionLineDesc}, - #{productionLineCode}, - #{orderStatus}, - #{userDefined1}, - #{userDefined2}, - #{userDefined3}, - #{userDefined4}, - #{userDefined5}, - #{userDefined6}, - #{userDefined7}, - #{userDefined8}, - #{userDefined9}, - #{userDefined10}, - #{userDefined11}, - #{supplierCode}, - #{supplierName}, - #{createBy}, - #{createDate}, - #{lastUpdateBy}, - #{lastUpdateDate}, - #{Active}, - #{enterpriseId}, - #{enterpriseCode}, - - + + insert into ods_procure_out_order + + Site_code, + ID, + Produce_Code, + Material_Code, + Material_Desc, + Plan_Date, + Plan_Number, + Unit, + Out_Number, + Loc_Code, + Loc_Desc, + Production_Line_Desc, + Production_Line_Code, + Order_Status, + User_Defined1, + User_Defined2, + User_Defined3, + User_Defined4, + User_Defined5, + User_Defined6, + User_Defined7, + User_Defined8, + User_Defined9, + User_Defined10, + User_Defined11, + Supplier_Code, + Supplier_Name, + Create_By, + Create_Date, + Last_Update_By, + Last_Update_Date, + Active, + Enterprise_Id, + Enterprise_Code, + + + #{siteCode}, + #{ID}, + #{produceCode}, + #{materialCode}, + #{materialDesc}, + #{planDate}, + #{planNumber}, + #{Unit}, + #{outNumber}, + #{locCode}, + #{locDesc}, + #{productionLineDesc}, + #{productionLineCode}, + #{orderStatus}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{userDefined11}, + #{supplierCode}, + #{supplierName}, + #{createBy}, + #{createDate}, + #{lastUpdateBy}, + #{lastUpdateDate}, + #{Active}, + #{enterpriseId}, + #{enterpriseCode}, + + - - update ods_procure_out_order - - Site_code = #{siteCode}, - Produce_Code = #{produceCode}, - Material_Code = #{materialCode}, - Material_Desc = #{materialDesc}, - Plan_Date = #{planDate}, - Plan_Number = #{planNumber}, - Unit = #{Unit}, - Out_Number = #{outNumber}, - Loc_Code = #{locCode}, - Loc_Desc = #{locDesc}, - Production_Line_Desc = #{productionLineDesc}, - Production_Line_Code = #{productionLineCode}, - Order_Status = #{orderStatus}, - 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}, - User_Defined11 = #{userDefined11}, - Supplier_Code = #{supplierCode}, - Supplier_Name = #{supplierName}, - Create_By = #{createBy}, - Create_Date = #{createDate}, - Last_Update_By = #{lastUpdateBy}, - Last_Update_Date = #{lastUpdateDate}, - Active = #{Active}, - Enterprise_Id = #{enterpriseId}, - Enterprise_Code = #{enterpriseCode}, - - where ID = #{ID} - + + update ods_procure_out_order + + Site_code = #{siteCode}, + Produce_Code = #{produceCode}, + Material_Code = #{materialCode}, + Material_Desc = #{materialDesc}, + Plan_Date = #{planDate}, + Plan_Number = #{planNumber}, + Unit = #{Unit}, + Out_Number = #{outNumber}, + Loc_Code = #{locCode}, + Loc_Desc = #{locDesc}, + Production_Line_Desc = #{productionLineDesc}, + Production_Line_Code = #{productionLineCode}, + Order_Status = #{orderStatus}, + 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}, + User_Defined11 = #{userDefined11}, + Supplier_Code = #{supplierCode}, + Supplier_Name = #{supplierName}, + Create_By = #{createBy}, + Create_Date = #{createDate}, + Last_Update_By = #{lastUpdateBy}, + Last_Update_Date = #{lastUpdateDate}, + Active = #{Active}, + Enterprise_Id = #{enterpriseId}, + Enterprise_Code = #{enterpriseCode}, + + where ID = #{ID} + - + delete from ods_procure_out_order where ID = #{ID} - - delete from ods_procure_out_order where ID in - - #{ID} - - - SELECT prepare_id id, workorder_name Produce_Code, + workorder_code workorderCode, product_code Material_Code, product_name Material_Desc, unit Unit, @@ -281,7 +277,7 @@ workorder_name =#{produceCode} - SELECT mes_prepare_detail.record_id ID, mes_prepare.workorder_name, @@ -301,7 +297,7 @@ WHERE mes_prepare_detail.prepare_id= #{ID} - + insert into wms_raw_mission_out(id, prd_order, material_code, @@ -331,78 +327,84 @@ #{createDate} ) - + update ods_procure_out_order set User_Defined10 = #{userDefined10}, User_Defined9 = #{userDefined9}, User_Defined11 = #{userDefined11} where ID = #{ID} - - update ods_procure_out_order - set User_Defined10 = #{order.userDefined10}, - User_Defined9 = #{order.userDefined9}, - User_Defined11 = #{order.userDefined11} - where ID in - - #{item.ID} - - - - + + update ods_procure_out_order + set User_Defined10 = #{order.userDefined10}, + User_Defined9 = #{order.userDefined9}, + User_Defined11 = #{order.userDefined11} + where ID in + + #{item.ID} + + + + +