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

Merge remote-tracking branch 'origin/master'

Browse Source
orign^2^2
wws 1 year ago
parent e855f5ad3c 0b0ad3d1ab
commit 9ef78fd8ab
7 changed files with 73 additions and 48 deletions
Show Stats Download Patch File Download Diff File

64
op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
Unescape Escape View File

@ -310,44 +310,32 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
}
//子工单报工
logger.info("==========================子工单报工开始");
this.reportHzToSap(sHzWorks);
logger.info("==========================子工单报工结束");
mesReportWork.setWorkorderCode(sapWorkOrders.get(0).getWorkorderCode());
MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork);
if(pHzWork==null){
return R.fail("未查询到母报工单");
}
//母工单报工
logger.info("==========================母工单报工开始");
pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback());
pHzWork.setSac1(sHzWorks.getSac1());
R sapR = this.reportHzToSap(pHzWork);
logger.info("==========================母工单报工结束");
//最终报工标识且sap报工成功：关闭子母工单
MesReportWork endReport = mesReportWorkMapper.getEndReport(pHzWork);
if("1".equals(endReport.getEndReport())&&sapR.getCode()==200){
/**
logger.info("报工======母sap工单编码："+sapWorkOrders.get(0).getWorkorderCodeSap()+
"子sap工单编码："+sapWorkOrders.get(1).getWorkorderCodeSap()
);
//关闭母子订单//订单的订单编码
SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery();
sapCloseOrderQuery.setLeadOrder(sapWorkOrders.get(0).getWorkorderCodeSap());
sapCloseOrderQuery.setOrder(sapWorkOrders.get(1).getWorkorderCodeSap());
R closeR = remoteSapService.sapCloseOrder(sapCloseOrderQuery);
logger.info("报工======关闭母子sap工单"+sapCloseOrderQuery.getLeadOrder()+":"+
sapCloseOrderQuery.getOrder()+":"+
closeR.getCode()+","+
closeR.getMsg()+","+
closeR.getData());
**/
MesReportWork rworkVo = new MesReportWork();
rworkVo.setStatus("w3");
rworkVo.setUpdateTime(DateUtils.getNowDate());
rworkVo.setUpdateBy(SecurityUtils.getUsername());
rworkVo.setWorkorderCode(belongWorkOrder);
//pro_work_order status->w3报工--belong_work_order
mesReportWorkMapper.updateOrderWorkStatus(rworkVo);
R sapRson = this.reportHzToSap(sHzWorks);
logger.info("==========================子工单报工结束:"+JSONObject.toJSONString(sapRson));
if(sapRson.getCode()== 200){
//一定是子单报工成功返回后，再母单报工
mesReportWork.setWorkorderCode(sapWorkOrders.get(0).getWorkorderCode());
MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork);
if(pHzWork==null){
return R.fail("未查询到母报工单");
}
//母工单报工
logger.info("==========================母工单报工开始");
pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback());
pHzWork.setSac1(sHzWorks.getSac1());
R sapR = this.reportHzToSap(pHzWork);
logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR));
//最终报工标识且sap报工成功：关闭子母工单
MesReportWork endReport = mesReportWorkMapper.getEndReport(pHzWork);
if("1".equals(endReport.getEndReport())&&sapR.getCode()==200){
MesReportWork rworkVo = new MesReportWork();
rworkVo.setStatus("w3");
rworkVo.setUpdateTime(DateUtils.getNowDate());
rworkVo.setUpdateBy(SecurityUtils.getUsername());
rworkVo.setWorkorderCode(belongWorkOrder);
//pro_work_order status->w3报工--belong_work_order
mesReportWorkMapper.updateOrderWorkStatus(rworkVo);
}
}
return R.ok();
}

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

@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mrwc.recoil
from mes_report_work_consume mrwc
left join pro_order_workorder pow on pow.workorder_code = mrwc.workorder_code
where mrwc.del_flag = '0'
where mrwc.del_flag = '0' and pow.del_flag = '0'
and pow.parent_order = #{workorderCode}
</select>

15
op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java
Unescape Escape View File

