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

工单完成时判空

Browse Source
This commit is contained in:
zds
2024-08-20 11:32:43 +08:00
parent 291fec7023
commit cb431515fc
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,11 +202,17 @@ public class YCLCKTask extends AbstractTask {
one.setMove_way(one.getMove_way() == null ? "" : (one.getMove_way() + " -> ") + endPointObj.getPoint_code()); one.setMove_way(one.getMove_way() == null ? "" : (one.getMove_way() + " -> ") + endPointObj.getPoint_code());
one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
one.setInstorage_time(DateUtil.now()); one.setInstorage_time(DateUtil.now());
if(ObjectUtil.isEmpty(extGroupData.getString("time"))){
one.setStanding_time(1);
}else{
one.setStanding_time(Integer.valueOf(extGroupData.getString("time"))); one.setStanding_time(Integer.valueOf(extGroupData.getString("time")));
}
one.setUpdate_id(GeneralDefinition.ACS_ID); one.setUpdate_id(GeneralDefinition.ACS_ID);
one.setUpdate_name(GeneralDefinition.ACS_NAME); one.setUpdate_name(GeneralDefinition.ACS_NAME);
one.setUpdate_time(DateUtil.now()); one.setUpdate_time(DateUtil.now());
if(ObjectUtil.isNotEmpty(extGroupData.getString("batch"))){
one.setPcsn(extGroupData.getString("batch")); one.setPcsn(extGroupData.getString("batch"));
}
vehiclematerialgroupService.updateById(one); vehiclematerialgroupService.updateById(one);
} }
// 终点解锁 // 终点解锁
@@ -215,8 +221,14 @@ public class YCLCKTask extends AbstractTask {
endPointObj.setVehicle_code2(taskObj.getVehicle_code2()); endPointObj.setVehicle_code2(taskObj.getVehicle_code2());
endPointObj.setVehicle_qty(1); endPointObj.setVehicle_qty(1);
endPointObj.setUpdate_time(DateUtil.now()); endPointObj.setUpdate_time(DateUtil.now());
if(ObjectUtil.isEmpty(extGroupData.getString("time"))){
endPointObj.setStanding_time(1);
}else{
endPointObj.setStanding_time(Integer.valueOf(extGroupData.getString("time"))); endPointObj.setStanding_time(Integer.valueOf(extGroupData.getString("time")));
}
if(ObjectUtil.isNotEmpty(extGroupData.getString("batch"))){
endPointObj.setPcsn(extGroupData.getString("batch")); endPointObj.setPcsn(extGroupData.getString("batch"));
}
endPointObj.setInstorage_time(DateUtil.now()); endPointObj.setInstorage_time(DateUtil.now());
pointService.update(endPointObj); pointService.update(endPointObj);
// 起点清空 // 起点清空
@@ -292,7 +304,9 @@ public class YCLCKTask extends AbstractTask {
materialDataDto.setSupplierName(material.getSupplierName()); materialDataDto.setSupplierName(material.getSupplierName());
materialDataDto.setProductName(material.getProductName()); materialDataDto.setProductName(material.getProductName());
materialDataDto.setSpecification(material.getSpecification()); materialDataDto.setSpecification(material.getSpecification());
if(ObjectUtil.isNotEmpty(extGroupData.getString("batch"))){
materialDataDto.setPickingBatch(extGroupData.getString("batch")); materialDataDto.setPickingBatch(extGroupData.getString("batch"));
}
materialDataDto.setLength(BigDecimal.valueOf(length)); materialDataDto.setLength(BigDecimal.valueOf(length));
materialDataDto.setWeight(BigDecimal.valueOf(weight)); materialDataDto.setWeight(BigDecimal.valueOf(weight));
materialDataDto.setCreateTime(new DateTime().toTimestamp()); materialDataDto.setCreateTime(new DateTime().toTimestamp());

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.sch.workorder.service.impl; package org.nl.wms.sch.workorder.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -144,6 +145,8 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
param.put("mode",mode); param.put("mode",mode);
param.put("vehicle_code",vehicle_code); param.put("vehicle_code",vehicle_code);
param.put("vehicle_code2", vehicle_code2); param.put("vehicle_code2", vehicle_code2);
param.put("workorder_code", workorder.getMoname());
param.put("batch", DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss"));
param.put("user_id","1"); param.put("user_id","1");
param.put("person_name", "管理员"); param.put("person_name", "管理员");
pdaService.yclck(param); pdaService.yclck(param);