Merge remote-tracking branch 'origin/master'

master
mengjiao 1 year ago
commit 4b713ab5de

@ -83,4 +83,6 @@ public interface SparePartsLedgerMapper {
* @param apply
*/
void updateSpareNumAdd(EquSpareApply apply);
void updateAmount(SparePartsLedger sparePartsLedger);
}

@ -146,7 +146,7 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
BigDecimal applyNum = equSpareApply.getSpareQuantity();
BigDecimal amount = equSpareApply.getAmount();
sparePartsLedger.setAmount(amount.subtract(applyNum));
sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger);
sparePartsLedgerMapper.updateAmount(sparePartsLedger);
}
return success("新增申领记录成功!");
}

@ -3,6 +3,9 @@ package com.op.device.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.device.mapper.SparePartsLedgerMapper;
@ -41,7 +44,6 @@ public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService {
@Override
@DS("#header.poolName")
public List<SparePartsLedger> selectSparePartsLedgerList(SparePartsLedger sparePartsLedger) {
sparePartsLedger.setStorageType("SP");
return sparePartsLedgerMapper.selectSparePartsLedgerList(sparePartsLedger);
}
@ -54,6 +56,9 @@ public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService {
@Override
@DS("#header.poolName")
public int insertSparePartsLedger(SparePartsLedger sparePartsLedger) {
sparePartsLedger.setStorageId(IdUtils.fastSimpleUUID());
sparePartsLedger.setGmtCreate(DateUtils.getNowDate());//创建时间
sparePartsLedger.setCreateBy(SecurityUtils.getUsername());
return sparePartsLedgerMapper.insertSparePartsLedger(sparePartsLedger);
}
@ -66,6 +71,8 @@ public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService {
@Override
@DS("#header.poolName")
public int updateSparePartsLedger(SparePartsLedger sparePartsLedger) {
sparePartsLedger.setLastModifiedBy(SecurityUtils.getUsername());//最后更新人
sparePartsLedger.setGmtModified(DateUtils.getNowDate());//最后更新时间
return sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger);
}

@ -9,9 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="storageType" column="storage_type" />
<result property="materialCode" column="material_code" />
<result property="materialDesc" column="material_desc" />
<result property="userDefined1" column="user_defined1" />
<result property="amount" column="amount" />
<result property="storageAmount" column="storage_amount" />
<result property="storageType" column="storage_type" />
<result property="spareUseLife" column="spare_use_life" />
<result property="spareName" column="spare_name" />
<result property="spareMode" column="spare_mode" />
@ -32,10 +32,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="factoryCode" column="factory_code" />
<result property="sapFactoryCode" column="sap_factory_code" />
<result property="delFlag" column="del_flag" />
<!--附属表-->
<result property="id" column="id" />
<result property="primaryCode" column="primary_code" />
<result property="ownEquipmentName" column="own_equipment_name" />
<result property="unitQuantity" column="unit_quantity" />
<result property="safeStock" column="safe_stock" />
@ -47,24 +43,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inputRecords" column="input_records" />
<result property="endInventory" column="end_inventory" />
<result property="endMoney" column="end_money" />
<result property="createBy" column="create_by" />
<result property="factoryCode" column="factory_code" />
<result property="substituteParts" column="substitute_parts" />
<result property="ownEquipmentCode" column="own_equipment_code" />
</resultMap>
<sql id="selectSparePartsLedgerVo">
select
select
storage_id,
storage_type,
material_code,
material_desc,
amount,
storage_amount,
sap_factory_code,
wl_name,
del_flag,
user_defined1,
spare_use_life,
spare_name,
spare_mode,
@ -82,103 +73,74 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
last_modified_by,
gmt_modified,
active_flag,
factory_code
from wms_ods_mate_storage_news
factory_code,
sap_factory_code,
del_flag,
own_equipment_name,
unit_quantity,
safe_stock,
unit_price,
procurement_method,
procurement_cycle,
opening_balance,
output_records,
input_records,
end_inventory,
end_money,
substitute_parts,
own_equipment_code
from equ_spareparts_ledger
</sql>
<select id="selectSparePartsLedgerList" parameterType="SparePartsLedger" resultMap="SparePartsLedgerResult">
select
womsn.storage_id,
womsn.storage_type,
womsn.material_code,
womsn.material_desc,
womsn.amount,
womsn.storage_amount,
womsn.sap_factory_code,
womsn.wl_name,
womsn.del_flag,
womsn.spare_use_life,
womsn.spare_name,
womsn.spare_mode,
womsn.spare_manufacturer,
womsn.spare_supplier,
womsn.spare_replacement_cycle,
womsn.spare_measurement_unit,
womsn.spare_conversion_unit,
womsn.spare_conversion_ratio,
womsn.spare_inventory_floor,
womsn.spare_inventory_upper,
womsn.spare_type,
womsn.create_by,
womsn.gmt_create,
womsn.last_modified_by,
womsn.gmt_modified,
womsn.active_flag,
womsn.factory_code,
womsna.id,
womsna.primary_code,
womsna.own_equipment_name,
womsna.unit_quantity,
womsna.safe_stock,
womsna.unit_price,
womsna.procurement_method,
womsna.procurement_cycle,
womsna.opening_balance,
womsna.output_records,
womsna.input_records,
womsna.end_inventory,
womsna.end_money,
womsna.substitute_parts,
womsna.own_equipment_code
from wms_ods_mate_storage_news womsn
left join wms_ods_mate_storage_news_attached womsna on womsn.material_code = womsna.primary_code
<include refid="selectSparePartsLedgerVo"/>
<where>
<if test="storageId != null and storageId != ''"> and womsn.storage_id = #{storageId}</if>
<if test="whCode != null and whCode != ''"> and womsn.wh_code = #{whCode}</if>
<if test="regionCode != null and regionCode != ''"> and womsn.region_code = #{regionCode}</if>
<if test="waCode != null and waCode != ''"> and womsn.wa_code = #{waCode}</if>
<if test="storageType != null and storageType != ''"> and womsn.storage_type = #{storageType}</if>
<if test="wlCode != null and wlCode != ''"> and womsn.wl_code = #{wlCode}</if>
<if test="materialCode != null and materialCode != ''"> and womsn.material_code like concat('%', #{materialCode}, '%')</if>
<if test="materialDesc != null and materialDesc != ''"> and womsn.material_desc like concat('%', #{materialDesc}, '%')</if>
<if test="amount != null "> and womsn.amount = #{amount}</if>
<if test="storageAmount != null "> and womsn.storage_amount = #{storageAmount}</if>
<if test="occupyAmount != null "> and womsn.occupy_amount = #{occupyAmount}</if>
<if test="lpn != null and lpn != ''"> and womsn.lpn = #{lpn}</if>
<if test="productBatch != null and productBatch != ''"> and womsn.product_batch = #{productBatch}</if>
<if test="receiveDate != null "> and womsn.receive_date = #{receiveDate}</if>
<if test="productDate != null "> and womsn.product_date = #{productDate}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and womsn.user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and womsn.user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and womsn.user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and womsn.user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and womsn.user_defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''"> and womsn.user_defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''"> and womsn.user_defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''"> and womsn.user_defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''"> and womsn.user_defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''"> and womsn.user_defined10 = #{userDefined10}</if>
<if test="gmtCreate != null "> and womsn.gmt_create = #{gmtCreate}</if>
<if test="lastModifiedBy != null and lastModifiedBy != ''"> and womsn.last_modified_by = #{lastModifiedBy}</if>
<if test="gmtModified != null "> and womsn.gmt_modified = #{gmtModified}</if>
<if test="activeFlag != null and activeFlag != ''"> and womsn.active_flag = #{activeFlag}</if>
<if test="factoryCode != null and factoryCode != ''"> and womsn.factory_code = #{factoryCode}</if>
<if test="sapFactoryCode != null and sapFactoryCode != ''"> and womsn.sap_factory_code = #{sapFactoryCode}</if>
<if test="wlName != null and wlName != ''"> and womsn.wl_name like concat('%', #{wlName}, '%')</if>
<if test="spareUseLife != null and spareUseLife != ''"> and womsn.spare_use_life = #{spareUseLife}</if>
<if test="spareName != null and spareName != ''"> and womsn.spare_name like concat('%', #{spareName}, '%')</if>
<if test="spareMode != null and spareMode != ''"> and womsn.spare_mode like concat('%', #{spareMode}, '%')</if>
<if test="spareManufacturer != null and spareManufacturer != ''"> and womsn.spare_manufacturer = #{spareManufacturer}</if>
<if test="spareSupplier != null and spareSupplier != ''"> and womsn.spare_supplier like concat('%', #{spareSupplier}, '%')</if>
<if test="spareReplacementCycle != null and spareReplacementCycle != ''"> and womsn.spare_replacement_cycle = #{spareReplacementCycle}</if>
<if test="spareMeasurementUnit != null and spareMeasurementUnit != ''"> and womsn.spare_measurement_unit = #{spareMeasurementUnit}</if>
<if test="spareConversionUnit != null and spareConversionUnit != ''"> and womsn.spare_conversion_unit = #{spareConversionUnit}</if>
<if test="spareConversionRatio != null and spareConversionRatio != ''"> and womsn.spare_conversion_ratio = #{spareConversionRatio}</if>
<if test="spareInventoryFloor != null and spareInventoryFloor != ''"> and womsn.spare_inventory_floor = #{spareInventoryFloor}</if>
<if test="spareInventoryUpper != null and spareInventoryUpper != ''"> and womsn.spare_inventory_upper = #{spareInventoryUpper}</if>
<if test="spareType != null and spareType != ''"> and womsn.spare_type = #{spareType}</if>
<if test="ownEquipmentName != null and ownEquipmentName != ''"> and womsna.own_equipment_name like concat('%', #{ownEquipmentName}, '%')</if>
and womsn.del_flag = '0'
<if test="storageId != null and storageId != ''"> and storage_id = #{storageId}</if>
<if test="whCode != null and whCode != ''"> and wh_code = #{whCode}</if>
<if test="regionCode != null and regionCode != ''"> and region_code = #{regionCode}</if>
<if test="waCode != null and waCode != ''"> and wa_code = #{waCode}</if>
<if test="storageType != null and storageType != ''"> and storage_type = #{storageType}</if>
<if test="wlCode != null and wlCode != ''"> and wl_code = #{wlCode}</if>
<if test="materialCode != null and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
<if test="materialDesc != null and materialDesc != ''"> and material_desc like concat('%', #{materialDesc}, '%')</if>
<if test="amount != null "> and amount = #{amount}</if>
<if test="storageAmount != null "> and storage_amount = #{storageAmount}</if>
<if test="occupyAmount != null "> and occupy_amount = #{occupyAmount}</if>
<if test="lpn != null and lpn != ''"> and lpn = #{lpn}</if>
<if test="productBatch != null and productBatch != ''"> and product_batch = #{productBatch}</if>
<if test="receiveDate != null "> and receive_date = #{receiveDate}</if>
<if test="productDate != null "> and product_date = #{productDate}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and user_defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''"> and user_defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''"> and user_defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''"> and user_defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''"> and user_defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''"> and user_defined10 = #{userDefined10}</if>
<if test="gmtCreate != null "> and gmt_create = #{gmtCreate}</if>
<if test="lastModifiedBy != null and lastModifiedBy != ''"> and last_modified_by = #{lastModifiedBy}</if>
<if test="gmtModified != null "> and gmt_modified = #{gmtModified}</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="sapFactoryCode != null and sapFactoryCode != ''"> and sap_factory_code = #{sapFactoryCode}</if>
<if test="wlName != null and wlName != ''"> and wl_name like concat('%', #{wlName}, '%')</if>
<if test="spareUseLife != null and spareUseLife != ''"> and spare_use_life = #{spareUseLife}</if>
<if test="spareName != null and spareName != ''"> and spare_name like concat('%', #{spareName}, '%')</if>
<if test="spareMode != null and spareMode != ''"> and spare_mode like concat('%', #{spareMode}, '%')</if>
<if test="spareManufacturer != null and spareManufacturer != ''"> and spare_manufacturer = #{spareManufacturer}</if>
<if test="spareSupplier != null and spareSupplier != ''"> and spare_supplier like concat('%', #{spareSupplier}, '%')</if>
<if test="spareReplacementCycle != null and spareReplacementCycle != ''"> and spare_replacement_cycle = #{spareReplacementCycle}</if>
<if test="spareMeasurementUnit != null and spareMeasurementUnit != ''"> and spare_measurement_unit = #{spareMeasurementUnit}</if>
<if test="spareConversionUnit != null and spareConversionUnit != ''"> and spare_conversion_unit = #{spareConversionUnit}</if>
<if test="spareConversionRatio != null and spareConversionRatio != ''"> and spare_conversion_ratio = #{spareConversionRatio}</if>
<if test="spareInventoryFloor != null and spareInventoryFloor != ''"> and spare_inventory_floor = #{spareInventoryFloor}</if>
<if test="spareInventoryUpper != null and spareInventoryUpper != ''"> and spare_inventory_upper = #{spareInventoryUpper}</if>
<if test="spareType != null and spareType != ''"> and spare_type = #{spareType}</if>
<if test="ownEquipmentName != null and ownEquipmentName != ''"> and own_equipment_name like concat('%', #{ownEquipmentName}, '%')</if>
and del_flag = '0'
</where>
</select>
@ -186,15 +148,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectSparePartsLedgerVo"/>
where storage_id = #{storageId}
and del_flag = '0'
and storage_tpye = 'SP'
</select>
<select id="selectRealAmountByMaterialCode" resultType="com.op.device.domain.EquPlanEquSpare">
select amount AS 'amount',storage_amount AS 'storageAmount' from wms_ods_mate_storage_news where material_code = #{materialCode}
select amount AS 'amount',storage_amount AS 'storageAmount' from equ_spareparts_ledger where material_code = #{materialCode}
</select>
<insert id="insertSparePartsLedger" parameterType="SparePartsLedger">
insert into wms_ods_mate_storage_news
insert into equ_spareparts_ledger
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="storageId != null and storageId != ''">storage_id,</if>
<if test="whCode != null">wh_code,</if>
@ -204,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wlCode != null">wl_code,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialDesc != null">material_desc,</if>
<if test="amount != null">amount,</if>
amount,
<if test="storageAmount != null">storage_amount,</if>
<if test="occupyAmount != null">occupy_amount,</if>
<if test="lpn != null">lpn,</if>
@ -242,6 +203,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spareInventoryFloor != null">spare_inventory_floor,</if>
<if test="spareInventoryUpper != null">spare_inventory_upper,</if>
<if test="spareType != null">spare_type,</if>
<if test="ownEquipmentName != null">own_equipment_name,</if>
<if test="unitQuantity != null">unit_quantity,</if>
<if test="safeStock != null">safe_stock,</if>
unit_price,
<if test="procurementMethod != null">procurement_method,</if>
<if test="procurementCycle != null">procurement_cycle,</if>
<if test="openingBalance != null">opening_balance,</if>
<if test="outputRecords != null">output_records,</if>
<if test="inputRecords != null">input_records,</if>
<if test="endInventory != null">end_inventory,</if>
end_money,
<if test="substituteParts != null">substitute_parts,</if>
<if test="ownEquipmentCode != null">own_equipment_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="storageId != null and storageId != ''">#{storageId},</if>
@ -252,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wlCode != null">#{wlCode},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialDesc != null">#{materialDesc},</if>
<if test="amount != null">#{amount},</if>
#{amount},
<if test="storageAmount != null">#{storageAmount},</if>
<if test="occupyAmount != null">#{occupyAmount},</if>
<if test="lpn != null">#{lpn},</if>
@ -290,11 +264,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spareInventoryFloor != null">#{spareInventoryFloor},</if>
<if test="spareInventoryUpper != null">#{spareInventoryUpper},</if>
<if test="spareType != null">#{spareType},</if>
<if test="ownEquipmentName != null">#{ownEquipmentName},</if>
<if test="unitQuantity != null">#{unitQuantity},</if>
<if test="safeStock != null">#{safeStock},</if>
#{unitPrice},
<if test="procurementMethod != null">#{procurementMethod},</if>
<if test="procurementCycle != null">#{procurementCycle},</if>
<if test="openingBalance != null">#{openingBalance},</if>
<if test="outputRecords != null">#{outputRecords},</if>
<if test="inputRecords != null">#{inputRecords},</if>
<if test="endInventory != null">#{endInventory},</if>
#{endMoney},
<if test="substituteParts != null">#{substituteParts},</if>
<if test="ownEquipmentCode != null">#{ownEquipmentCode},</if>
</trim>
</insert>
<update id="updateSparePartsLedger" parameterType="SparePartsLedger">
update wms_ods_mate_storage_news
update equ_spareparts_ledger
<trim prefix="SET" suffixOverrides=",">
<if test="whCode != null">wh_code = #{whCode},</if>
<if test="regionCode != null">region_code = #{regionCode},</if>
@ -303,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="wlCode != null">wl_code = #{wlCode},</if>
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialDesc != null">material_desc = #{materialDesc},</if>
<if test="amount != null">amount = #{amount},</if>
amount = #{amount},
<if test="storageAmount != null">storage_amount = #{storageAmount},</if>
<if test="occupyAmount != null">occupy_amount = #{occupyAmount},</if>
<if test="lpn != null">lpn = #{lpn},</if>
@ -341,28 +328,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spareInventoryFloor != null">spare_inventory_floor = #{spareInventoryFloor},</if>
<if test="spareInventoryUpper != null">spare_inventory_upper = #{spareInventoryUpper},</if>
<if test="spareType != null">spare_type = #{spareType},</if>
<if test="ownEquipmentName != null">own_equipment_name = #{ownEquipmentName},</if>
<if test="unitQuantity != null">unit_quantity = #{unitQuantity},</if>
<if test="safeStock != null">safe_stock = #{safeStock},</if>
unit_price = #{unitPrice},
<if test="procurementMethod != null">procurement_method = #{procurementMethod},</if>
<if test="procurementCycle != null">procurement_cycle = #{procurementCycle},</if>
<if test="openingBalance != null">opening_balance = #{openingBalance},</if>
<if test="outputRecords != null">output_records = #{outputRecords},</if>
<if test="inputRecords != null">input_records = #{inputRecords},</if>
<if test="endInventory != null">end_inventory = #{endInventory},</if>
end_money = #{endMoney},
<if test="substituteParts != null">substitute_parts = #{substituteParts},</if>
<if test="ownEquipmentCode != null">own_equipment_code = #{ownEquipmentCode},</if>
</trim>
where storage_id = #{storageId}
</update>
<update id="updateAmount" parameterType="SparePartsLedger">
update equ_spareparts_ledger
set amount = #{amount}
where storage_id = #{storageId}
</update>
<update id="updateSpareNumReduce">
update wms_ods_mate_storage_news
update equ_spareparts_ledger
set amount = ( amount - #{spareQuantity} ) where material_code = #{spareCode}
</update>
<update id="updateSpareNumAdd">
update wms_ods_mate_storage_news
update equ_spareparts_ledger
set amount = ( amount + #{spareQuantity} ) where material_code = #{spareCode}
</update>
<delete id="deleteSparePartsLedgerByStorageId" parameterType="String">
delete from wms_ods_mate_storage_news where storage_id = #{storageId}
</delete>
<update id="deleteSparePartsLedgerByStorageId" parameterType="String">
update equ_spareparts_ledger
set del_flag = '1'
where storage_id = #{storageId}
</update>
<delete id="deleteSparePartsLedgerByStorageIds" parameterType="String">
delete from wms_ods_mate_storage_news where storage_id in
<update id="deleteSparePartsLedgerByStorageIds" parameterType="String">
update equ_spareparts_ledger
set del_flag = '1'
where storage_id in
<foreach item="storageId" collection="array" open="(" separator="," close=")">
#{storageId}
</foreach>
</delete>
</update>
</mapper>

@ -22,9 +22,9 @@ import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.datasource.creator.DynamicDatasourceCreator;
import com.op.mes.domain.*;
import com.op.mes.domain.dto.LineChartDto;
import com.op.mes.domain.dto.LineChartSeriesDto;
import com.op.mes.domain.dto.SysFactoryDto;
import com.op.mes.domain.vo.DynamicColumnVo;
import com.op.mes.domain.vo.MesDailyReportVo;
import com.op.system.api.domain.DataSourcePropertyDTO;
import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.device.EquEquipmentDTO;
@ -228,15 +228,21 @@ public class MesReportWorkController extends BaseController {
@RequiresPermissions("mes:dailyReport:list")
@GetMapping("/getDailyReport")
public TableDataInfo getDailyReport(MesDailyReport mesDailyReport) {
if(!StringUtils.isNotBlank(mesDailyReport.getWorkCenter())){
return null;
}
startPage();
List<MesDailyReport> list = mesReportWorkService.getDailyReport(mesDailyReport);
return getDataTable(list);
}
@RequiresPermissions("mes:dailyReport:list")
@GetMapping("/getDailyReportNew")
public TableDataInfo getDailyReportNew(MesDailyReportVo mesDailyReportVo) {
startPage();
List<MesDailyReportVo> list = mesReportWorkService.getDailyReportNew(mesDailyReportVo);
return getDataTable(list);
}
@RequiresPermissions("mes:dailyReport:list")
@PostMapping("/getDailyReportExport")
public void getDailyReportExport(HttpServletResponse response,MesDailyReport mesDailyReport) {
@ -246,6 +252,18 @@ public class MesReportWorkController extends BaseController {
ExcelUtilDailyReport<MesDailyReport> util = new ExcelUtilDailyReport<MesDailyReport>(MesDailyReport.class);
util.exportExcel(response, list, ymd+"生产日报表",titleName);
}
@RequiresPermissions("mes:dailyReportNew:export")
@PostMapping("/getDailyReportNewExport")
public void getDailyReportNewExport(HttpServletResponse response,MesDailyReportVo mesDailyReportVo) {
List<MesDailyReportVo> list = mesReportWorkService.getDailyReportNew(mesDailyReportVo);
String start = mesDailyReportVo.getProductDateStart();
String end = mesDailyReportVo.getProductDateEnd();
ExcelUtil<MesDailyReportVo> util = new ExcelUtil<>(MesDailyReportVo.class);
util.exportExcel(response, list, start+"至"+end+"生产日报表");
}
@GetMapping("/getWorkcenterList")
public List<SysFactoryDto> getWorkcenterList(MesDailyReport mesDailyReport) {

@ -0,0 +1,51 @@
package com.op.mes.domain.dto;
import java.math.BigDecimal;
public class QuantityDto {
private Long quantityFeedbackSum;
private BigDecimal workTime;
private Long useMan;
private String workorderCode;
private String machineCode;
public Long getQuantityFeedbackSum() {
return quantityFeedbackSum;
}
public void setQuantityFeedbackSum(Long quantityFeedbackSum) {
this.quantityFeedbackSum = quantityFeedbackSum;
}
public BigDecimal getWorkTime() {
return workTime;
}
public void setWorkTime(BigDecimal workTime) {
this.workTime = workTime;
}
public Long getUseMan() {
return useMan;
}
public void setUseMan(Long useMan) {
this.useMan = useMan;
}
public String getWorkorderCode() {
return workorderCode;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public String getMachineCode() {
return machineCode;
}
public void setMachineCode(String machineCode) {
this.machineCode = machineCode;
}
}

@ -0,0 +1,443 @@
package com.op.mes.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.Date;
public class MesDailyReportVo extends BaseEntity {
private static final long serialVersionUID = 1L;
// 车间
@Excel(name = "车间编码")
private String workshopCode;
@Excel(name = "车间编码")
private String workshopName;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "日期")
private Date productDate;//工单日期
// sap
@Excel(name = "产线编码")
private String sapCode;
@Excel(name = "产线名称")
private String sapName;
// 设备编码
private String equipmentCode;
@Excel(name = "组别")
private String equipmentName;
// 工时
private BigDecimal unitWorkingHours;
private String workorderCodeSap;
@Excel(name = "产品编码")
private String productCode;//产品编码
@Excel(name = "产品名称")
private String productName;//产品名称
//组别
private String teamCode;
private String teamDesc;
@Excel(name = "品类")
private String prodType;//分类
@Excel(name = "组长")
private String teamLeaderName;//组长
//计划产量
// 标准用人
@Excel(name = "标准用人")
private Long useMan;
// 标准效率
@Excel(name = "产线标准效率")
private BigDecimal efficiency;
@Excel(name = "工单号")
private String workorderCode;
private String workorderName;
private String quantity;//计划产量(箱)
@Excel(name = "规格")
private Long spec;//规格
@Excel(name = "单位")
private String unit;
@Excel(name = "计划产量")
private Long quantitySplit;
@Excel(name = "实际产量")
private String quantityFeedback;//实际产量(箱)
@Excel(name = "产量")
private String quantityAct;// 产量(盒)
@Excel(name = "产线标准效率")
private String completeRate;// 订单完成率
@Excel(name = "实际用人")
private String manStandard;//实际用人
@Excel(name = "标准工时")
private String workTimeStandard;//工时-标准
@Excel(name = "实际工时")
private BigDecimal workTime;//工时-实际
@Excel(name = "产线效率")
private String productivity;//工时-产线效率
@Excel(name = "总工时")
private String totalWorkTime;
@Excel(name = "标准人均效率")
private String manAvgStandard;//人均效率-标准
@Excel(name = "实际人均效率")
private String manAvgActual;//人均效率-实际
@Excel(name = "人均效率达成率")
private String manAvgDo;//人均效率-达成
private String actManHour;//实际人工时
private String productDateStart;//工单日期开始
private String productDateEnd;//工单日期结束
private String productStartDate;
private String productEndDate;
private String workCenter;
private String equipmentTypeCode;
private String machineCode;
@Excel(name = "工厂编码")
private String factoryCode;
public String getProductDateStart() {
return productDateStart;
}
public void setProductDateStart(String productDateStart) {
this.productDateStart = productDateStart;
}
public String getProductDateEnd() {
return productDateEnd;
}
public void setProductDateEnd(String productDateEnd) {
this.productDateEnd = productDateEnd;
}
public String getQuantityAct() {
return quantityAct;
}
public void setQuantityAct(String quantityAct) {
this.quantityAct = quantityAct;
}
public String getCompleteRate() {
return completeRate;
}
public void setCompleteRate(String completeRate) {
this.completeRate = completeRate;
}
public String getProductivity() {
return productivity;
}
public void setProductivity(String productivity) {
this.productivity = productivity;
}
public String getManAvgActual() {
return manAvgActual;
}
public void setManAvgActual(String manAvgActual) {
this.manAvgActual = manAvgActual;
}
public String getManAvgDo() {
return manAvgDo;
}
public void setManAvgDo(String manAvgDo) {
this.manAvgDo = manAvgDo;
}
public String getActManHour() {
return actManHour;
}
public void setActManHour(String actManHour) {
this.actManHour = actManHour;
}
public String getProductStartDate() {
return productStartDate;
}
public void setProductStartDate(String productStartDate) {
this.productStartDate = productStartDate;
}
public String getProductEndDate() {
return productEndDate;
}
public void setProductEndDate(String productEndDate) {
this.productEndDate = productEndDate;
}
public String getTeamCode() {
return teamCode;
}
public void setTeamCode(String teamCode) {
this.teamCode = teamCode;
}
public String getTeamDesc() {
return teamDesc;
}
public void setTeamDesc(String teamDesc) {
this.teamDesc = teamDesc;
}
public String getProdType() {
return prodType;
}
public void setProdType(String prodType) {
this.prodType = prodType;
}
public String getTeamLeaderName() {
return teamLeaderName;
}
public void setTeamLeaderName(String teamLeaderName) {
this.teamLeaderName = teamLeaderName;
}
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public Long getSpec() {
return spec;
}
public void setSpec(Long spec) {
this.spec = spec;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getQuantity() {
return quantity;
}
public void setQuantity(String quantity) {
this.quantity = quantity;
}
public String getQuantityFeedback() {
return quantityFeedback;
}
public void setQuantityFeedback(String quantityFeedback) {
this.quantityFeedback = quantityFeedback;
}
public BigDecimal getWorkTime() {
return workTime;
}
public void setWorkTime(BigDecimal workTime) {
this.workTime = workTime;
}
public String getManStandard() {
return manStandard;
}
public void setManStandard(String manStandard) {
this.manStandard = manStandard;
}
public String getWorkTimeStandard() {
return workTimeStandard;
}
public void setWorkTimeStandard(String workTimeStandard) {
this.workTimeStandard = workTimeStandard;
}
public String getManAvgStandard() {
return manAvgStandard;
}
public void setManAvgStandard(String manAvgStandard) {
this.manAvgStandard = manAvgStandard;
}
public Date getProductDate() {
return productDate;
}
public void setProductDate(Date productDate) {
this.productDate = productDate;
}
public String getWorkCenter() {
return workCenter;
}
public void setWorkCenter(String workCenter) {
this.workCenter = workCenter;
}
public String getEquipmentTypeCode() {
return equipmentTypeCode;
}
public void setEquipmentTypeCode(String equipmentTypeCode) {
this.equipmentTypeCode = equipmentTypeCode;
}
public String getWorkshopCode() {
return workshopCode;
}
public void setWorkshopCode(String workshopCode) {
this.workshopCode = workshopCode;
}
public String getWorkshopName() {
return workshopName;
}
public void setWorkshopName(String workshopName) {
this.workshopName = workshopName;
}
public String getSapCode() {
return sapCode;
}
public void setSapCode(String sapCode) {
this.sapCode = sapCode;
}
public String getSapName() {
return sapName;
}
public void setSapName(String sapName) {
this.sapName = sapName;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public BigDecimal getUnitWorkingHours() {
return unitWorkingHours;
}
public void setUnitWorkingHours(BigDecimal unitWorkingHours) {
this.unitWorkingHours = unitWorkingHours;
}
public String getWorkorderCodeSap() {
return workorderCodeSap;
}
public void setWorkorderCodeSap(String workorderCodeSap) {
this.workorderCodeSap = workorderCodeSap;
}
public Long getQuantitySplit() {
return quantitySplit;
}
public void setQuantitySplit(Long quantitySplit) {
this.quantitySplit = quantitySplit;
}
public Long getUseMan() {
return useMan;
}
public void setUseMan(Long useMan) {
this.useMan = useMan;
}
public BigDecimal getEfficiency() {
return efficiency;
}
public void setEfficiency(BigDecimal efficiency) {
this.efficiency = efficiency;
}
public String getWorkorderCode() {
return workorderCode;
}
public void setWorkorderCode(String workorderCode) {
this.workorderCode = workorderCode;
}
public String getWorkorderName() {
return workorderName;
}
public void setWorkorderName(String workorderName) {
this.workorderName = workorderName;
}
public String getMachineCode() {
return machineCode;
}
public void setMachineCode(String machineCode) {
this.machineCode = machineCode;
}
public String getTotalWorkTime() {
return totalWorkTime;
}
public void setTotalWorkTime(String totalWorkTime) {
this.totalWorkTime = totalWorkTime;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
}

@ -6,7 +6,9 @@ import java.util.Map;
import com.op.mes.domain.*;
import com.op.mes.domain.dto.LineChartSeriesDto;
import com.op.mes.domain.dto.QuantityDto;
import com.op.mes.domain.dto.SysFactoryDto;
import com.op.mes.domain.vo.MesDailyReportVo;
import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.device.EquEquipmentDTO;
import com.op.system.api.domain.mes.ProOrderWorkorderDTO;
@ -82,6 +84,8 @@ public interface MesReportWorkMapper {
String getTitleName(MesDailyReport mesDailyReport);
String getTitleNewName(MesDailyReportVo mesDailyReportVo);
List<SysFactoryDto> getWorkcenterList(MesDailyReport mesDailyReport);
public void updateOrderWorkStatus(MesReportWork work);
@ -170,4 +174,10 @@ public interface MesReportWorkMapper {
void updatePreReportAttr1(MesReportWork workOrder);
MesReportWork getReportWorkHzAttr1(MesReportWork mesReportWork);
List<MesDailyReportVo> getDailyReportUp(MesDailyReportVo mesDailyReportVo);
QuantityDto getRealQuantity(QuantityDto quantityDto);
List<QuantityDto> getSumQuantity(QuantityDto quantityDto);
}

@ -11,6 +11,7 @@ import com.op.mes.domain.dto.LineChartDto;
import com.op.mes.domain.dto.LineChartSeriesDto;
import com.op.mes.domain.dto.SysFactoryDto;
import com.op.mes.domain.vo.DynamicColumnVo;
import com.op.mes.domain.vo.MesDailyReportVo;
import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.device.EquEquipmentDTO;
import com.op.system.api.domain.dto.MesPrepareDetailDTO;
@ -78,6 +79,7 @@ public interface IMesReportWorkService {
public List<MesDailyReport> getDailyReport(MesDailyReport mesDailyReport);
String getTitleName(MesDailyReport mesDailyReport);
String getTitleNewName(MesDailyReportVo mesDailyReportVo);
List<SysFactoryDto> getWorkcenterList(MesDailyReport mesDailyReport);
@ -131,4 +133,6 @@ public interface IMesReportWorkService {
int deleteReportNow(String reportCode);
R preReportRow(MesReportWork mesReportWork);
List<MesDailyReportVo> getDailyReportNew(MesDailyReportVo mesDailyReportVo);
}

@ -20,8 +20,10 @@ import com.op.common.security.utils.SecurityUtils;
import com.op.mes.domain.*;
import com.op.mes.domain.dto.LineChartDto;
import com.op.mes.domain.dto.LineChartSeriesDto;
import com.op.mes.domain.dto.QuantityDto;
import com.op.mes.domain.dto.SysFactoryDto;
import com.op.mes.domain.vo.DynamicColumnVo;
import com.op.mes.domain.vo.MesDailyReportVo;
import com.op.mes.service.IWCSInterfaceService;
import com.op.system.api.RemoteSapService;
import com.op.system.api.domain.SysUser;
@ -37,6 +39,10 @@ import org.springframework.stereotype.Service;
import com.op.mes.mapper.MesReportWorkMapper;
import com.op.mes.service.IMesReportWorkService;
import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* Service
@ -399,12 +405,100 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
return dtos;
}
@Override
@DS("#header.poolName")
public List<MesDailyReportVo> getDailyReportNew(MesDailyReportVo mesDailyReportVo){
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
List<MesDailyReportVo> dtos = mesReportWorkMapper.getDailyReportUp(mesDailyReportVo);
for (MesDailyReportVo dto : dtos) {
dto.setFactoryCode(factoryCode);
dto.setProdType("蚊香");
QuantityDto quantityDto = new QuantityDto();
String workorderCode = dto.getWorkorderCode();
String machineCode = dto.getEquipmentCode();
quantityDto.setWorkorderCode(workorderCode);
quantityDto.setMachineCode(machineCode);
QuantityDto realQuantity = mesReportWorkMapper.getRealQuantity(quantityDto);
List<QuantityDto> sumQuantityList = mesReportWorkMapper.getSumQuantity(quantityDto);
QuantityDto sumQuantity = sumQuantityList.stream().max(Comparator.comparingLong(QuantityDto::getUseMan)).orElse(null);
// 产量
Long sumQua = 0L;
// 实际产量
Long realQua = 0L;
// 实际工时
BigDecimal workTime = BigDecimal.ZERO;
// 实际用人
Long useMan = 0L;
if (realQuantity != null && sumQuantity != null) {
sumQua = sumQuantity.getQuantityFeedbackSum();
realQua = realQuantity.getQuantityFeedbackSum();
workTime = sumQuantity.getWorkTime();
useMan = sumQuantity.getUseMan();
dto.setQuantityAct(String.valueOf(sumQua));
dto.setQuantityFeedback(String.valueOf(realQua));
dto.setWorkTime(workTime);
dto.setManStandard(useMan.toString());
// 计算规格
dto.setSpec(sumQua / realQua);
// 订单完成率 实际产量/计划产量
BigDecimal completeRate = new BigDecimal(realQua)
.multiply(new BigDecimal("100.00"))
.divide(new BigDecimal(dto.getQuantitySplit()),2,BigDecimal.ROUND_HALF_UP);
dto.setCompleteRate(completeRate.toString()+"%");
// 标准工时 产量/产线标准效率
BigDecimal workTimeStandard = new BigDecimal(sumQua)
.divide(dto.getEfficiency(),1,BigDecimal.ROUND_HALF_UP);
dto.setWorkTimeStandard(workTimeStandard.toString());
// 产线效率 标准工时/实际工时
BigDecimal productivity = workTimeStandard
.multiply(new BigDecimal("100.00"))
.divide(workTime,2,BigDecimal.ROUND_HALF_UP);
dto.setProductivity(productivity.toString()+"%");
// 总工时 实际用人*实际工时
BigDecimal totalWorkTime = new BigDecimal(useMan)
.multiply(workTime);
dto.setTotalWorkTime(totalWorkTime.toString());
// 标准人均效率 实际产量/标准用人/标准工时
BigDecimal manAvgStandard = new BigDecimal(realQua)
.divide(new BigDecimal(dto.getUseMan()),2,BigDecimal.ROUND_HALF_UP)
.divide(workTimeStandard,2,BigDecimal.ROUND_HALF_UP);
dto.setManAvgStandard(manAvgStandard.toString());
// 实际人均效率 实际产量/总工时
BigDecimal manAvgActual = new BigDecimal(realQua)
.divide(totalWorkTime,2,BigDecimal.ROUND_HALF_UP);
dto.setManAvgActual(manAvgActual.toString());
// 人均效率达成率 标准人均效率/实际人均效率
BigDecimal manAvgDo = manAvgStandard
.multiply(new BigDecimal("100.00"))
.divide(manAvgActual,2,BigDecimal.ROUND_HALF_UP);
dto.setManAvgDo(manAvgDo.toString()+"%");
}
}
return dtos;
}
@Override
@DS("#header.poolName")
public String getTitleName(MesDailyReport mesDailyReport) {
return mesReportWorkMapper.getTitleName(mesDailyReport);
}
@Override
@DS("#header.poolName")
public String getTitleNewName(MesDailyReportVo mesDailyReportVo) {
return mesReportWorkMapper.getTitleNewName(mesDailyReportVo);
}
@Override
@DS("#header.poolName")
public List<SysFactoryDto> getWorkcenterList(MesDailyReport mesDailyReport) {

@ -281,6 +281,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getTitleName" resultType="java.lang.String">
select factory_name from sys_factory where factory_code = #{workCenter}
</select>
<select id="getTitleNewName" resultType="java.lang.String">
select factory_name from sys_factory where factory_code = #{workCenter}
</select>
<select id="getWorkcenterList" resultType="com.op.mes.domain.dto.SysFactoryDto">
select factory_name factoryName,
factory_code factoryCode
@ -663,6 +666,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join base_equipment equ on equ.equipment_code = ow.workorder_name
where ow.del_flag='0' and equ.del_flag='0'
</select>
<select id="getDailyReportUp" resultType="com.op.mes.domain.vo.MesDailyReportVo">
select be.workshop_code workshopCode,
be.workshop_name workshopName,
pow.product_date productDate,
be.sap_code sapCode,
be.sap_name sapName,
be.equipment_code equipmentCode,
be.equipment_name equipmentName,
be.unit_working_hours unitWorkingHours,
pow.workorder_code_sap workorderCodeSap,
pow.product_code productCode,
pow.product_name productName,
pow.unit unit,
pow.quantity_split quantitySplit,
ml.use_man useMan,
ml.efficiency efficiency,
pow.workorder_code workorderCode,
pow.workorder_name workorderName
from base_equipment be
left join pro_order_workorder pow on be.equipment_code = pow.workorder_name
left join mes_line ml on be.equipment_code = ml.line_code
where be.del_flag = '0' and be.sap_code is not null and pow.status = 'w3'
and pow.parent_order = '0' and pow.del_flag='0' and ml.del_flag='0'
<if test="sapName != null and sapName != ''">and be.sap_name like concat('%', #{sapName}, '%')</if>
<if test="workCenter != null and workCenter != ''">and be.workshop_code = #{workCenter}</if>
<if test="equipmentTypeCode != null and equipmentTypeCode != ''">and be.equipment_type_code = #{equipmentTypeCode}</if>
<if test="productDateStart != null and productDateStart != ''">
and CONVERT(varchar(10),pow.product_date, 23) > CONVERT(varchar(10), #{productDateStart}, 23)
</if>
<if test="productDateEnd != null and productDateEnd != ''">
and CONVERT(varchar(10), #{productDateEnd}, 23) > CONVERT(varchar(10),pow.product_date, 23)
</if>
order by be.equipment_code
</select>
<select id="getRealQuantity" resultType="com.op.mes.domain.dto.QuantityDto">
select sum(quantity_feedback) quantityFeedbackSum
from mes_report_work
where workorder_code = #{workorderCode} and del_flag = '0' and machine_code = #{machineCode}
</select>
<select id="getSumQuantity" resultType="com.op.mes.domain.dto.QuantityDto">
select
sum(quantity_feedback) quantityFeedbackSum,
sum(work_time) workTime,
use_man useMan
from mes_report_work
where parent_order = #{workorderCode} and del_flag = '0' and machine_code = #{machineCode}
group by use_man
</select>
<select id="selectMesReportWorkList_S" parameterType="MesReportWork" resultMap="MesReportWorkResult">
SELECT

@ -0,0 +1,360 @@
package com.op.quality.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* qc_market_feedback
*
* @author Open Platform
* @date 2024-03-19
*/
public class QcMarketFeedback extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* id
*/
private String recordId;
/**
*
*/
@Excel(name = "产品编码")
private String productCode;
/**
*
*/
@Excel(name = "产品名称")
private String productName;
/**
* ()
*/
@Excel(name = "市场不良类型(字典维护)")
private String marketType;
@Excel(name = "市场不良类型名称")
private String marketTypeName;
/**
*
*/
@Excel(name = "订单号")
private String orderCode;
/**
*
*/
@Excel(name = "批次号")
private String batchCode;
/**
* 线
*/
@Excel(name = "线体编码")
private String lineCode;
/**
* 线
*/
@Excel(name = "线体名称")
private String lineName;
/**
*
*/
@Excel(name = "车间编码")
private String carCode;
/**
*
*/
@Excel(name = "车间名称")
private String carName;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date productDate;
/**
*
*/
@Excel(name = "整改单编码")
private String rectificationCode;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "整改时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date rectificationTime;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String attr1;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String attr2;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String attr3;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String attr4;
/**
* $column.columnComment
*/
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String factoryCode;
/**
* $column.columnComment
*/
private String delFlag;
/**
* 1
*/
@Excel(name = "1导入0输入")
private String dataSource;
private String feedbackTimeStart;
private String feedbackTimeEnd;
public String getMarketTypeName() {
return marketTypeName;
}
public void setMarketTypeName(String marketTypeName) {
this.marketTypeName = marketTypeName;
}
public void setRecordId(String recordId) {
this.recordId = recordId;
}
public String getRecordId() {
return recordId;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductCode() {
return productCode;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getProductName() {
return productName;
}
public void setMarketType(String marketType) {
this.marketType = marketType;
}
public String getMarketType() {
return marketType;
}
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public String getOrderCode() {
return orderCode;
}
public void setBatchCode(String batchCode) {
this.batchCode = batchCode;
}
public String getBatchCode() {
return batchCode;
}
public void setLineCode(String lineCode) {
this.lineCode = lineCode;
}
public String getLineCode() {
return lineCode;
}
public void setLineName(String lineName) {
this.lineName = lineName;
}
public String getLineName() {
return lineName;
}
public void setCarCode(String carCode) {
this.carCode = carCode;
}
public String getCarCode() {
return carCode;
}
public void setCarName(String carName) {
this.carName = carName;
}
public String getCarName() {
return carName;
}
public void setProductDate(Date productDate) {
this.productDate = productDate;
}
public Date getProductDate() {
return productDate;
}
public void setRectificationCode(String rectificationCode) {
this.rectificationCode = rectificationCode;
}
public String getRectificationCode() {
return rectificationCode;
}
public void setRectificationTime(Date rectificationTime) {
this.rectificationTime = rectificationTime;
}
public Date getRectificationTime() {
return rectificationTime;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryCode() {
return factoryCode;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setDataSource(String dataSource) {
this.dataSource = dataSource;
}
public String getDataSource() {
return dataSource;
}
public String getFeedbackTimeStart() {
return feedbackTimeStart;
}
public void setFeedbackTimeStart(String feedbackTimeStart) {
this.feedbackTimeStart = feedbackTimeStart;
}
public String getFeedbackTimeEnd() {
return feedbackTimeEnd;
}
public void setFeedbackTimeEnd(String feedbackTimeEnd) {
this.feedbackTimeEnd = feedbackTimeEnd;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("recordId", getRecordId())
.append("productCode", getProductCode())
.append("productName", getProductName())
.append("marketType", getMarketType())
.append("orderCode", getOrderCode())
.append("batchCode", getBatchCode())
.append("lineCode", getLineCode())
.append("lineName", getLineName())
.append("carCode", getCarCode())
.append("carName", getCarName())
.append("productDate", getProductDate())
.append("rectificationCode", getRectificationCode())
.append("rectificationTime", getRectificationTime())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("factoryCode", getFactoryCode())
.append("delFlag", getDelFlag())
.append("dataSource", getDataSource())
.toString();
}
}
Loading…
Cancel
Save