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

fix

Browse Source
This commit is contained in:
psh
2024-06-11 09:18:39 +08:00
parent 7ceb84b3e0
commit e03718c695
9 changed files with 86 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
lms/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-14.0.log
View File

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

@@ -13,6 +13,7 @@ import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.dao.Param;
import org.nl.wms.database.material.service.IMdBaseMaterialService;
import org.nl.wms.database.material.service.dao.MdBaseMaterial;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
import org.nl.wms.pdm.solidifyplan.service.IPdmBdSolidifyPlanService;
import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
@@ -73,6 +74,8 @@ public class TBXMLTask extends AbstractTask {
private IPdmBdSolidifyPlanService solidifyPlanService;
@Autowired
private IPdmBdProductionProcessTrackingService processTrackingService;
@Autowired
private WmsToAcsService wmsToAcsService;
/**
* hint: 涂板线任务先发到等待点，接着二次请求获取真正的点位。
@@ -292,7 +295,7 @@ public class TBXMLTask extends AbstractTask {
: "");
groupEntity.setMaterial_qty(ObjectUtil.isNotEmpty(qty) && qty > 0
? qty
: ObjectUtil.isEmpty(materialObj.getMaterial_spec()) ? 0 : Integer.parseInt(materialObj.getMaterial_spec()) * 11);
: ObjectUtil.isEmpty(materialObj.getStandard_qty()) ? 0 : Integer.parseInt(materialObj.getStandard_qty()) * 11);
groupEntity.setCreate_id(GeneralDefinition.ACS_ID);
groupEntity.setCreate_name(GeneralDefinition.ACS_NAME);
groupEntity.setCreate_time(DateUtil.now());
@@ -350,7 +353,6 @@ public class TBXMLTask extends AbstractTask {
processTracking.setProcess_location(endPoint);
processTracking.setRecord_time(DateUtil.now());
processTrackingService.create(processTracking);
// todo: 如果是最后一个就申请固化
SchBasePoint one = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getParent_point_code, endPointObj.getParent_point_code())
.eq(SchBasePoint::getPoint_type, PointTypeConstant.DOCKING_POINT)
@@ -371,6 +373,13 @@ public class TBXMLTask extends AbstractTask {
taskObj.setFinished_type(taskFinishedType.getCode());
TaskUtils.setUpdateByType(taskObj, taskFinishedType);
taskService.updateById(taskObj);
//如果是最后一个就申请固化
if(endPointObj.getPoint_code().endsWith("7")) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("device_code", endPointObj.getParent_point_code());
jsonObject.put("type", 1);
wmsToAcsService.notifyAcs(jsonObject);
}
}
public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {

2
lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -18,7 +18,7 @@ https://juejin.cn/post/6844903775631572999
<!--引入默认的一些设置-->
<!--<include resource="log/XrToMes.xml"/>
<include resource="log/MesToErp.xml"/>-->
<include resource="log/XgAgvDeviceDriver.xml"/>
<!-- <include resource="log/XgAgvDeviceDriver.xml"/>-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>