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 12 months ago
parent 1597701d9a 3e642c17a0
commit 688fe5c39e
6 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderPersonMapper.java
Unescape Escape View File

@ -68,5 +68,5 @@ public interface EquOrderPersonMapper {
*/
List<String> selectEquOrderPersonByOrderCode(String orderCode);
int insertEquOrderPlans(@Param("list") List<EquPlanPerson> persons);
int insertEquOrderPersons(@Param("list") List<EquPlanPerson> persons);
}

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

@ -70,6 +70,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
private EquOrderPersonMapper equOrderPersonMapper;
@Autowired
private RemoteUserService remoteUserService;
@Autowired
private EquOutsourceWorkMapper equOutsourceWorkMapper;
/**
* 根据点检计划生成点检任务
* **/
@ -254,6 +257,10 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
String serialNum = String.format("%03d",equOrderMapper.selectSerialNumber());
String orderCode = "O"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+serialNum;
order.setOrderCode(orderCode);
if("1".equals(plan.getUpkeep())) {//1委外工单
order.setOutsourceCode("BW"+orderCode);
}
/**equ_order**/
sce = equOrderMapper.insertEquOrder(order);
System.out.println(plan.getPlanCode()+"========equ_order:"+sce);
@ -310,23 +317,37 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
/**equ_plan_standard->equ_order_standard*******************************************************/
if(!CollectionUtils.isEmpty(standards)) {
sce = equOrderStandardMapper.insertEquOrderStandards(standards);
System.out.println(plan.getPlanCode() + "========equ_order_detail:" + sce);
System.out.println(plan.getPlanCode() + "========equ_order_standard:" + sce);
}
/**equ_plan_person->equ_order_standard*********************************************************/
EquPlanPerson equPlanPerson = new EquPlanPerson();
equPlanPerson.setPlanCode(plan.getPlanCode());
List<EquPlanPerson> persons = equPlanPersonMapper.selectEquPlanPersonList(equPlanPerson);
if("1".equals(plan.getUpkeep())){//1委外
EquOutsourceWork equOutsourceWork = new EquOutsourceWork();
BeanUtils.copyProperties(plan,equOutsourceWork);
equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
equOutsourceWork.setOrderCode(orderCode);
equOutsourceWork.setWorkCode(order.getOutsourceCode());
equOutsourceWork.setWorkType("1");//1委外保养0委外维修
equOutsourceWork.setCreateBy(createBy);
equOutsourceWork.setCreateTime(nowtime);
equOutsourceWork.setDelFlag("0");
sce = equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork);
System.out.println(plan.getPlanCode() + "========equ_outsource_work:" + sce);
}else {
EquPlanPerson equPlanPerson = new EquPlanPerson();
equPlanPerson.setPlanCode(plan.getPlanCode());
List<EquPlanPerson> persons = equPlanPersonMapper.selectEquPlanPersonList(equPlanPerson);
for(EquPlanPerson person:persons){
person.setId(IdUtils.fastSimpleUUID());
person.setCreateTime(nowtime);
person.setCreateBy(createBy);
person.setDelFlag("0");
person.setPlanCode(orderCode);
}
if(!CollectionUtils.isEmpty(persons)) {
sce = equOrderPersonMapper.insertEquOrderPlans(persons);
System.out.println(plan.getPlanCode() + "========equ_order_standard:" + sce);
for (EquPlanPerson person : persons) {
person.setId(IdUtils.fastSimpleUUID());
person.setCreateTime(nowtime);
person.setCreateBy(createBy);
person.setDelFlag("0");
person.setPlanCode(orderCode);
}
if (!CollectionUtils.isEmpty(persons)) {
sce = equOrderPersonMapper.insertEquOrderPersons(persons);
System.out.println(plan.getPlanCode() + "========equ_order_person:" + sce);
}
}
return sce;
}

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

@ -18,6 +18,10 @@
ep.calculation_rule calculationRule,
ep.shut_down as 'shutDown',
ep.upkeep,
ep.work_person workPerson,
ep.work_outsourcing_unit workOutsourcingUnit,
ep.work_connection workConnection,
ep.work_reason workReason,
epe.equipment_code equipmentCode,
epe.equipment_name equipmentName,
epe.id planEquId

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

@ -82,7 +82,7 @@
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<insert id="insertEquOrderPlans">
<insert id="insertEquOrderPersons">
insert into equ_order_person
(
id, order_code, user_id, user_name, factory_code,

2
op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml
Unescape Escape View File

@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.product_code productCode,
bp.product_model productModel,
w.prod_line_code prodLineCode
from pro_rfid_process_detail rfid
from pro_rfid_process_detail rfid with (NOLOCK)
left join pro_process p on p.process_id = rfid.next_process_id
left join pro_order_workorder w on w.workorder_code = rfid.workorder_code
left join base_product bp on bp.product_code = w.product_code

2
op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
Unescape Escape View File

@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.product_code productCode,
bp.product_model productModel,
w.prod_line_code prodLineCode
from pro_rfid_process_detail rfid
from pro_rfid_process_detail rfid with (NOLOCK)
left join pro_process p on p.process_id = rfid.next_process_id
left join pro_order_workorder w on w.workorder_code = rfid.workorder_code
left join base_product bp on bp.product_code = w.product_code

Write Preview
Loading…
Cancel
Save