计件工资统计修改

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) {

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() {

op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml

@@ -72,7 +72,9 @@
             <if test="productName != null  and productName != ''">and  mur.product_name like concat('%', #{productName},
                 '%')
             </if>
-            <if test="productCode != null  and productCode != ''">and mur.product_code = #{productCode}</if>
+            <if test="productCode != null  and productCode != ''">and mur.product_code like concat('%', #{productCode},
+                '%')
+            </if>
             <if test="userName != null  and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
             <if test="nickName != null  and nickName != ''">and nick_name like concat('%', #{nickName}, '%')</if>
             <if test="childprocessCode != null  and childprocessCode != ''">and childprocess_code =
@@ -81,6 +83,12 @@
             <if test="childprocessName != null  and childprocessName != ''">and childprocess_name like concat('%',
                 #{childprocessName}, '%')
             </if>
+            <if test="lineCode != null  and lineCode != ''">and mur.line_code like concat('%',
+                #{lineCode}, '%')
+            </if>
+            <if test="equipmentName != null  and equipmentName != ''">and be.equipment_name like concat('%',
+                #{equipmentName}, '%')
+            </if>
             <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
             <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
             <if test="attr3 != null  and attr3 != ''">and attr3 = #{attr3}</if>