Skip to content

孙克 / smf-core

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

1.接收出库单修改 

2.料盒操作增加生产日期
1 个父辈 193335d9
内嵌 并排
正在显示 5 个修改的文件 包含 12 行增加 和 8 行删除
src/main/java/com/neotel/smfcore/common/init/MainTimer.java
...@@ -46,13 +46,13 @@ public class MainTimer { ...@@ -46,13 +46,13 @@ public class MainTimer {
log.info("开始加载未完成的任务..."); log.info("开始加载未完成的任务...");
List<DataLog> unExecuteTasks = dataLogManager.findUnFinishedTasks(); List<DataLog> unExecuteTasks = dataLogManager.findUnFinishedTasks();
for (DataLog unExecuteTask : unExecuteTasks) { for (DataLog unExecuteTask : unExecuteTasks) {
if (unExecuteTask.isExecuting() || unExecuteTask.isWait()||unExecuteTask.isOutBox()||unExecuteTask.isInLine()|| unExecuteTask.isInRobot()||unExecuteTask.isBoxdoor()) { //if (unExecuteTask.isExecuting() || unExecuteTask.isWait()||unExecuteTask.isOutBox()||unExecuteTask.isInLine()|| unExecuteTask.isInRobot()||unExecuteTask.isBoxdoor()) {
try { try {
taskService.addTaskToExecute(unExecuteTask); taskService.addTaskToExecute(unExecuteTask);
}catch (Exception e){ }catch (Exception e){
log.error("初始化任务["+unExecuteTask+"]出错："+e); log.error("初始化任务["+unExecuteTask+"]出错："+e);
} }
} //}
} }
log.info("加载未完成的任务完成，共[" + unExecuteTasks.size() + "]条数据..."); log.info("加载未完成的任务完成，共[" + unExecuteTasks.size() + "]条数据...");
} }
......
src/main/java/com/neotel/smfcore/core/storage/rest/MaterialBoxController.java
...@@ -94,6 +94,7 @@ public class MaterialBoxController { ...@@ -94,6 +94,7 @@ public class MaterialBoxController {
subBarcode.setPartNumber(barcode.getPartNumber()); subBarcode.setPartNumber(barcode.getPartNumber());
subBarcode.setAmount(barcode.getAmount()); subBarcode.setAmount(barcode.getAmount());
subBarcode.setPidBarcode(barcode.getPidBarcode()); subBarcode.setPidBarcode(barcode.getPidBarcode());
subBarcode.setProduceDate(barcode.getProduceDate());
subCodeList.add(subBarcode); subCodeList.add(subBarcode);
barcode.setSubCodeList(subCodeList); barcode.setSubCodeList(subCodeList);
...@@ -240,6 +241,7 @@ public class MaterialBoxController { ...@@ -240,6 +241,7 @@ public class MaterialBoxController {
boxBarcode.setPartNumber(partNumber); boxBarcode.setPartNumber(partNumber);
boxBarcode.setAmount(amount+barcode.getAmount()); boxBarcode.setAmount(amount+barcode.getAmount());
boxBarcode.setPidBarcode(barcode.getBarcode()); boxBarcode.setPidBarcode(barcode.getBarcode());
boxBarcode.setProduceDate(barcode.getProduceDate());
//设置治具盒的入库时间 //设置治具盒的入库时间
long boxPutInTime = boxBarcode.getPutInTime(); long boxPutInTime = boxBarcode.getPutInTime();
......
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/Aiqingzhiyin1643Menu.java
...@@ -25,14 +25,14 @@ public class Aiqingzhiyin1643Menu { ...@@ -25,14 +25,14 @@ public class Aiqingzhiyin1643Menu {
@PostConstruct @PostConstruct
public void init(){ public void init(){
String menuLabel = "1643"; String menuLabel = "1643";
/*Menu poutOut = Menu.CreatePMenu("物料管理", 3, "order", "workOrder", null);
MenuInit.addMenu(menuLabel,poutOut,99, "上架/下架","putAwayPutOut", "system/putAwayPutOut/index","putAwayPutOut");*/
Menu finishedGoodsWarehouse = Menu.CreatePMenu("成品仓管理", 4, "finishedGoodsWarehouse", "FGStorage", null); Menu finishedGoodsWarehouse = Menu.CreatePMenu("成品仓管理", 4, "finishedGoodsWarehouse", "FGStorage", null);
MenuInit.addMenu(menuLabel,finishedGoodsWarehouse,1, "上架","putAway", "neolight/putAway/index","putAway"); MenuInit.addMenu(menuLabel,finishedGoodsWarehouse,1, "上架","putAway", "neolight/putAway/index","putAway");
MenuInit.addMenu(menuLabel,finishedGoodsWarehouse,2, "下架","putOut", "neolight/putOut/index","putOut"); MenuInit.addMenu(menuLabel,finishedGoodsWarehouse,2, "下架","putOut", "neolight/putOut/index","putOut");
Menu structuredStorage = Menu.CreatePMenu("结构仓管理", 5, "structuredStorage", "structuredStorage", null);
MenuInit.addMenu(menuLabel, structuredStorage, 1, "上架/下架", "putAwayPutOut", "system/putAwayPutOut/index", "putAwayPutOut");
String apiName = smfApi.getApiName(); String apiName = smfApi.getApiName();
if(Strings.isNotBlank(apiName) && apiName.equals(menuLabel)){ if(Strings.isNotBlank(apiName) && apiName.equals(menuLabel)){
menuInit.showMenu(apiName); menuInit.showMenu(apiName);
......
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/controller/AgvDeviceController.java
...@@ -186,6 +186,7 @@ public class AgvDeviceController { ...@@ -186,6 +186,7 @@ public class AgvDeviceController {
DataLog opTask = null; DataLog opTask = null;
List<DataLog> allTasks = taskService.getAllTasks(); List<DataLog> allTasks = taskService.getAllTasks();
for (DataLog task : allTasks) { for (DataLog task : allTasks) {
if (StringUtils.isNotEmpty(task.getBarcode())){
if (rfid.startsWith(task.getBarcode())) { if (rfid.startsWith(task.getBarcode())) {
if (!task.isCancel() && !task.isFinished()) { if (!task.isCancel() && !task.isFinished()) {
opTask = task; opTask = task;
...@@ -193,6 +194,7 @@ public class AgvDeviceController { ...@@ -193,6 +194,7 @@ public class AgvDeviceController {
} }
} }
} }
}
if (opTask == null) { if (opTask == null) {
return ResultBean.newErrorResult(303, "smfcore.task.notExist", "任务不存在"); return ResultBean.newErrorResult(303, "smfcore.task.notExist", "任务不存在");
} }
......
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/controller/MomoController.java
...@@ -69,7 +69,7 @@ public class MomoController { ...@@ -69,7 +69,7 @@ public class MomoController {
@ApiOperation("接口4：MOM传递出库任务给WMS") @ApiOperation("接口4：MOM传递出库任务给WMS")
@RequestMapping("/PDAAPI/DeliveryOrder/InsertDeliveryOrder") @RequestMapping("/PDAAPI/DeliveryOrder/InsertDeliveryOrder")
@AnonymousAccess @AnonymousAccess
public DeliveryOrderResponse insertDeliveryOrder(@RequestBody DeliveryOrder deliveryOrder) { public ApiResponse insertDeliveryOrder(@RequestBody DeliveryOrder deliveryOrder) {
log.info("MOM传递出库任务给WMS:" + JSON.toJSONString(deliveryOrder)); log.info("MOM传递出库任务给WMS:" + JSON.toJSONString(deliveryOrder));
//判断存不存在 //判断存不存在
String orderNo = deliveryOrder.getDeliveryOrder(); String orderNo = deliveryOrder.getDeliveryOrder();
...@@ -78,12 +78,12 @@ public class MomoController { ...@@ -78,12 +78,12 @@ public class MomoController {
liteOrder = liteOrderManager.findByOrderNo(orderNo); liteOrder = liteOrderManager.findByOrderNo(orderNo);
} }
if (liteOrder != null) { if (liteOrder != null) {
return new DeliveryOrderResponse(null, false, "-1", "出库任务:" + orderNo + "已经存在"); return new ApiResponse("出库任务:" + orderNo + "已存在", null, "fail");
} }
liteOrder = createLiteorder(deliveryOrder); liteOrder = createLiteorder(deliveryOrder);
liteOrder = liteOrderManager.createWithItems(liteOrder); liteOrder = liteOrderManager.createWithItems(liteOrder);
liteOrderCache.addOrderToMap(liteOrder); liteOrderCache.addOrderToMap(liteOrder);
return new DeliveryOrderResponse(null, true, "", ""); return new ApiResponse(orderNo + "接收成功", null, "success");
} }
private LiteOrder createLiteorder(DeliveryOrder deliveryOrder) { private LiteOrder createLiteorder(DeliveryOrder deliveryOrder) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!