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

fix

Browse Source
This commit is contained in:
psh
2024-04-23 15:53:44 +08:00
parent c19a4c6869
commit aa34d403a2
17 changed files with 1035 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/mes/controller/MesController.java
View File

@@ -96,6 +96,8 @@ public class MesController {
List<QPMES098ResponseBody> qpmes098ResponseBodyArrayList=new ArrayList<>();
PdmBdWorkorder entity = new PdmBdWorkorder();
if("1".equals(qpmes098Request.getBODY().get(0).getZSTAT())) {
//先删除原来的工单信息，再新增，不然会出现重复的情况
pdmBdWorkorderService.updateState(qpmes098Request.getBODY().get(0).getAUFNR(),"2");
entity.setExt_data(JSONObject.toJSONString(qpmes098Request));
entity.setWorkorder_code(qpmes098Request.getBODY().get(0).getAUFNR());
entity.setPlan_qty(new BigDecimal((qpmes098Request.getBODY().get(0).getGAMNG())));

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
View File

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.database.material.service.IMdBaseMaterialService;
import org.nl.wms.ext.service.AcsToWmsService;
import org.nl.wms.ext.service.dto.to.BaseResponse;
import org.nl.wms.pda.service.PdaService;
import org.nl.wms.pda.service.dao.mapper.PdaMapper;
import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
@@ -65,16 +66,16 @@ public class PdaServiceImpl implements PdaService {
param.put("request_medthod_code", "YCLRKTask");
param.put("request_medthod_name", "原材料入库");
param.put("device_code",param.getString("start_point"));
acsToWmsService.acsApply(param);
return PdaResponseVo.pdaResultOk("原材料入库成功");
BaseResponse baseResponse=acsToWmsService.acsApply(param);
return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
}
@Override
public PdaResponseVo yclck(JSONObject param) {
param.put("request_medthod_code", "YCLCKTask");
param.put("request_medthod_name", "原材料出库");
param.put("device_code",param.getString("start_point"));
acsToWmsService.acsApply(param);
return PdaResponseVo.pdaResultOk("原材料出库成功");
BaseResponse baseResponse=acsToWmsService.acsApply(param);
return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
}
@Override
@@ -82,8 +83,8 @@ public class PdaServiceImpl implements PdaService {
param.put("request_medthod_code", "POINTTask");
param.put("request_medthod_name", "点对点任务");
param.put("device_code",param.getString("start_point"));
acsToWmsService.acsApply(param);
return PdaResponseVo.pdaResultOk("任务生成成功");
BaseResponse baseResponse=acsToWmsService.acsApply(param);
return PdaResponseVo.pdaResultOk(baseResponse.getMessage());
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/IPdmBdWorkorderService.java
View File

@@ -52,4 +52,6 @@ public interface IPdmBdWorkorderService extends IService<PdmBdWorkorder> {
IPage<PdmBdWorkorderDetail> queryAllDetail(PdmBdWorkorderQuery query, PageQuery page);
IPage<PointDetail> queryPointDetail(String productname, PageQuery page);
void updateState(String workorder_code,String workorder_status);
}

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java
View File

@@ -13,6 +13,7 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.system.service.coderule.dao.SysCodeRuleDetail;
import org.nl.wms.pdm.service.IPdmBdWorkorderService;
import org.nl.wms.pdm.service.dao.PdmBdWorkorder;
import org.nl.wms.pdm.service.dao.PdmBdWorkorderDetail;
@@ -108,4 +109,13 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
pages = pdmBdWorkorderDetailMapper.selectPointDetail(pages, productname);
return pages;
}
@Override
public void updateState(String workorder_code,String workorder_status) {
PdmBdWorkorder entity=getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
.eq(PdmBdWorkorder::getWorkorder_code, workorder_code));
entity.setWorkorder_status(workorder_status);
pdmBdWorkorderMapper.updateById(entity);
pdmBdWorkorderDetailMapper.delete(new LambdaQueryWrapper<PdmBdWorkorderDetail>().eq(PdmBdWorkorderDetail::getWorkorder_code, workorder_code));
}
}

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.ext.service.WmsToAcsService;
import org.nl.wms.ext.service.dto.to.BaseResponse;
@@ -135,10 +136,13 @@ public class POINTTask extends AbstractTask {
if (status.equals(TaskStatus.FINISHED)) { // 完成
String vehicleCode=taskObj.getVehicle_code();
String vehicleCode2= taskObj.getVehicle_code2();
SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
GroupBindMaterialStatusEnum.BOUND.getValue()));
SchBaseVehiclematerialgroup one =null;
if(StringUtils.isNotEmpty(vehicleCode)) {
one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
GroupBindMaterialStatusEnum.BOUND.getValue()));
}
if (ObjectUtil.isNotEmpty(one)) {
// throw new BadRequestException(vehicleCode + " => " + startPointObj.getVehicle_type() + "的组盘信息未找到");
// }
@@ -152,10 +156,12 @@ public class POINTTask extends AbstractTask {
one.setUpdate_time(DateUtil.now());
vehiclematerialgroupService.updateById(one);
}
one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode2)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
GroupBindMaterialStatusEnum.BOUND.getValue()));
if(StringUtils.isNotEmpty(vehicleCode2)) {
one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode2)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
GroupBindMaterialStatusEnum.BOUND.getValue()));
}
if (ObjectUtil.isNotEmpty(one)) {
// throw new BadRequestException(vehicleCode + " => " + startPointObj.getVehicle_type() + "的组盘信息未找到");
// }