报工新页面，计件工资界面编写。
parent
91f358251a
commit
274798eff7
@ -0,0 +1,33 @@
|
||||
package com.op.mes.controller;
|
||||
|
||||
import com.op.common.core.web.controller.BaseController;
|
||||
import com.op.common.core.web.page.TableDataInfo;
|
||||
import com.op.common.security.annotation.RequiresPermissions;
|
||||
import com.op.mes.domain.MesReportWork;
|
||||
import com.op.mes.service.IMesReportWorksService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static com.op.common.core.utils.PageUtils.startPage;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/reportWorks")
|
||||
public class MesReportWorksController extends BaseController {
|
||||
@Autowired
|
||||
private IMesReportWorksService mesReportWorksService;
|
||||
|
||||
/**
|
||||
* 产线报工
|
||||
*/
|
||||
@RequiresPermissions("mes:reportWork:lists")
|
||||
@GetMapping("/lists")
|
||||
public TableDataInfo lists(MesReportWork mesReportWork) {
|
||||
startPage();
|
||||
List<MesReportWork> hzlist = mesReportWorksService.getReportWorksList(mesReportWork);
|
||||
return getDataTable(hzlist);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.op.mes.controller;
|
||||
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/unitPriceReport")
|
||||
public class MesUnitPriceReportController {
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.op.mes.mapper;
|
||||
|
||||
|
||||
import com.op.mes.domain.MesReportWork;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface MesReportWorksMapper {
|
||||
|
||||
List<MesReportWork> getReportWorkList(MesReportWork mesReportWork);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.op.mes.service;
|
||||
|
||||
import com.op.mes.domain.MesReportWork;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IMesReportWorksService {
|
||||
|
||||
List<MesReportWork> getReportWorksList(MesReportWork mesReportWork);
|
||||
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.op.mes.service.impl;
|
||||
|
||||
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.op.mes.domain.MesReportWork;
|
||||
import com.op.mes.mapper.MesReportWorksMapper;
|
||||
import com.op.mes.service.IMesReportWorksService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class MesReportWorksServiceImpl implements IMesReportWorksService {
|
||||
|
||||
@Autowired
|
||||
private MesReportWorksMapper mesReportWorksMapper;
|
||||
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public List<MesReportWork> getReportWorksList(MesReportWork mesReportWork) {
|
||||
return mesReportWorksMapper.getReportWorkList(mesReportWork);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.op.mes.mapper.MesReportWorksMapper">
|
||||
|
||||
<resultMap type="MesReportWork" id="MesReportWorkResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="reportType" column="report_type" />
|
||||
<result property="reportCode" column="report_code" />
|
||||
<result property="workorderCode" column="workorder_code" />
|
||||
<result property="workorderCodeSap" column="workorder_code_sap" />
|
||||
<result property="productCode" column="product_code" />
|
||||
<result property="productName" column="product_name" />
|
||||
<result property="spec" column="spec" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="quantity" column="quantity" />
|
||||
<result property="quantityFeedback" column="quantity_feedback" />
|
||||
<result property="quantityQualified" column="quantity_qualified" />
|
||||
<result property="quantityUnqualified" column="quantity_unqualified" />
|
||||
<result property="userName" column="user_name" />
|
||||
<result property="nickName" column="nick_name" />
|
||||
<result property="feedbackChannel" column="feedback_channel" />
|
||||
<result property="feedbackTime" column="feedback_time" />
|
||||
<result property="recordUser" column="record_user" />
|
||||
<result property="status" column="status" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="workTime" column="work_time" />
|
||||
<result property="useMan" column="use_man" />
|
||||
<result property="machineCode" column="machine_code" />
|
||||
<result property="machineName" column="machine_name" />
|
||||
<result property="teamCode" column="team_code" />
|
||||
<result property="shiftCode" column="shift_code" />
|
||||
<result property="attr1" column="attr1" />
|
||||
<result property="attr2" column="attr2" />
|
||||
<result property="attr3" column="attr3" />
|
||||
<result property="attr4" column="attr4" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="uploadTime" column="upload_time" />
|
||||
<result property="uploadStatus" column="upload_status" />
|
||||
<result property="uploadMsg" column="upload_msg" />
|
||||
<result property="orderCode" column="order_code" />
|
||||
<result property="batch" column="batch" />
|
||||
|
||||
<result property="materialCode" column="material_code" />
|
||||
<result property="materialName" column="material_name" />
|
||||
<result property="materialNameUnit" column="material_name_unit" />
|
||||
|
||||
</resultMap>
|
||||
<resultMap type="com.op.system.api.domain.mes.ProOrderWorkorderDTO" id="ProOrderWorkorderDTOResult">
|
||||
<result property="workorderId" column="workorder_id" />
|
||||
<result property="workorderCode" column="workorder_code" />
|
||||
<result property="workorderName" column="workorder_name" />
|
||||
<result property="orderId" column="order_id" />
|
||||
<result property="orderCode" column="order_code" />
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="productCode" column="product_code" />
|
||||
<result property="productName" column="product_name" />
|
||||
<result property="productSpc" column="product_spc" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="quantityProduced" column="quantity_produced" />
|
||||
<result property="quantitySplit" column="quantity_split" />
|
||||
<result property="routeCode" column="route_code" />
|
||||
<result property="prodLineCode" column="prod_line_code" />
|
||||
<result property="productDate" column="product_date" />
|
||||
<result property="shiftId" column="shift_id" />
|
||||
<result property="parentOrder" column="parent_order" />
|
||||
<result property="ancestors" column="ancestors" />
|
||||
<result property="status" column="status" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="attr1" column="attr1" />
|
||||
<result property="attr2" column="attr2" />
|
||||
<result property="attr3" column="attr3" />
|
||||
<result property="attr4" column="attr4" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="prodType" column="prod_type" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
<result property="endFlag" column="end_flag" />
|
||||
<result property="carNum" column="car_num" />
|
||||
<result property="sortNo" column="sort_no" />
|
||||
<result property="workorderCodes" column="workorderCodes" />
|
||||
<result property="productCodes" column="productCodes" />
|
||||
<result property="productNames" column="productNames" />
|
||||
<result property="quantitySplits" column="quantitySplits" />
|
||||
<result property="units" column="units" />
|
||||
</resultMap>
|
||||
<select id="getReportWorkList" resultMap="MesReportWorkResult" parameterType="MesReportWork">
|
||||
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue