Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
highway
wws 10 months ago
parent 41cd2fa5f8 cb8863b061
commit 6dd294ab7f
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

12
op-modules/op-device/src/main/java/com/op/device/domain/EquOrderDetail.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class EquOrderDetail extends BaseEntity {
/** 工厂 */ /** 工厂 */
@Excel(name = "工厂") @Excel(name = "工厂")
private String factroyCode; private String factoryCode;
/** 备用字段1 */ /** 备用字段1 */
@Excel(name = "备用字段1") @Excel(name = "备用字段1")
@ -143,12 +143,12 @@ public class EquOrderDetail extends BaseEntity {
public String getItemTypeName() { public String getItemTypeName() {
return itemTypeName; return itemTypeName;
} }
public void setFactroyCode(String factroyCode) { public void setFactoryCode(String factoryCode) {
this.factroyCode = factroyCode; this.factoryCode = factoryCode;
} }
public String getFactroyCode() { public String getFactoryCode() {
return factroyCode; return factoryCode;
} }
public void setAttr1(String attr1) { public void setAttr1(String attr1) {
this.attr1 = attr1; this.attr1 = attr1;
@ -191,7 +191,7 @@ public class EquOrderDetail extends BaseEntity {
.append("itemMethod", getItemMethod()) .append("itemMethod", getItemMethod())
.append("itemType", getItemType()) .append("itemType", getItemType())
.append("itemTypeName", getItemTypeName()) .append("itemTypeName", getItemTypeName())
.append("factroyCode", getFactroyCode()) .append("factoryCode", getFactoryCode())
.append("attr1", getAttr1()) .append("attr1", getAttr1())
.append("attr2", getAttr2()) .append("attr2", getAttr2())
.append("attr3", getAttr3()) .append("attr3", getAttr3())

10
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
Unescape Escape View File

@ -141,7 +141,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
order.setOrderCode(orderCode); order.setOrderCode(orderCode);
/**equ_order**/ /**equ_order**/
sce = equOrderMapper.insertEquOrder(order); sce = equOrderMapper.insertEquOrder(order);
System.out.println("========equ_order:"+sce); System.out.println(plan.getPlanCode()+"========equ_order:"+sce);
/**equ_plan_equ->equ_order_equ*************************************************************/ /**equ_plan_equ->equ_order_equ*************************************************************/
EquPlanEqu equPlanEqu = new EquPlanEqu(); EquPlanEqu equPlanEqu = new EquPlanEqu();
@ -160,7 +160,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
equ.setCode(orderCode); equ.setCode(orderCode);
} }
sce = equOrderEquMapper.insertEquOrderEqus(equs); sce = equOrderEquMapper.insertEquOrderEqus(equs);
System.out.println("========equ_order_equ:"+sce); System.out.println(plan.getPlanCode()+"========equ_order_equ:"+sce);
/**equ_plan_detail->equ_order_detail*******************************************************/ /**equ_plan_detail->equ_order_detail*******************************************************/
EquPlanDetail itqo = new EquPlanDetail(); EquPlanDetail itqo = new EquPlanDetail();
itqo.setParentCode(plan.getPlanEquId()); itqo.setParentCode(plan.getPlanEquId());
@ -195,13 +195,13 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
itme.setParentCode(orderEquId); itme.setParentCode(orderEquId);
} }
sce = equOrderDetailMapper.insertEquOrderDetails(details); sce = equOrderDetailMapper.insertEquOrderDetails(details);
System.out.println("========equ_order_detail:"+sce); System.out.println(plan.getPlanCode()+"========equ_order_detail:"+sce);
/**equ_plan_standard->equ_order_standard*******************************************************/ /**equ_plan_standard->equ_order_standard*******************************************************/
if(CollectionUtils.isEmpty(standards)){ if(CollectionUtils.isEmpty(standards)){
return 0; return 0;
} }
sce = equOrderStandardMapper.insertEquOrderStandards(standards); sce = equOrderStandardMapper.insertEquOrderStandards(standards);
System.out.println("========equ_order_detail:"+sce); System.out.println(plan.getPlanCode()+"========equ_order_detail:"+sce);
/**equ_plan_person->equ_order_standard*********************************************************/ /**equ_plan_person->equ_order_standard*********************************************************/
EquPlanPerson equPlanPerson = new EquPlanPerson(); EquPlanPerson equPlanPerson = new EquPlanPerson();
equPlanPerson.setPlanCode(plan.getPlanCode()); equPlanPerson.setPlanCode(plan.getPlanCode());
@ -218,7 +218,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
person.setPlanCode(orderCode); person.setPlanCode(orderCode);
} }
sce = equOrderPersonMapper.insertEquOrderPlans(persons); sce = equOrderPersonMapper.insertEquOrderPlans(persons);
System.out.println("========equ_order_standard:"+sce); System.out.println(plan.getPlanCode()+"========equ_order_standard:"+sce);
return sce; return sce;
} }
} }

