root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mes接口优化

Browse Source
This commit is contained in:
psh
2024-03-21 17:40:01 +08:00
parent a161979507
commit 52fb8e45f8
9 changed files with 76 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES118Response.java
View File

@@ -2,47 +2,10 @@ package org.nl.wms.mes.domain;
import lombok.Data;
import java.util.List;
@Data
public class QPMES118Response extends Public {
//消息状态
private String STATUS;
//消息文本
private String MESSAGE;
//预留主键1
private String KEY_VALUE01;
//预留主键2
private String KEY_VALUE02;
//预留主键3
private String KEY_VALUE03;
//预留主键4
private String KEY_VALUE04;
//预留主键5
private String KEY_VALUE05;
//预留主键6
private String KEY_VALUE06;
//预留主键7
private String KEY_VALUE07;
//预留主键8
private String KEY_VALUE08;
//预留主键9
private String KEY_VALUE09;
//预留反馈主键1
private String FKEY_VALUE01;
//预留反馈主键2
private String FKEY_VALUE02;
//预留反馈主键3
private String FKEY_VALUE03;
//预留反馈主键4
private String FKEY_VALUE04;
//预留反馈主键5
private String FKEY_VALUE05;
//预留反馈主键6
private String FKEY_VALUE06;
//预留反馈主键7
private String FKEY_VALUE07;
//预留反馈主键8
private String FKEY_VALUE08;
//预留反馈主键9
private String FKEY_VALUE09;
private List<QPMES118ResponseBody> BODY;
}

24
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/domain/QPMES118ResponseBody.java Normal file
View File

