Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit bf146829 由 张少辉
选项

1.物料日志增加目的地信息

1 个父辈 755722ab
内嵌 并排
正在显示 5 个修改的文件 包含 23 行增加 和 3 行删除
src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java
...@@ -95,7 +95,7 @@ public class TaskController { ...@@ -95,7 +95,7 @@ public class TaskController {
public PageData<TaskDto> query(TaskQueryCondition criteria, Pageable pageable) { public PageData<TaskDto> query(TaskQueryCondition criteria, Pageable pageable) {
Query query = getQuery(criteria); Query query = getQuery(criteria);
query.fields().include("partNumber","barcode","cartonId","posName","storageName","num","type","sourceName" query.fields().include("partNumber","barcode","cartonId","posName","storageName","num","type","sourceName"
,"status","currentLoc","creator","createDate","updateDate","operator","dateCode","batchInfo","stacker"); ,"status","currentLoc","creator","createDate","updateDate","operator","dateCode","batchInfo","stacker","targetLoc");
PageData<DataLog> taskList = dataLogManager.findByPage(query, pageable); PageData<DataLog> taskList = dataLogManager.findByPage(query, pageable);
PageData<TaskDto> result= taskMapper.toDto(taskList); PageData<TaskDto> result= taskMapper.toDto(taskList);
return result; return result;
...@@ -123,6 +123,7 @@ public class TaskController { ...@@ -123,6 +123,7 @@ public class TaskController {
headerList.add(Lists.newArrayList("当前位置")); headerList.add(Lists.newArrayList("当前位置"));
headerList.add(Lists.newArrayList("操作人")); headerList.add(Lists.newArrayList("操作人"));
headerList.add(Lists.newArrayList("绑定料串")); headerList.add(Lists.newArrayList("绑定料串"));
headerList.add(Lists.newArrayList("目的地"));
headerList.add(Lists.newArrayList("创建时间")); headerList.add(Lists.newArrayList("创建时间"));
headerList.add(Lists.newArrayList("更新时间")); headerList.add(Lists.newArrayList("更新时间"));
return headerList; return headerList;
...@@ -145,6 +146,7 @@ public class TaskController { ...@@ -145,6 +146,7 @@ public class TaskController {
result.add(dataLog.getCurrentLoc()); result.add(dataLog.getCurrentLoc());
result.add(dataLog.getOperator()); result.add(dataLog.getOperator());
result.add(dataLog.getStacker()); result.add(dataLog.getStacker());
result.add(dataLog.getTargetLoc());
result.add(dataLog.getCreateDate()); result.add(dataLog.getCreateDate());
result.add(dataLog.getUpdateDate()); result.add(dataLog.getUpdateDate());
dataList.add(result); dataList.add(result);
......
src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java
...@@ -155,6 +155,8 @@ public class TaskDto implements Serializable { ...@@ -155,6 +155,8 @@ public class TaskDto implements Serializable {
private String stacker; private String stacker;
private String targetLoc;
public String getTaskColor() { public String getTaskColor() {
if (ObjectUtil.isNotEmpty(lightColor)) { if (ObjectUtil.isNotEmpty(lightColor)) {
return "#" + lightColor; return "#" + lightColor;
......
src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java
...@@ -404,6 +404,8 @@ public class DataLog extends BasePo implements Serializable { ...@@ -404,6 +404,8 @@ public class DataLog extends BasePo implements Serializable {
private String stacker; private String stacker;
private String targetLoc;
public String getBarcode() { public String getBarcode() {
if(barcode == null){ if(barcode == null){
return ""; return "";
......
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java
...@@ -599,6 +599,11 @@ public class OutLineController { ...@@ -599,6 +599,11 @@ public class OutLineController {
task.setPlantCode(orderItem.getPlantCode()); task.setPlantCode(orderItem.getPlantCode());
task.setOrderNo(orderItem.getOrderNo()); task.setOrderNo(orderItem.getOrderNo());
task.setManualUpload(orderItem.isManualUpload()); task.setManualUpload(orderItem.isManualUpload());
LiteOrder liteOrder = liteOrderManager.get(orderItem.getOrderId());
if (liteOrder != null){
task.setTargetLoc(liteOrder.getLoc());
}
} }
} }
String boxStr = BoxUtil.getBoxStr(barcode.getPosName()); String boxStr = BoxUtil.getBoxStr(barcode.getPosName());
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
...@@ -658,6 +658,7 @@ public class CDeviceController { ...@@ -658,6 +658,7 @@ public class CDeviceController {
String orderItemId = barcode.getOrderItemId(); String orderItemId = barcode.getOrderItemId();
String orderId = ""; String orderId = "";
String orderNo = ""; String orderNo = "";
String loc = "";
if (StringUtils.isNotEmpty(orderItemId)) { if (StringUtils.isNotEmpty(orderItemId)) {
...@@ -679,6 +680,7 @@ public class CDeviceController { ...@@ -679,6 +680,7 @@ public class CDeviceController {
} }
LiteOrder order = liteOrderManager.get(orderItem.getOrderId()); LiteOrder order = liteOrderManager.get(orderItem.getOrderId());
if (order != null) { if (order != null) {
loc = order.getLoc();
targetLoc = order.getLoc(); targetLoc = order.getLoc();
checkType = order.getCheckType(); checkType = order.getCheckType();
} }
...@@ -768,6 +770,7 @@ public class CDeviceController { ...@@ -768,6 +770,7 @@ public class CDeviceController {
if (StringUtils.isNotEmpty(currentLoc)) { if (StringUtils.isNotEmpty(currentLoc)) {
dataLog.setCurrentLoc(currentLoc); dataLog.setCurrentLoc(currentLoc);
} }
dataLog.setTargetLoc(loc);
taskService.updateFinishedTask(dataLog); taskService.updateFinishedTask(dataLog);
//有出库,此料格就去除满格标志 //有出库,此料格就去除满格标志
...@@ -1369,6 +1372,7 @@ public class CDeviceController { ...@@ -1369,6 +1372,7 @@ public class CDeviceController {
String orderItemId = barcode.getOrderItemId(); String orderItemId = barcode.getOrderItemId();
String orderId = ""; String orderId = "";
String orderNo = ""; String orderNo = "";
String loc = "";
if (StringUtils.isNotEmpty(orderItemId)) { if (StringUtils.isNotEmpty(orderItemId)) {
...@@ -1391,6 +1395,7 @@ public class CDeviceController { ...@@ -1391,6 +1395,7 @@ public class CDeviceController {
LiteOrder order = liteOrderManager.get(orderItem.getOrderId()); LiteOrder order = liteOrderManager.get(orderItem.getOrderId());
if (order != null) { if (order != null) {
targetLoc = order.getLoc(); targetLoc = order.getLoc();
loc = order.getLoc();
checkType = order.getCheckType(); checkType = order.getCheckType();
} }
} }
...@@ -1480,6 +1485,9 @@ public class CDeviceController { ...@@ -1480,6 +1485,9 @@ public class CDeviceController {
if (StringUtils.isNotEmpty(currentLoc)) { if (StringUtils.isNotEmpty(currentLoc)) {
dataLog.setCurrentLoc(currentLoc); dataLog.setCurrentLoc(currentLoc);
} }
dataLog.setTargetLoc(loc);
taskService.updateFinishedTask(dataLog); taskService.updateFinishedTask(dataLog);
//有出库,此料格就去除满格标志 //有出库,此料格就去除满格标志
...@@ -1905,12 +1913,12 @@ public class CDeviceController { ...@@ -1905,12 +1913,12 @@ public class CDeviceController {
if (orderItem == null){ if (orderItem == null){
orderItem = new LiteOrderItem(); orderItem = new LiteOrderItem();
} }
generateCurrentBarcodeTask(barcode, barcode.getPosName(), orderItem.getId(), order.getId(), order.getOrderNo(), currentLoc,stacker,errorMsg); generateCurrentBarcodeTask(barcode, barcode.getPosName(), orderItem.getId(), order.getId(), order.getOrderNo(), currentLoc,stacker,errorMsg,order.getLoc());
return errorMsg; return errorMsg;
} }
private void generateCurrentBarcodeTask(Barcode barcode, String posName, String orderItemId, String orderId, String orderNo, String currentLoc,String stacker,String errorMsg) { private void generateCurrentBarcodeTask(Barcode barcode, String posName, String orderItemId, String orderId, String orderNo, String currentLoc,String stacker,String errorMsg,String loc) {
DataLog dataLog = new DataLog(new Storage(), barcode, new StoragePos()); DataLog dataLog = new DataLog(new Storage(), barcode, new StoragePos());
dataLog.setSubSourceId(orderItemId); dataLog.setSubSourceId(orderItemId);
dataLog.setSourceId(orderId); dataLog.setSourceId(orderId);
...@@ -1930,6 +1938,7 @@ public class CDeviceController { ...@@ -1930,6 +1938,7 @@ public class CDeviceController {
if (StringUtils.isNotEmpty(currentLoc)) { if (StringUtils.isNotEmpty(currentLoc)) {
dataLog.setCurrentLoc(currentLoc); dataLog.setCurrentLoc(currentLoc);
} }
dataLog.setTargetLoc(loc);
log.info(barcode.getBarcode()+"物料扫码出库,更改工单任务数开始"); log.info(barcode.getBarcode()+"物料扫码出库,更改工单任务数开始");
taskService.updateFinishedTask(dataLog); taskService.updateFinishedTask(dataLog);
log.info(barcode.getBarcode()+"物料扫码出库,更改工单任务数结束"); log.info(barcode.getBarcode()+"物料扫码出库,更改工单任务数结束");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!