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

rev:新增报工时间字段，下料机优先级，缓存线写0（三层缓存线跑）下一道工序设备来料仓排序

Browse Source
This commit is contained in:
zhangzq
2023-11-29 10:15:33 +08:00
parent d1bf663e0f
commit 2927e7e25f
7 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{
, "quantity", task.getString("material_qty")
, "barcodeArr", task.getString("barcodeArr")
, "qtyArr", task.getString("qtyArr")
, "proprity_floor", "2"
, "priority_floor", "0"
, "in_pcsn", task.getString("task_code")
, "agv_system_type", task.getString("agv_system_type")
));

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
View File

@@ -40,6 +40,7 @@
</if>
GROUP BY pdm_bi_device.device_code
HAVING currentQty > #{qty}
order by currentQty desc
</select>
<select id="workproceduceDevicesWeight" resultType="java.util.Map">

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java
View File

@@ -234,6 +234,11 @@ public class PdmProduceWorkorder implements Serializable{
*/
private Date update_time;
/**
* 报工时间
*/
private String stop_time;
/**
* aps工作顺序号

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

@@ -298,6 +298,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
workorder.setUpdate_time(new Date());
workorder.setUpdate_id(SecurityUtils.getCurrentUserId());
workorder.setUpdate_name(SecurityUtils.getCurrentNickName());
workorder.setStop_time(DateUtil.now());
workorder.setReal_qty(null);
this.updateById(workorder);
reportRecordService.update(new UpdateWrapper<PdmProduceWorkorderrecord>().set("report_qty", param.getBigDecimal("report_qty")).set("report_status", ReportEnum.REPORT_STATUS.code("报工")).set("operatetime_end", DateUtil.now()).set("needproduct_qty", Math.max(0, workorder.getPlan_qty().intValue() - workorder.getReport_qty().intValue())).eq("macoperate_id", one.getMacoperate_id()));

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/SpeMachinery/SpeFullTask.java
View File

@@ -148,7 +148,11 @@ public class SpeFullTask extends AbstractAcsTask {
task.put("create_time", DateUtil.now());
task.put("update_time", DateUtil.now());
task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_NB.getCode());
task.put("priority", "1");}
task.put("priority", "1");
if (task.getString("point_code1").contains("WXXL")&&form.getString("type").equals(AcsTaskEnum.TASK_PRODUCT_MAC.getCode())){
task.put("priority", "5");
}
}
return task;
}