Skip to content

孙克 / smf-core

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

1.解析条码时 重新设置完整条码 

2.增加料串流走,通知服务器接口
3.推送入料串/出料串,入料箱/出料箱,料盘入库/料盘出库信息到中控
1 个父辈 1eb34d4e
内嵌 并排
正在显示 9 个修改的文件 包含 281 行增加 和 6 行删除
src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java
......@@ -198,6 +198,15 @@ public class CodeResolve {
barcode.setAmount(barcodeFromRule.getLabelAmount());
needUpdate = true;
}
String newFullCode = barcodeFromRule.getFullCode();
String oldFullCode = barcode.getFullCode();
if (!newFullCode.equals(oldFullCode)){
log.info("旧的完整条码为:"+oldFullCode+",新的完成条码为:"+newFullCode+",需要更新");
barcode.setFullCode(newFullCode);
needUpdate = true;
}
if(needUpdate){
try {
barcode = barcodeManager.save(barcode);
......
src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java
......@@ -325,7 +325,7 @@ public class OrderController {
public OrderDto detial(@RequestParam(required = false) String id, @RequestParam(required = false) String orderNo,
@RequestParam(required = false) String warehouseCode,@RequestParam(required = false) String brand) {
List<LiteOrderItem> lackItemList = liteOrderCache.getLackItems(liteOrderCache.getAllLiteOrder());
List<LiteOrderItem> lackItemList = new ArrayList<>();
if (!ObjectUtils.isEmpty(id)) {
LiteOrder liteOrder = liteOrderManager.get(id);
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
......@@ -34,6 +34,7 @@ import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.*;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.ValidBin;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.LiteorderCheckType;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.service.KafkaService;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BinCacheUtil;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.MaterialUtil;
......@@ -93,6 +94,9 @@ public class CDeviceController {
@Autowired
private ILiteOrderManager liteOrderManager;
@Autowired
private KafkaService kafkaService;
@ApiOperation("获取料盘尺寸信息")
@RequestMapping("/partNumberComponent")
......@@ -306,6 +310,9 @@ public class CDeviceController {
inPos.setBarcode(boxBarcode);
storagePosManager.save(inPos);
}
kafkaService.sendMachineParameterStackerAndBox(materialStr,currentLoc,barcode.getAmount(),boxBarcode.getBarcode(),0,1);
return ResultBean.newOkResult("");
}
}
......@@ -371,6 +378,8 @@ public class CDeviceController {
//清空入料线体缓存
RawInLineUtil.clearInLineStacker(materialStr);
kafkaService.sendMachineParameterStackerAndBox(materialStr, "", 0, "", 0, 2);
return ResultBean.newOkResult("");
}
......@@ -454,6 +463,9 @@ public class CDeviceController {
Storage storage = dataCache.getStorageById(pos.getStorageId());
DataLog dataLog = taskService.addPutInTaskToExecute(storage, boxBarcode, pos, boxLoc);
kafkaService.sendMachineParameterStackerAndBox("","",0,boxBarcode.getBarcode(),0,3);
return ResultBean.newOkResult(dataLog);
}
......@@ -709,6 +721,7 @@ public class CDeviceController {
resultMap.put("barcode",barcode.getBarcode());
resultMap.put("pickingId",orderNo);
kafkaService.sendMachineParameterStackerAndBox(materialStr,currentLoc,0,boxBarcode.getBarcode(),barcode.getAmount(),4);
return ResultBean.newOkResult(resultMap);
}
......@@ -1095,6 +1108,14 @@ public class CDeviceController {
return ResultBean.newOkResult("");
}
@ApiOperation("料串离开出料工位")
@RequestMapping("/starckerLeaveOutStation")
@AnonymousAccess
public ResultBean starckerLeaveOutStation(String stacker) {
kafkaService.sendMachineParameterStackerAndBox(stacker, "", 0, "", 0, 6);
return ResultBean.newOkResult("");
}
private void generatePutInTask(Barcode barcode, Barcode boxBarcode,String status,String currentLoc) {
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CtuDeviceController.java
......@@ -590,6 +590,7 @@ public class CtuDeviceController {
resultMap.put("loc", currentLoc);
resultMap.put("type", type);
resultMap.put("outMap", outMap);
resultList.add(resultMap);
}
return ResultBean.newOkResult(resultList);
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/bean/BoxKafkaCache.java 0 → 100644
package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class BoxKafkaCache {
private String machineId;
private String box;
private String putInDateStr;
private String checkOutDateStr;
private int totalAmount;
}
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/bean/StackerKafkaCache.java 0 → 100644
package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class StackerKafkaCache {
private String machineId;
private String box;
private String stacker;
private String putInDateStr;
private String checkOutDateStr;
private int totalAmount;
}
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/service/KafkaService.java
......@@ -2,6 +2,7 @@ package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.service;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.neotel.smfcore.common.utils.StringUtils;
import com.neotel.smfcore.core.barcode.enums.BARCODE_STATUS;
import com.neotel.smfcore.core.device.enums.OP;
import com.neotel.smfcore.core.device.enums.OP_STATUS;
......@@ -13,10 +14,7 @@ import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
import com.neotel.smfcore.core.system.util.EquipStatusUtil;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean.Heartbeat;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean.MachineParameter;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean.MachineParameterData;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean.MachineStatus;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean.*;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.config.KafkaConfig;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.config.StorageNameConfig;
import lombok.extern.slf4j.Slf4j;
......@@ -31,6 +29,8 @@ import org.springframework.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
//@Async
@Service
......@@ -211,6 +211,199 @@ public class KafkaService {
}
public static Map<String, StackerKafkaCache> stackerInMap = new ConcurrentHashMap<>();
public static Map<String, StackerKafkaCache> stackerOutMap = new ConcurrentHashMap<>();
public static Map<String, BoxKafkaCache> boxInMap = new ConcurrentHashMap<>();
public static Map<String, BoxKafkaCache> boxOutMap = new ConcurrentHashMap<>();
//type为1 为物料入到料串 type为2 为料串离开工位 type为3 为料箱离开工位 type为4 为物料出到料串 type为5 料箱离开工位
public void sendMachineParameterStackerAndBox(String stacker, String machineId, int putInAmount, String boxStr, int checkOutAmount, int type) {
if (1==type) {
StackerKafkaCache stackerCache = stackerInMap.get(stacker);
if (stackerCache == null) {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
stackerCache = new StackerKafkaCache(machineId, boxStr, stacker, dateStr, "", 0);
}
stackerCache.setTotalAmount(stackerCache.getTotalAmount() + putInAmount);
stackerInMap.put(stacker, stackerCache);
BoxKafkaCache boxCache = boxInMap.get(boxStr);
if (boxCache == null) {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
boxCache = new BoxKafkaCache(machineId, boxStr, dateStr, "", 0);
}
boxCache.setTotalAmount(boxCache.getTotalAmount() + putInAmount);
boxInMap.put(boxStr, boxCache);
MachineParameter parameter = createMachineParameter(machineId, boxCache, stackerCache, putInAmount);
String machineParameterStr = JSON.toJSONString(parameter);
log.info("物料放入料箱,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr);
//ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINEPARAMETER_TOPIC, machineParameterStr);
//log.info("物料放入料箱,MachineParameter返回结果为:" + JSON.toJSONString(future));
} else if (2==type) {
StackerKafkaCache stackerCache = stackerInMap.get(stacker);
if (stackerCache != null) {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
stackerCache.setCheckOutDateStr(dateStr);
String cacheMachineId = stackerCache.getMachineId();
String box = stackerCache.getBox();
BoxKafkaCache boxCache = boxInMap.get(box);
/*if (boxCache == null) {
boxCache = new BoxKafkaCache();
}*/
MachineParameter parameter = createMachineParameter(cacheMachineId, boxCache, stackerCache, 0);
String machineParameterStr = JSON.toJSONString(parameter);
log.info("料串离开入料机构,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr);
//ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINEPARAMETER_TOPIC, machineParameterStr);
//log.info("料串离开入料机构,MachineParameter返回结果为:" + JSON.toJSONString(future));
}
stackerInMap.remove(stacker);
} else if (3==type) {
BoxKafkaCache boxCache = boxInMap.get(boxStr);
if (boxCache != null) {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
boxCache.setCheckOutDateStr(dateStr);
String cacheMachineId = boxCache.getMachineId();
MachineParameter parameter = createMachineParameter(cacheMachineId, boxCache, null, 0);
String machineParameterStr = JSON.toJSONString(parameter);
log.info("料箱离开入料机构,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr);
//ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINEPARAMETER_TOPIC, machineParameterStr);
//log.info("料箱离开入料机构,MachineParameter返回结果为:" + JSON.toJSONString(future));
}
boxInMap.remove(boxStr);
} else if (4==type) {
StackerKafkaCache stackerCache = stackerOutMap.get(stacker);
if (stackerCache == null) {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
stackerCache = new StackerKafkaCache(machineId, boxStr, stacker, dateStr, "", 0);
}
stackerCache.setTotalAmount(stackerCache.getTotalAmount() + checkOutAmount);
stackerOutMap.put(stacker, stackerCache);
BoxKafkaCache boxCache = boxOutMap.get(boxStr);
if (boxCache == null) {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
boxCache = new BoxKafkaCache(machineId, boxStr, dateStr, "", 0);
}
boxCache.setTotalAmount(boxCache.getTotalAmount() + checkOutAmount);
boxOutMap.put(boxStr, boxCache);
MachineParameter parameter = createOutMachineParameter(machineId, boxCache, stackerCache, checkOutAmount);
String machineParameterStr = JSON.toJSONString(parameter);
log.info("料盘从出料机构出库,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr);
//ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINEPARAMETER_TOPIC, machineParameterStr);
//log.info("料盘从出料机构出库,MachineParameter返回结果为:" + JSON.toJSONString(future));
} else if (5==type) {
BoxKafkaCache boxCache = boxOutMap.get(boxStr);
if (boxCache != null) {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
boxCache.setCheckOutDateStr(dateStr);
String cacheMachineId = boxCache.getMachineId();
MachineParameter parameter = createOutMachineParameter(cacheMachineId, boxCache, null, 0);
String machineParameterStr = JSON.toJSONString(parameter);
log.info("料箱离开出料机构,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr);
//ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINEPARAMETER_TOPIC, machineParameterStr);
//log.info("料箱离开出料机构,MachineParameter返回结果为:" + JSON.toJSONString(future));
}
boxOutMap.remove(boxStr);
} else if (6==type) {
StackerKafkaCache stackerCache = stackerOutMap.get(stacker);
if (stackerCache != null){
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
stackerCache.setCheckOutDateStr(dateStr);
String cacheMachineId = stackerCache.getMachineId();
String box = stackerCache.getBox();
BoxKafkaCache boxCache = boxOutMap.get(box);
MachineParameter parameter = createOutMachineParameter(cacheMachineId, boxCache, stackerCache, 0);
String machineParameterStr = JSON.toJSONString(parameter);
log.info("料串从出料机构流走,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr);
//ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINEPARAMETER_TOPIC, machineParameterStr);
//log.info("料串从出料机构流走,MachineParameter返回结果为:" + JSON.toJSONString(future));
}
stackerOutMap.remove(stacker);
}
}
private MachineParameter createOutMachineParameter(String machineId, BoxKafkaCache boxCache, StackerKafkaCache stackerCache,int checkOutAmount) {
MachineParameter machineParameter = new MachineParameter();
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
machineParameter.setOccurrenceTime(dateStr);
machineParameter.setMachineID(machineId);
machineParameter.setContentType("F");
machineParameter.setMachineType("原材货架");
machineParameter.setSupplierID("NEOTEL");
machineParameter.setProgramName("");
machineParameter.setProgramVersion("");
machineParameter.setSerialNumber("");
machineParameter.setResult("");
machineParameter.setEmpNo("");
machineParameter.setClientIP("");
List<MachineParameterData> dataList = new ArrayList<>();
if (stackerCache != null) {
dataList.add(new MachineParameterData("stackerInDate", stackerCache.getPutInDateStr()));
dataList.add(new MachineParameterData("stackerOutDate", stackerCache.getCheckOutDateStr()));
dataList.add(new MachineParameterData("stackerOutAmount", stackerCache.getTotalAmount() + ""));
}
if (boxCache != null) {
dataList.add(new MachineParameterData("boxInDate", boxCache.getPutInDateStr()));
dataList.add(new MachineParameterData("boxOutDate", boxCache.getCheckOutDateStr()));
dataList.add(new MachineParameterData("boxOutAmount", boxCache.getTotalAmount() + ""));
}
if (checkOutAmount != 0) {
dataList.add(new MachineParameterData("currentReelOutAmount", checkOutAmount + ""));
}
machineParameter.setData(dataList);
return machineParameter;
}
private MachineParameter createMachineParameter(String machineId, BoxKafkaCache boxCache, StackerKafkaCache stackerCache,int putInAmount) {
MachineParameter machineParameter = new MachineParameter();
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
machineParameter.setOccurrenceTime(dateStr);
machineParameter.setMachineID(machineId);
machineParameter.setContentType("F");
machineParameter.setMachineType("原材货架");
machineParameter.setSupplierID("NEOTEL");
machineParameter.setProgramName("");
machineParameter.setProgramVersion("");
machineParameter.setSerialNumber("");
machineParameter.setResult("");
machineParameter.setEmpNo("");
machineParameter.setClientIP("");
List<MachineParameterData> dataList = new ArrayList<>();
if (stackerCache != null) {
dataList.add(new MachineParameterData("stackerInDate", stackerCache.getPutInDateStr()));
dataList.add(new MachineParameterData("stackerOutDate", stackerCache.getCheckOutDateStr()));
dataList.add(new MachineParameterData("stackerInAmount", stackerCache.getTotalAmount() + ""));
}
if (boxCache != null) {
dataList.add(new MachineParameterData("boxInDate", boxCache.getPutInDateStr()));
dataList.add(new MachineParameterData("boxOutDate", boxCache.getCheckOutDateStr()));
dataList.add(new MachineParameterData("boxInAmount", boxCache.getTotalAmount() + ""));
}
if (putInAmount != 0) {
dataList.add(new MachineParameterData("currentReelInAmount", putInAmount + ""));
}
machineParameter.setData(dataList);
return machineParameter;
}
public int getTodayInOutCount(List<String> storageIdList, int type) {
Query q = new Query();
Criteria c = new Criteria();
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BinCacheUtil.java
......@@ -421,7 +421,7 @@ public class BinCacheUtil {
if (canPutIn.isEmpty()) {
validBinList.add(binId);
} else {
//log.info(canPutIn);
log.info(stackerBarcode.getBarcode()+"对应的料格不可用:"+binId+",原因是:"+canPutIn);
}
}
}
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/third/ManualLineController.java
......@@ -15,6 +15,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.service.KafkaService;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil;
import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api;
......@@ -50,6 +51,9 @@ public class ManualLineController {
@Autowired
private IStoragePosManager storagePosManager;
@Autowired
private KafkaService kafkaService;
//人工分拣线体工位定时(1秒)将工位状态通知SMF, 若工位无料箱, boxCode传空值.
@ApiOperation("人工分拣线体工位定时状态通知")
......@@ -199,6 +203,9 @@ public class ManualLineController {
log.info(boxStr + "入库到智能仓,分配的储位为:" + pos.getPosName());
DataLog dataLog = taskService.addPutInTaskToExecute(storage, boxBarcode, pos, lineNo + "_out");
kafkaService.sendMachineParameterStackerAndBox("",lineNo,0,boxBarcode.getBarcode(),0,5);
return ResultBean.newOkResult("");
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!