Skip to content

孙克 / smf-core

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

1.禁限用和物料日志优化

1 个父辈 10cb1e1f
内嵌 并排
正在显示 15 个修改的文件 包含 33 行增加 和 9 行删除
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"); ,"status","currentLoc","creator","createDate","updateDate","operator","dateCode","batchInfo");
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;
......
src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java
...@@ -151,6 +151,8 @@ public class TaskDto implements Serializable { ...@@ -151,6 +151,8 @@ public class TaskDto implements Serializable {
private String cartonId; private String cartonId;
private String dateCode;
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
...@@ -34,6 +34,8 @@ public class DataLog extends BasePo implements Serializable { ...@@ -34,6 +34,8 @@ public class DataLog extends BasePo implements Serializable {
setNum(barcode.getAmount()); setNum(barcode.getAmount());
setMemo(barcode.getMemo()); setMemo(barcode.getMemo());
setPutInDate(barcode.getPutInDate()); setPutInDate(barcode.getPutInDate());
setBatchInfo(barcode.getBatch());
setDateCode(barcode.getDateCode());
msdAppendInfo = new MSDAppendInfo(); msdAppendInfo = new MSDAppendInfo();
msdAppendInfo.setMsl(barcode.getMsl()); msdAppendInfo.setMsl(barcode.getMsl());
......
src/main/java/com/neotel/smfcore/custom/lizhen/report/outer/OuterReportController.java
...@@ -670,6 +670,7 @@ public class OuterReportController { ...@@ -670,6 +670,7 @@ public class OuterReportController {
public PageData disable(ReportQueryCondition queryCondition, Pageable pageable) { public PageData disable(ReportQueryCondition queryCondition, Pageable pageable) {
Query query = QueryHelp.getQuery(queryCondition); Query query = QueryHelp.getQuery(queryCondition);
query.addCriteria(Criteria.where("disableMsg").nin("").exists(true)); query.addCriteria(Criteria.where("disableMsg").nin("").exists(true));
query.addCriteria(Criteria.where("posName").nin("").exists(true));
PageData<BarcodeDto> resultData = new PageData<>(); PageData<BarcodeDto> resultData = new PageData<>();
if (pageable != null) { if (pageable != null) {
PageData<Barcode> data = barcodeManager.findByPage(query, pageable); PageData<Barcode> data = barcodeManager.findByPage(query, pageable);
...@@ -714,11 +715,10 @@ public class OuterReportController { ...@@ -714,11 +715,10 @@ public class OuterReportController {
resultMap.put("厂别", getData(dto.getPlant())); resultMap.put("厂别", getData(dto.getPlant()));
resultMap.put("厂区", getData(dto.getFactory())); resultMap.put("厂区", getData(dto.getFactory()));
resultMap.put("库别", getData(dto.getWarehouseCode())); resultMap.put("库别", getData(dto.getWarehouseCode()));
resultMap.put("唯一码", getData(dto.getBarcode()));
resultMap.put("料号", getData(dto.getPartNumber())); resultMap.put("料号", getData(dto.getPartNumber()));
resultMap.put("物料描述", getData(dto.getDescribe()));
resultMap.put("隔口码", getData(dto.getPosName())); resultMap.put("隔口码", getData(dto.getPosName()));
resultMap.put("储位", getData(dto.getStoragePosName())); resultMap.put("储位", getData(dto.getStoragePosName()));
resultMap.put("Keeper", getData(dto.getKeeperCode()));
resultMap.put("数量", getData(dto.getAmount())); resultMap.put("数量", getData(dto.getAmount()));
resultMap.put("LOT", getData(dto.getBatch())); resultMap.put("LOT", getData(dto.getBatch()));
resultMap.put("D/C", getData(dto.getDateCode())); resultMap.put("D/C", getData(dto.getDateCode()));
......
src/main/java/com/neotel/smfcore/custom/luxsan/api/bean/result/GetPickingItemsResult.java
...@@ -96,4 +96,6 @@ public class GetPickingItemsResult { ...@@ -96,4 +96,6 @@ public class GetPickingItemsResult {
private String MO; private String MO;
private String BIN_CODE; private String BIN_CODE;
private String MODEL;
} }
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/bean/dto/CtuTask.java
...@@ -45,4 +45,6 @@ public class CtuTask { ...@@ -45,4 +45,6 @@ public class CtuTask {
private Object outCount; private Object outCount;
private String line; private String line;
private String pickingId;
} }
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
...@@ -1409,6 +1409,12 @@ public class CDeviceController { ...@@ -1409,6 +1409,12 @@ public class CDeviceController {
} else if (targetLoc.endsWith("CG")) { } else if (targetLoc.endsWith("CG")) {
log.info("自动绑定料串[" + stacker + "]目的地:C2-3F-CG"); log.info("自动绑定料串[" + stacker + "]目的地:C2-3F-CG");
MaterialLocUtil.updateStackerLoc(stacker, "", "C2-3F-CG", 1, orderItem.getOrderNo(),barcode); MaterialLocUtil.updateStackerLoc(stacker, "", "C2-3F-CG", 1, orderItem.getOrderNo(),barcode);
} else if (targetLoc.endsWith("2F")){
log.info("自动绑定料串["+stacker+"]目的地:C1-2F");
MaterialLocUtil.updateStackerLoc(stacker,"", "C1-2F",1,orderItem.getOrderNo(),barcode);
} else if (targetLoc.endsWith("1F")){
log.info("自动绑定料串["+stacker+"]目的地:C2-1F");
MaterialLocUtil.updateStackerLoc(stacker,"", "C2-1F",1,orderItem.getOrderNo(),barcode);
} }
} }
...@@ -1523,6 +1529,7 @@ public class CDeviceController { ...@@ -1523,6 +1529,7 @@ public class CDeviceController {
dataLog.setNum(barcode.getAmount()); dataLog.setNum(barcode.getAmount());
dataLog.setType(OP.PUT_IN); dataLog.setType(OP.PUT_IN);
dataLog.setStatus(status); dataLog.setStatus(status);
dataLog.setDateCode(barcode.getDateCode());
dataLog.setBatchInfo(barcode.getBatch()); dataLog.setBatchInfo(barcode.getBatch());
dataLog.setSourceName(barcode.getBarSource()); dataLog.setSourceName(barcode.getBarSource());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
...@@ -1666,6 +1673,8 @@ public class CDeviceController { ...@@ -1666,6 +1673,8 @@ public class CDeviceController {
String destination = materialLoc.getDestination(); String destination = materialLoc.getDestination();
if (StringUtils.isEmpty(destination)) { if (StringUtils.isEmpty(destination)) {
destination = ""; destination = "";
}else {
destination = destination.replaceAll("-","/");
} }
resultMap.put("destination", destination); resultMap.put("destination", destination);
return ResultBean.newOkResult(resultMap); return ResultBean.newOkResult(resultMap);
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CtuDeviceController.java
...@@ -161,6 +161,7 @@ public class CtuDeviceController { ...@@ -161,6 +161,7 @@ public class CtuDeviceController {
ctuTask.setPriority(dataLog.getPriority()); ctuTask.setPriority(dataLog.getPriority());
ctuTask.setOutCount(dataLog.getExtraDataMap("outCount")); ctuTask.setOutCount(dataLog.getExtraDataMap("outCount"));
ctuTask.setLine(dataLog.getLine()); ctuTask.setLine(dataLog.getLine());
ctuTask.setPickingId(dataLog.getSourceName());
shelfToLineTaskList.add(ctuTask); shelfToLineTaskList.add(ctuTask);
} }
} }
...@@ -210,6 +211,7 @@ public class CtuDeviceController { ...@@ -210,6 +211,7 @@ public class CtuDeviceController {
ctuTask.setPriority(dataLog.getPriority()); ctuTask.setPriority(dataLog.getPriority());
ctuTask.setOutCount(dataLog.getExtraDataMap("outCount")); ctuTask.setOutCount(dataLog.getExtraDataMap("outCount"));
ctuTask.setLine(dataLog.getLine()); ctuTask.setLine(dataLog.getLine());
ctuTask.setPickingId(dataLog.getSourceName());
shelfToLineTaskList.add(ctuTask); shelfToLineTaskList.add(ctuTask);
} }
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualGrPutInController.java
...@@ -516,6 +516,7 @@ public class ManualGrPutInController { ...@@ -516,6 +516,7 @@ public class ManualGrPutInController {
dataLog.setNum(barcode.getAmount()); dataLog.setNum(barcode.getAmount());
dataLog.setType(OP.PUT_IN); dataLog.setType(OP.PUT_IN);
dataLog.setStatus(status); dataLog.setStatus(status);
dataLog.setDateCode(barcode.getDateCode());
dataLog.setBatchInfo(barcode.getBatch()); dataLog.setBatchInfo(barcode.getBatch());
dataLog.setSourceName(barcode.getBarSource()); dataLog.setSourceName(barcode.getBarSource());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualReturnTowerController.java
...@@ -243,6 +243,7 @@ public class ManualReturnTowerController { ...@@ -243,6 +243,7 @@ public class ManualReturnTowerController {
dataLog.setNum(barcode.getAmount()); dataLog.setNum(barcode.getAmount());
dataLog.setType(OP.PUT_IN); dataLog.setType(OP.PUT_IN);
dataLog.setStatus(status); dataLog.setStatus(status);
dataLog.setDateCode(barcode.getDateCode());
dataLog.setBatchInfo(barcode.getBatch()); dataLog.setBatchInfo(barcode.getBatch());
dataLog.setSourceName(barcode.getBarSource()); dataLog.setSourceName(barcode.getBarSource());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualStorTransferController.java
...@@ -226,6 +226,7 @@ public class ManualStorTransferController { ...@@ -226,6 +226,7 @@ public class ManualStorTransferController {
dataLog.setNum(barcode.getAmount()); dataLog.setNum(barcode.getAmount());
dataLog.setType(OP.PUT_IN); dataLog.setType(OP.PUT_IN);
dataLog.setStatus(status); dataLog.setStatus(status);
dataLog.setDateCode(barcode.getDateCode());
dataLog.setBatchInfo(barcode.getBatch()); dataLog.setBatchInfo(barcode.getBatch());
dataLog.setSourceName(barcode.getBarSource()); dataLog.setSourceName(barcode.getBarSource());
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualTicketReturnController.java
...@@ -242,6 +242,7 @@ public class ManualTicketReturnController { ...@@ -242,6 +242,7 @@ public class ManualTicketReturnController {
dataLog.setNum(barcode.getAmount()); dataLog.setNum(barcode.getAmount());
dataLog.setType(OP.PUT_IN); dataLog.setType(OP.PUT_IN);
dataLog.setStatus(status); dataLog.setStatus(status);
dataLog.setDateCode(barcode.getDateCode());
dataLog.setBatchInfo(barcode.getBatch()); dataLog.setBatchInfo(barcode.getBatch());
dataLog.setSourceName(sourceName); dataLog.setSourceName(sourceName);
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualTicketTransferController.java
...@@ -250,6 +250,7 @@ public class ManualTicketTransferController { ...@@ -250,6 +250,7 @@ public class ManualTicketTransferController {
dataLog.setNum(barcode.getAmount()); dataLog.setNum(barcode.getAmount());
dataLog.setType(OP.PUT_IN); dataLog.setType(OP.PUT_IN);
dataLog.setStatus(status); dataLog.setStatus(status);
dataLog.setDateCode(barcode.getDateCode());
dataLog.setBatchInfo(barcode.getBatch()); dataLog.setBatchInfo(barcode.getBatch());
dataLog.setSourceName(sourceName); dataLog.setSourceName(sourceName);
dataLog.setWarehouseCode(barcode.getWarehouseCode()); dataLog.setWarehouseCode(barcode.getWarehouseCode());
......
src/main/resources/config/application-21088prod.yml
...@@ -10,7 +10,7 @@ api: ...@@ -10,7 +10,7 @@ api:
cancelOdn: http://10.68.27.86/smf-core/cancelRestock/cancelOdn cancelOdn: http://10.68.27.86/smf-core/cancelRestock/cancelOdn
#禁用料 #禁用料
inCheckUrl: http://10.68.25.42:8001/Npm/WmsCheckReelfob inCheckUrl: http://10.68.25.42:8011/Npm/WmsCheckReelfob
#储位查询 #储位查询
queryBin: http://10.68.30.22:8082/api/mlb/QueryBin queryBin: http://10.68.30.22:8082/api/mlb/QueryBin
...@@ -178,7 +178,7 @@ api: ...@@ -178,7 +178,7 @@ api:
manualPallet: http://10.68.30.22:8082/api/mlb/manualPallet manualPallet: http://10.68.30.22:8082/api/mlb/manualPallet
#批量禁用料 #批量禁用料
batchCheckReel: http://10.68.25.42:8001/Npm/CheckReelBatch batchCheckReel: http://10.68.25.42:8011/Npm/CheckReelBatch
fetchReel: http://10.68.30.22:8082/api/mlb/FetchReel fetchReel: http://10.68.30.22:8082/api/mlb/FetchReel
......
src/main/resources/config/application.yml
...@@ -14,9 +14,9 @@ api: ...@@ -14,9 +14,9 @@ api:
brandQtyUrl: #http://172.30.170.199:8082/api/wcs/brandQty #gr标签满卷数 brandQtyUrl: #http://172.30.170.199:8082/api/wcs/brandQty #gr标签满卷数
importUrl: #http://10.42.222.52:8001/smf-core/ext/forward/getDataLogs #内仓导入外仓picking虚拟仓数据 importUrl: #http://10.42.222.52:8001/smf-core/ext/forward/getDataLogs #内仓导入外仓picking虚拟仓数据
checkReelMeasure: #http://10.190.25.124:8001/Sct/CheckReelMeasure #散料量测接口 checkReelMeasure: #http://10.190.25.124:8001/Sct/CheckReelMeasure #散料量测接口
plant: #2810 plant: W339
werks: #2810 werks:
outerFactory: outerFactory: W21F
...@@ -49,7 +49,7 @@ lizhen: ...@@ -49,7 +49,7 @@ lizhen:
differenceUrl: http://10.68.27.104/smf-core/api/Mes/differenceReel differenceUrl: http://10.68.27.104/smf-core/api/Mes/differenceReel
storageC12F: storageC12F:
name: storageC12F name: storageC12F
line: BG02T,BG02B line: BG02T,BG02B,CG20B1,CG02B2,CG02T1,CG02T2,AS02T1,AS02T2,AS02T3,AS02B1,AS02B2
url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial
differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!