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

rev:aps订单强制完成，生成工单编号。

Browse Source
This commit is contained in:
baoge
2023-07-10 21:54:20 +08:00
parent 586436419b
commit 7ea3d22904
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
View File

@@ -30,6 +30,7 @@ import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstand
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.mps_manage.other.service.dto.ProduceshiftorderDto;
import org.nl.wms.product_manage.service.workorder.dao.WorkorderRecord;
import org.nl.wms.scheduler_manage.ReportEnum;
import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
@@ -217,6 +218,19 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
public void finish(JSONObject param) {
//强制完成时修改工单状态
String workorder_id = param.getJSONObject("row").getString("workorder_id");
PdmProduceWorkorder pdmProduceWorkorder = this.getOne(new QueryWrapper<PdmProduceWorkorder>()
.nested(i -> i
.isNull("workorder_code").or()
.eq("workorder_code", "").or()
.eq("workorder_code", "0"))
.eq("workorder_id", workorder_id));
//aps排产完成的工单，生成工单编号再下发
if(null!=pdmProduceWorkorder) {
this.update(new UpdateWrapper<PdmProduceWorkorder>()
.eq("workorder_id", pdmProduceWorkorder.getWorkorder_id())
.set("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")));
}
this.update(new UpdateWrapper<PdmProduceWorkorder>()
.set("workorder_status", WorkerOrderEnum.FORCE_COMPLETE.getCode())
.set("confirm_id", SecurityUtils.getCurrentUserId())
@@ -237,20 +251,20 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
public void recordWorkOrder(OptionRecord.OptionEnum optionEnum, String... ids) {
// List<PdmProduceWorkorder> workorders = this.list(new QueryWrapper<PdmProduceWorkorder>().in("workorder_id", ids));
// for (PdmProduceWorkorder one : workorders) {
// WorkorderRecord record = WorkorderRecord.builder()
// .workorder_id(one.getWorkorder_id())
// .device_code(one.getDevice_code())
// .dq_init_qty(one.getReal_qty())
// .dq_finish_qty(one.getReal_qty())
// .operatetime_start(one.getCreate_time())
// .workprocedure_id(one.getWorkprocedure_id())
// .operatetime_end(DateUtil.now())
// .shift_type_scode(one.getShift_type_scode())
// .product_area(one.getProduct_area()).build();
// OptionRecord.recordAsync(optionEnum, one.getWorkorder_status(), OptionRecord.Buss.WORKORDER, one.getWorkorder_id(), record);
// }
List<PdmProduceWorkorder> workorders = this.list(new QueryWrapper<PdmProduceWorkorder>().in("workorder_id", ids));
for (PdmProduceWorkorder one : workorders) {
WorkorderRecord record = WorkorderRecord.builder()
.workorder_id(one.getWorkorder_id())
.device_code(one.getDevice_code())
.dq_init_qty(one.getReal_qty())
.dq_finish_qty(one.getReal_qty())
.operatetime_start(one.getCreate_time())
.workprocedure_id(one.getWorkprocedure_id())
.operatetime_end(DateUtil.now())
.shift_type_scode(one.getShift_type_scode())
.product_area(one.getProduct_area()).build();
OptionRecord.recordAsync(optionEnum, one.getWorkorder_status(), OptionRecord.Buss.WORKORDER, one.getWorkorder_id(), record);
}
}
@Override