Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 521e3849 由 zshaohui
选项

1.工单出库时,绑定料串信息在物料日志 展示出来

1 个父辈 089c8c99
内嵌 并排
正在显示 5 个修改的文件 包含 18 行增加 和 4 行删除
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"); ,"status","currentLoc","creator","createDate","updateDate","operator","dateCode","batchInfo","stacker");
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;
...@@ -107,7 +107,7 @@ public class TaskController { ...@@ -107,7 +107,7 @@ public class TaskController {
public void download(HttpServletResponse response, TaskQueryCondition criteria, Pageable pageable, HttpServletRequest request) throws IOException { public void download(HttpServletResponse response, TaskQueryCondition criteria, Pageable pageable, HttpServletRequest request) throws IOException {
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"); ,"status","currentLoc","creator","createDate","updateDate","operator","stacker");
FileUtil.downloadExcel(query, pageable, response, new IExcelDownLoad() { FileUtil.downloadExcel(query, pageable, response, new IExcelDownLoad() {
@Override @Override
public List<List<String>> getHeader() { public List<List<String>> getHeader() {
...@@ -122,6 +122,7 @@ public class TaskController { ...@@ -122,6 +122,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;
...@@ -143,6 +144,7 @@ public class TaskController { ...@@ -143,6 +144,7 @@ public class TaskController {
result.add(dataLog.getStatus()); result.add(dataLog.getStatus());
result.add(dataLog.getCurrentLoc()); result.add(dataLog.getCurrentLoc());
result.add(dataLog.getOperator()); result.add(dataLog.getOperator());
result.add(dataLog.getStacker());
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
...@@ -153,6 +153,8 @@ public class TaskDto implements Serializable { ...@@ -153,6 +153,8 @@ public class TaskDto implements Serializable {
private String dateCode; private String dateCode;
private String stacker;
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
...@@ -402,6 +402,8 @@ public class DataLog extends BasePo implements Serializable { ...@@ -402,6 +402,8 @@ public class DataLog extends BasePo implements Serializable {
public Map<String,Object> extraDataMap; public Map<String,Object> extraDataMap;
private String stacker;
public String getBarcode() { public String getBarcode() {
if(barcode == null){ if(barcode == null){
return ""; return "";
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
...@@ -761,6 +761,7 @@ public class CDeviceController { ...@@ -761,6 +761,7 @@ public class CDeviceController {
dataLog.setProvider(barcode.getProvider()); dataLog.setProvider(barcode.getProvider());
dataLog.setProviderNumber(barcode.getProviderNumber()); dataLog.setProviderNumber(barcode.getProviderNumber());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
dataLog.setStacker(materialStr);
if (StringUtils.isNotEmpty(currentLoc)) { if (StringUtils.isNotEmpty(currentLoc)) {
dataLog.setCurrentLoc(currentLoc); dataLog.setCurrentLoc(currentLoc);
} }
...@@ -1464,6 +1465,7 @@ public class CDeviceController { ...@@ -1464,6 +1465,7 @@ public class CDeviceController {
dataLog.setProvider(barcode.getProvider()); dataLog.setProvider(barcode.getProvider());
dataLog.setProviderNumber(barcode.getProviderNumber()); dataLog.setProviderNumber(barcode.getProviderNumber());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
dataLog.setStacker(stacker);
if (StringUtils.isNotEmpty(currentLoc)) { if (StringUtils.isNotEmpty(currentLoc)) {
dataLog.setCurrentLoc(currentLoc); dataLog.setCurrentLoc(currentLoc);
} }
...@@ -1889,12 +1891,12 @@ public class CDeviceController { ...@@ -1889,12 +1891,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); generateCurrentBarcodeTask(barcode, barcode.getPosName(), orderItem.getId(), order.getId(), order.getOrderNo(), currentLoc,stacker,errorMsg);
return errorMsg; return errorMsg;
} }
private void generateCurrentBarcodeTask(Barcode barcode, String posName, String orderItemId, String orderId, String orderNo, String currentLoc) { private void generateCurrentBarcodeTask(Barcode barcode, String posName, String orderItemId, String orderId, String orderNo, String currentLoc,String stacker,String errorMsg) {
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);
...@@ -1908,6 +1910,9 @@ public class CDeviceController { ...@@ -1908,6 +1910,9 @@ public class CDeviceController {
dataLog.setProvider(barcode.getProvider()); dataLog.setProvider(barcode.getProvider());
dataLog.setProviderNumber(barcode.getProviderNumber()); dataLog.setProviderNumber(barcode.getProviderNumber());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
if (StringUtils.isEmpty(errorMsg)) {
dataLog.setStacker(stacker);
}
if (StringUtils.isNotEmpty(currentLoc)) { if (StringUtils.isNotEmpty(currentLoc)) {
dataLog.setCurrentLoc(currentLoc); dataLog.setCurrentLoc(currentLoc);
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/service/KafkaService.java
...@@ -213,6 +213,9 @@ public class KafkaService { ...@@ -213,6 +213,9 @@ public class KafkaService {
machineStatus.setOccurrenceTime(dateStr); machineStatus.setOccurrenceTime(dateStr);
machineStatus.setMachineID(machineId); machineStatus.setMachineID(machineId);
machineStatus.setTopicType(KafkaConfig.MACHINESTATUS_TOPIC); machineStatus.setTopicType(KafkaConfig.MACHINESTATUS_TOPIC);
if ("3".equals(currentStatus)){
currentStatus = "1";
}
machineStatus.setCurrentStatus(currentStatus); machineStatus.setCurrentStatus(currentStatus);
machineStatus.setErrorCode(""); machineStatus.setErrorCode("");
machineStatus.setErrorMsg(""); machineStatus.setErrorMsg("");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!