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

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -95,7 +95,7 @@ public class TaskController {
     public PageData<TaskDto> query(TaskQueryCondition criteria, Pageable pageable) {
         Query query = getQuery(criteria);
         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<TaskDto> result= taskMapper.toDto(taskList);
         return  result;
@@ -107,7 +107,7 @@ public class TaskController {
     public void download(HttpServletResponse response, TaskQueryCondition criteria, Pageable pageable, HttpServletRequest request) throws IOException {
         Query query = getQuery(criteria);
         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() {
             @Override
             public List<List<String>> getHeader() {
@@ -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("更新时间"));
                 return headerList;
@@ -143,6 +144,7 @@ public class TaskController {
                     result.add(dataLog.getStatus());
                     result.add(dataLog.getCurrentLoc());
                     result.add(dataLog.getOperator());
+                    result.add(dataLog.getStacker());
                     result.add(dataLog.getCreateDate());
                     result.add(dataLog.getUpdateDate());
                     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 {
 
     private String dateCode;
 
+    private String stacker;
+
     public String getTaskColor() {
         if (ObjectUtil.isNotEmpty(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 {
 
     public Map<String,Object> extraDataMap;
 
+    private String stacker;
+
     public String getBarcode() {
         if(barcode == null){
             return "";

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -761,6 +761,7 @@ public class CDeviceController {
         dataLog.setProvider(barcode.getProvider());
         dataLog.setProviderNumber(barcode.getProviderNumber());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
+        dataLog.setStacker(materialStr);
         if (StringUtils.isNotEmpty(currentLoc)) {
             dataLog.setCurrentLoc(currentLoc);
         }
@@ -1464,6 +1465,7 @@ public class CDeviceController {
         dataLog.setProvider(barcode.getProvider());
         dataLog.setProviderNumber(barcode.getProviderNumber());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
+        dataLog.setStacker(stacker);
         if (StringUtils.isNotEmpty(currentLoc)) {
             dataLog.setCurrentLoc(currentLoc);
         }
@@ -1889,12 +1891,12 @@ public class CDeviceController {
         if (orderItem == null){
             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;
     }
 
 
-    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.setSubSourceId(orderItemId);
         dataLog.setSourceId(orderId);
@@ -1908,6 +1910,9 @@ public class CDeviceController {
         dataLog.setProvider(barcode.getProvider());
         dataLog.setProviderNumber(barcode.getProviderNumber());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
+        if (StringUtils.isEmpty(errorMsg)) {
+            dataLog.setStacker(stacker);
+        }
         if (StringUtils.isNotEmpty(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 {
                 machineStatus.setOccurrenceTime(dateStr);
                 machineStatus.setMachineID(machineId);
                 machineStatus.setTopicType(KafkaConfig.MACHINESTATUS_TOPIC);
+                if ("3".equals(currentStatus)){
+                    currentStatus = "1";
+                }
                 machineStatus.setCurrentStatus(currentStatus);
                 machineStatus.setErrorCode("");
                 machineStatus.setErrorMsg("");