2
op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java
Unescape Escape View File

@ -149,7 +149,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService {
equOrderDetail.setId(IdUtils.fastSimpleUUID()); equOrderDetail.setId(IdUtils.fastSimpleUUID());
equOrderDetail.setOrderCode(equOrder.getOrderCode()); equOrderDetail.setOrderCode(equOrder.getOrderCode());
equOrderDetail.setParentCode(equ.getId()); equOrderDetail.setParentCode(equ.getId());
equOrderDetail.setFactroyCode(factory); equOrderDetail.setFactoryCode(factory);
equOrderDetail.setStandardList(orderStandardList); equOrderDetail.setStandardList(orderStandardList);
equOrderDetail.setCreateBy(SecurityContextHolder.getUserName()); equOrderDetail.setCreateBy(SecurityContextHolder.getUserName());
equOrderDetail.setCreateTime(DateUtils.getNowDate()); equOrderDetail.setCreateTime(DateUtils.getNowDate());

16
op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml
Unescape Escape View File

@ -14,7 +14,7 @@
<result property="itemMethod" column="item_method" /> <result property="itemMethod" column="item_method" />
<result property="itemType" column="item_type" /> <result property="itemType" column="item_type" />
<result property="itemTypeName" column="item_type_name" /> <result property="itemTypeName" column="item_type_name" />
<result property="factroyCode" column="factroy_code" /> <result property="factoryCode" column="factory_code" />
<result property="attr1" column="attr1" /> <result property="attr1" column="attr1" />
<result property="attr2" column="attr2" /> <result property="attr2" column="attr2" />
<result property="attr3" column="attr3" /> <result property="attr3" column="attr3" />
@ -27,7 +27,7 @@
<sql id="selectEquOrderDetailVo"> <sql id="selectEquOrderDetailVo">
select id, code, order_code, parent_code, item_code, item_name, item_method, select id, code, order_code, parent_code, item_code, item_name, item_method,
item_type, item_type_name, factroy_code, attr1, attr2, attr3, del_flag, item_type, item_type_name, factory_code, attr1, attr2, attr3, del_flag,
create_by, create_time, update_by, update_time create_by, create_time, update_by, update_time
from equ_order_detail from equ_order_detail
</sql> </sql>
@ -43,7 +43,7 @@
<if test="itemMethod != null and itemMethod != ''"> and item_method = #{itemMethod}</if> <if test="itemMethod != null and itemMethod != ''"> and item_method = #{itemMethod}</if>
<if test="itemType != null and itemType != ''"> and item_type = #{itemType}</if> <if test="itemType != null and itemType != ''"> and item_type = #{itemType}</if>
<if test="itemTypeName != null and itemTypeName != ''"> and item_type_name like concat('%', #{itemTypeName}, '%')</if> <if test="itemTypeName != null and itemTypeName != ''"> and item_type_name like concat('%', #{itemTypeName}, '%')</if>
<if test="factroyCode != null and factroyCode != ''"> and factroy_code = #{factroyCode}</if> <if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if> <if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if> <if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if> <if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
@ -78,7 +78,7 @@
<if test="itemMethod != null">item_method,</if> <if test="itemMethod != null">item_method,</if>
<if test="itemType != null">item_type,</if> <if test="itemType != null">item_type,</if>
<if test="itemTypeName != null">item_type_name,</if> <if test="itemTypeName != null">item_type_name,</if>
<if test="factroyCode != null and factroyCode != ''">factroy_code,</if> <if test="factoryCode != null and factoryCode != ''">factory_code,</if>
<if test="attr1 != null">attr1,</if> <if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if> <if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if> <if test="attr3 != null">attr3,</if>
@ -98,7 +98,7 @@
<if test="itemMethod != null">#{itemMethod},</if> <if test="itemMethod != null">#{itemMethod},</if>
<if test="itemType != null">#{itemType},</if> <if test="itemType != null">#{itemType},</if>
<if test="itemTypeName != null">#{itemTypeName},</if> <if test="itemTypeName != null">#{itemTypeName},</if>
<if test="factroyCode != null and factroyCode != ''">#{factroyCode},</if> <if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
<if test="attr1 != null">#{attr1},</if> <if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if> <if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if> <if test="attr3 != null">#{attr3},</if>
@ -114,7 +114,7 @@
( (
id, parent_code, id, parent_code,
item_code, item_name, item_method, item_code, item_name, item_method,
item_type, item_type_name, factroy_code, del_flag, item_type, item_type_name, factory_code, del_flag,
create_by, create_time create_by, create_time
) )
VALUES VALUES
@ -122,7 +122,7 @@
( (
#{item.id},#{item.parentCode}, #{item.id},#{item.parentCode},
#{item.itemCode},#{item.itemName},#{item.itemMethod}, #{item.itemCode},#{item.itemName},#{item.itemMethod},
#{item.itemType},#{item.itemTypeName},#{item.factroyCode},#{item.delFlag}, #{item.itemType},#{item.itemTypeName},#{item.factoryCode},#{item.delFlag},
#{item.createBy},#{item.createTime} #{item.createBy},#{item.createTime}
) )
</foreach> </foreach>
@ -140,7 +140,7 @@
<if test="itemMethod != null">item_method = #{itemMethod},</if> <if test="itemMethod != null">item_method = #{itemMethod},</if>
<if test="itemType != null">item_type = #{itemType},</if> <if test="itemType != null">item_type = #{itemType},</if>
<if test="itemTypeName != null">item_type_name = #{itemTypeName},</if> <if test="itemTypeName != null">item_type_name = #{itemTypeName},</if>
<if test="factroyCode != null and factroyCode != ''">factroy_code = #{factroyCode},</if> <if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
<if test="attr1 != null">attr1 = #{attr1},</if> <if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if> <if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if> <if test="attr3 != null">attr3 = #{attr3},</if>

2
op-modules/op-device/src/main/resources/mapper/device/EquOrderPersonMapper.xml
Unescape Escape View File

@ -92,7 +92,7 @@
<foreach collection="list" index="index" item="item" separator=","> <foreach collection="list" index="index" item="item" separator=",">
( (
#{item.id},#{item.planCode}, #{item.id},#{item.planCode},
#{item.userId},#{item.userName},#{item.factroyCode}, #{item.userId},#{item.userName},#{item.factoryCode},
#{item.delFlag},#{item.createBy},#{item.createTime} #{item.delFlag},#{item.createBy},#{item.createTime}
) )
</foreach> </foreach>

4
op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml
Unescape Escape View File

@ -160,14 +160,14 @@
insert into equ_order_standard( insert into equ_order_standard(
id, parent_code, order_code, standard_type, standard_name, id, parent_code, order_code, standard_type, standard_name,
detail_up_limit, detail_down_limit,detail_unit, detail_up_limit, detail_down_limit,detail_unit,
factory_code,del_flag, create_by, create_time,fault_type factory_code,del_flag, create_by, create_time
) )
VALUES VALUES
<foreach collection="list" index="index" item="item" separator=","> <foreach collection="list" index="index" item="item" separator=",">
( (
#{item.id},#{item.parentCode},#{item.planCode},#{item.standardType},#{item.standardName}, #{item.id},#{item.parentCode},#{item.planCode},#{item.standardType},#{item.standardName},
#{item.detailUpLimit},#{item.detailDownLimit},#{item.detailUnit}, #{item.detailUpLimit},#{item.detailDownLimit},#{item.detailUnit},
#{item.factroyCode},#{item.delFlag},#{item.createBy},#{item.createTime} #{item.factoryCode},#{item.delFlag},#{item.createBy},#{item.createTime}
) )
</foreach> </foreach>
</insert> </insert>

Write Preview
Loading…
Cancel
Save