@@ -0,0 +1,24 @@
package org.nl.wms.mes.domain;
import lombok.Data;
@Data
public class QPMES118ResponseBody{
//库区
private String WhaCode;
//库位
private String WhlCode;
//客户
private String CustomerName;
//母托号
private String ParentPalletSN;
//子托号
private String PalletSN;
//物料编码
private String ProductName;
//入库日期
private String WorkDate;
//重量
private String Qty;
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/QPMES118Service.java
View File

@@ -14,5 +14,5 @@ import java.util.List;
public interface QPMES118Service {
@WebMethod
public List<QPMES118Response> QPMES118();
public QPMES118Response QPMES118();
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES060ServiceImpl.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.mes.webservice.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.mes.domain.QPMES060Request;
import org.nl.wms.mes.domain.QPMES060Response;
import org.nl.wms.mes.webservice.service.QPMES060Service;
@@ -19,6 +20,7 @@ import javax.jws.WebService;
targetNamespace = "http://127.0.0.1:8010", // 命名空间,一般是接口的包名倒序
endpointInterface = "org.nl.wms.mes.webservice.service.QPMES060Service" // 接口类全路径
)
@Slf4j
public class QPMES060ServiceImpl implements QPMES060Service {
@Autowired
@@ -27,7 +29,7 @@ public class QPMES060ServiceImpl implements QPMES060Service {
@Override
public QPMES060Response QPMES060(QPMES060Request notice){
System.out.println("服务被调用 参数：" + notice.toString());
log.info("服务被调用 参数：" + notice.toString());
Material material=new Material();
material.copyFrom(notice);
material.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES098ServiceImpl.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.mes.webservice.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.mes.domain.QPMES098Request;
import org.nl.wms.mes.domain.QPMES098Response;
import org.nl.wms.mes.webservice.service.QPMES098Service;
@@ -20,6 +21,7 @@ import java.math.BigDecimal;
targetNamespace = "http://127.0.0.1:8010", // 命名空间,一般是接口的包名倒序
endpointInterface = "org.nl.wms.mes.webservice.service.QPMES098Service" // 接口类全路径
)
@Slf4j
public class QPMES098ServiceImpl implements QPMES098Service {
@Autowired
@@ -27,7 +29,7 @@ public class QPMES098ServiceImpl implements QPMES098Service {
@Override
public QPMES098Response QPMES098(QPMES098Request notice){
System.out.println("服务被调用 参数：" + notice.toString());
log.info("服务被调用 参数：" + notice.toString());
QPMES098Response qpmes098Response=new QPMES098Response();
PdmBdWorkorder entity = new PdmBdWorkorder();
if("1".equals(notice.getZSTAT())) {

22
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/webservice/service/impl/QPMES118ServiceImpl.java
View File

@@ -1,7 +1,11 @@
package org.nl.wms.mes.webservice.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.mes.domain.QPMES118Response;
import org.nl.wms.mes.domain.QPMES118ResponseBody;
import org.nl.wms.mes.webservice.service.QPMES118Service;
import org.nl.wms.sch.task_manage.task.tasks.mapper.PointMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.jws.WebService;
@@ -14,12 +18,22 @@ import java.util.List;
targetNamespace = "http://127.0.0.1:8010", // 命名空间,一般是接口的包名倒序
endpointInterface = "org.nl.wms.mes.webservice.service.QPMES118Service" // 接口类全路径
)
@Slf4j
public class QPMES118ServiceImpl implements QPMES118Service {
@Override
public List<QPMES118Response> QPMES118(){
@Autowired
private PointMapper pointMapper;
System.out.println("QPMES118服务被调用");
return new ArrayList<QPMES118Response>();
@Override
public QPMES118Response QPMES118(){
QPMES118Response qpmes118Response =new QPMES118Response();
List<QPMES118ResponseBody> body=pointMapper.queryByMes();
qpmes118Response.setBODY(body);
qpmes118Response.setDEST_SYSTEM("1");
qpmes118Response.setINTF_ID("1");
qpmes118Response.setSRC_MSGID("1");
qpmes118Response.setSRC_SYSTEM("1");
log.info("QPMES118服务被调用");
return qpmes118Response;
}
}

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java
View File

@@ -177,15 +177,27 @@ public class YCLRKTask extends AbstractTask {
pointService.update(endPointObj);
// 要把数据存到组盘表 -> 改造公共方法，返回id
//组盘表需要关联外部mes晶棒数据，一对多
LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Material::getPalletSN,taskObj.getVehicle_code2());
wrapper.eq(Material::getGroup_bind_material_status,GroupBindMaterialStatusEnum.BOUND.getValue());
List<Material> materialList= materialMapper.selectList(wrapper);
SchBaseVehiclematerialgroup groupEntity = getSchBaseVehiclematerialgroup(taskObj, extGroupData, workorderCode, endPoint, endPointObj);
groupEntity.setVehicle_code(taskObj.getVehicle_code());
groupEntity.setVehicle_type("0");
groupEntity.setMaterial_weight(extGroupData.getBigDecimal("weight"));
if(ObjectUtil.isNotEmpty(materialList)) {
groupEntity.setRemark(materialList.get(0).getSupplierName());
groupEntity.setMaterial_id(materialList.get(0).getProductName());
}
vehiclematerialgroupService.save(groupEntity);
groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
groupEntity.setVehicle_code(taskObj.getVehicle_code2());
groupEntity.setVehicle_type("1");
groupEntity.setMaterial_weight(extGroupData.getBigDecimal("weight"));
if(ObjectUtil.isNotEmpty(materialList)) {
groupEntity.setRemark(materialList.get(0).getSupplierName());
groupEntity.setMaterial_id(materialList.get(0).getProductName());
}
vehiclematerialgroupService.save(groupEntity);
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
@@ -193,10 +205,6 @@ public class YCLRKTask extends AbstractTask {
taskObj.setRemark("任务完成");
try {
//todo 待确认具体传值
LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Material::getPalletSN,taskObj.getVehicle_code2());
wrapper.eq(Material::getGroup_bind_material_status,GroupBindMaterialStatusEnum.BOUND.getValue());
List<Material> materialList= materialMapper.selectList(wrapper);
if(ObjectUtil.isNotEmpty(materialList)) {
String url = "http://11.111.11.111:9556/xxx/ws/powerAlarmWs";
QPMES062Request qpmes062Request = new QPMES062Request();
@@ -239,6 +247,7 @@ public class YCLRKTask extends AbstractTask {
groupEntity.setCreate_id("2");
groupEntity.setCreate_name("ACS");
groupEntity.setCreate_time(DateUtil.now());
groupEntity.setUpdate_time(DateUtil.now());
groupEntity.setMaterial_id(ObjectUtil.isNotEmpty(workorderCode)
? workorderCode.getMaterial_id()
: "");

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.sch.task_manage.task.tasks.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.mes.domain.QPMES118ResponseBody;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import java.util.List;
@@ -21,4 +22,6 @@ public interface PointMapper extends BaseMapper<SchBasePoint> {
void updatePointType(String device_code,String point_type);
void updatePointVehicleQty(String device_code,String state);
List<QPMES118ResponseBody> queryByMes();
}

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml
View File

@@ -39,4 +39,12 @@
update sch_base_point set vehicle_qty = #{state}
where point_code like CONCAT('%', #{device_code}, '%')
</update>
<select id="queryByMes" resultType="org.nl.wms.mes.domain.QPMES118ResponseBody">
select p.region_code as WhaCode,p.point_code as WhlCode,p.vehicle_code as ParentPalletSN,p.vehicle_code2 as PalletSN,v.material_id as ProductName,v.material_weight as Qty,DATE_FORMAT(v.update_time, '%Y-%m-%d') as WorkDate,v.remark as CustomerName
from sch_base_point p
LEFT JOIN sch_base_vehiclematerialgroup v
on p.vehicle_code2=v.vehicle_code
where p.region_code in('YL','HW','HWK');
</select>
</mapper>