@ -11,9 +11,7 @@ import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.poi.ExcelMapUtil;
import com.op.common.security.utils.SecurityUtils;
import com.op.system.api.domain.SysUser;
import com.op.wms.domain.BaseTeamUser;
import com.op.wms.domain.EquSpareEquipment;
import com.op.wms.domain.WmsSparePartsLedger;
import com.op.wms.domain.*;
import com.op.wms.service.IBaseEquipmentService;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
@ -28,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.wms.domain.BaseEquipment;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
@ -241,4 +238,14 @@ public class BaseEquipmentController extends BaseController {
return getDataTable(list);
}
/**
* 查询组线/辅助设备
*/
@GetMapping("/getAuxiliaryEquipmentList")
public TableDataInfo getAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment) {
startPage();
List<BaseEquipment> list = baseEquipmentService.selectAuxiliaryEquipmentList(equBindAuxiliaryEquipment);
return getDataTable(list);
}
}

3
op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java
Unescape Escape View File

@ -117,4 +117,7 @@ public interface BaseEquipmentMapper {
//删除
void deleteAuxiliaryEquipmentByCode(String equipmentCode);
//查询组线/辅助设备
List<BaseEquipment> selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment);
}

8
op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java
Unescape Escape View File

@ -3,10 +3,7 @@ package com.op.wms.service;
import java.util.List;
import com.op.common.core.web.domain.AjaxResult;
import com.op.wms.domain.BaseEquipment;
import com.op.wms.domain.BaseTeamUser;
import com.op.wms.domain.EquSpareEquipment;
import com.op.wms.domain.WmsSparePartsLedger;
import com.op.wms.domain.*;
/**
* 设备管理Service接口
@ -83,4 +80,7 @@ public interface IBaseEquipmentService {
//查询人员列表
List<BaseTeamUser> getPersonList(BaseTeamUser baseTeamUser);
//查询组线/辅助设备
List<BaseEquipment> selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment);
}

18
op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java
Unescape Escape View File

@ -335,10 +335,14 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
EquBindAuxiliaryEquipment equBindAuxiliaryEquipment = new EquBindAuxiliaryEquipment();
equBindAuxiliaryEquipment.setAuxiliaryEquipmentCode(code);
equBindAuxiliaryEquipment.setEquipmentCode(baseEquipment.getEquipmentCode());
equBindAuxiliaryEquipment.setEquipmentName(baseEquipment.getEquipmentName());
equBindAuxiliaryEquipment.setCreateBy(SecurityUtils.getUsername());
equBindAuxiliaryEquipment.setCreateTime(DateUtils.getNowDate());
equBindAuxiliaryEquipment.setId(IdUtils.fastSimpleUUID());
equBindAuxiliaryEquipment.setAuxiliaryEquipmentName(baseEquipment.getEquipmentName());
//工厂号
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equBindAuxiliaryEquipment.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
baseEquipmentMapper.bindAuxiliaryEquipment(equBindAuxiliaryEquipment);
}
}
@ -552,4 +556,16 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
return baseTeamUserMapper.getPersonList(baseTeamUser);
}
/**
* 查询设备管理列表
*
* @param equBindAuxiliaryEquipment 设备管理
* @return 设备管理
*/
@Override
@DS("#header.poolName")
public List<BaseEquipment> selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment) {
return baseEquipmentMapper.selectAuxiliaryEquipmentList(equBindAuxiliaryEquipment);
}
}

11
op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
Unescape Escape View File

@ -581,4 +581,15 @@
where equipment_id = #{equipmentId}
</update>
<select id="selectAuxiliaryEquipmentList" parameterType="com.op.wms.domain.EquBindAuxiliaryEquipment" resultType="BaseEquipment">
select
ebac.auxiliary_equipment_code AS equipmentCode,
be.equipment_name AS equipmentName,
be.equipment_status AS equipmentStatus
from equ_bind_auxiliary_equipment ebac
left join base_equipment be on ebac.auxiliary_equipment_code = be.equipment_code
where ebac.equipment_code = #{equipmentCode}
</select>
</mapper>
Write Preview
Loading…
Cancel
Save