增加1588点料验证接口

LN
Commit 7620bb1c 由 LN 编写于 2025-07-10 10:21:20 +0800
src/main/java/com/neotel/smfcore/core/solder/handler/SpBoxHandler.java
src/main/java/com/neotel/smfcore/core/solder/util/SolderBoxCache.java
src/main/java/com/neotel/smfcore/core/xRay/rest/XrayPrintDataController.java → src/main/java/com/neotel/smfcore/core/xRay/rest/XrayDeviceController.java
src/main/java/com/neotel/smfcore/custom/zhongcheSp1568/ZhongCheSPApi.java
--- a/src/main/java/com/neotel/smfcore/core/solder/handler/SpBoxHandler.java
查看文件 @7620bb1
+++ b/src/main/java/com/neotel/smfcore/core/solder/handler/SpBoxHandler.java
查看文件 @7620bb1
@@ -392,7 +392,8 @@ public class SpBoxHandler extends BaseDeviceHandler {
 //                        statusBean.addData("plateH", task.getH()+"");
                        DataLog rewarmPuttingTask = findAnotherTask(OP.REWARM_PUTTING, task.getBarcode());
                        if (rewarmPuttingTask == null) {
-                            log.error("[" + cid + "]回温取料任务[" + task.getBarcode() + "][" + task.getPosName() + "]未找到回温放料任务");
+                            log.error("[" + cid + "]回温取料任务[" + task.getBarcode() + "][" + task.getPosName() + "]未找到回温放料任务,先跳过此任务");
+                            continue;
                        } else {
                            statusBean.addRewarmTask(task, rewarmPuttingTask);
 //                            statusBean.addData("secondPosId", rewarmPuttingTask.getPosName());

--- a/src/main/java/com/neotel/smfcore/core/solder/util/SolderBoxCache.java
查看文件 @7620bb1
+++ b/src/main/java/com/neotel/smfcore/core/solder/util/SolderBoxCache.java
查看文件 @7620bb1
@@ -304,6 +304,7 @@ public class SolderBoxCache {
                puttingTask.setType(OP.REWARM_PUTTING);
                //puttingTask = dataLogDao.save(puttingTask);
                taskService.addTaskToExecute(puttingTask);
+                log.info(barcode.getBarcode() + "创建回温移库任务完成：["+storagePos.getPosName()+"]=>" + warmPos.getPosName());
            }else{
                log.error(barcode.getBarcode() + "创建回温移库任务失败：未找到回温库位");
            }

--- a/src/main/java/com/neotel/smfcore/core/xRay/rest/XrayPrintDataController.java → src/main/java/com/neotel/smfcore/core/xRay/rest/XrayDeviceController.java
查看文件 @7620bb1
+++ b/src/main/java/com/neotel/smfcore/core/xRay/rest/XrayPrintDataController.java → src/main/java/com/neotel/smfcore/core/xRay/rest/XrayDeviceController.java
查看文件 @7620bb1
 package com.neotel.smfcore.core.xRay.rest;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.exception.ApiException;
+import com.neotel.smfcore.common.utils.DateUtil;
+import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.equipment.util.bean.EquipConfigInfo;
@@ -12,17 +18,15 @@ import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("service/equipment/xRay")
-public class XrayPrintDataController {
+public class XrayDeviceController {
    @Autowired
    private IXrayPrintDataManager xrayPrintDataManager;
@@ -30,8 +34,11 @@ public class XrayPrintDataController {
    @Autowired
    private CodeResolve codeResolve;
+    @Autowired
+    private IBarcodeManager barcodeManager;
-    @ApiOperation("上传打印参数")
+    @ApiOperation("1584手动点料功能：上传打印参数")
    @PostMapping("/uploadMResult")
    @AnonymousAccess
    public ResultBean uploadMResult(@RequestBody Map<String,String> paramMap) {
@@ -58,9 +65,7 @@ public class XrayPrintDataController {
    }
+    @ApiOperation("1584手动点料功能：获取打印参数")
-    @ApiOperation("获取打印参数")
    @PostMapping("/getMResult")
    @AnonymousAccess
    public ResultBean getMResult(@RequestBody Map<String,String> paramMap) {
@@ -87,4 +92,68 @@ public class XrayPrintDataController {
    }
+    @ApiOperation("1588点料验证：是否需要点料，未入库条码不需要点料")
+    @PostMapping("/isNeedCounting")
+    @AnonymousAccess
+    public ResultBean isNeedCounting(@RequestBody Map<String,String> paramMap) {
+        String barcodeStr = paramMap.get("barcodes");
+        log.info("isNeedCounting: 条码:barcodes:" + barcodeStr);
+        if (ObjectUtil.isEmpty(barcodeStr)) {
+            return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"barcodes"});
+        }
+        Barcode barcode = barcodeManager.findByBarcode(barcodeStr);
+        //已入库的条码需要点料
+        if (barcode == null) {
+            return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"barcode", barcodeStr});
+        }
+        if (barcode.getPutInTime() <= -1) {
+            log.info("isNeedCounting: 条码:" + barcode.getBarcode() + "未入库过，不需要点料");
+            return ResultBean.newErrorResult(1, "", "new barcode");
+        } else {
+            DateTime putIntime = new DateTime(barcode.getPutInTime());
+            log.info("isNeedCounting: 条码:" + barcode.getBarcode() + "首次入库时间=" + DateUtil.toDateString(putIntime, "yyyy-MM-dd HH:mm:ss") + "，需要点料");
+            return ResultBean.newOkResult("true");
+        }
+//        return ResultBean.newErrorResult(-1, "", "not find data");
+    }
+    @ApiOperation("1588点料：传点料数量到服务器")
+    @RequestMapping(value = "xrayUpdateAmount")
+    @AnonymousAccess
+    public ResultBean xrayUpdateAmount(@RequestBody Map<String,String> paramMaps) {
+        String amountStr = paramMaps.get("amount");
+        String barcodeStr = paramMaps.get("barcode");
+        String fullBarcode = paramMaps.get("fullCode");
+        boolean needResolve = false;
+        String offlineMode = paramMaps.get("offlineMode");
+        if (ObjectUtil.isNotEmpty(offlineMode) && offlineMode.equalsIgnoreCase("true")) {
+            needResolve = true;
+        }
+        log.info("xrayUpdateAmount: 点料信息:barcode:" + barcodeStr + ",amount为:" + amountStr + ",offlineMode=" + offlineMode);
+        if (StringUtils.isNotBlank(barcodeStr)) {
+            Barcode barcode = barcodeManager.findByBarcode(barcodeStr);
+            if (needResolve && barcode == null && ObjectUtil.isNotEmpty(fullBarcode)) {
+                //解析条码
+                barcode = codeResolve.resolveOneValideBarcode(fullBarcode);
+            }
+            if (barcode != null) {
+                int oldQty = barcode.getAmount();
+                int qty = NumberUtil.parseInt(amountStr);
+                barcode.setAmount(qty);
+                barcodeManager.save(barcode);
+                log.info("点料信息:barcode:" + barcodeStr + ",旧数量:" + oldQty + ",新数量=" + qty + "");
+                return ResultBean.newOkResult(qty);
+            }
+        }
+        return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"barcode", barcodeStr});
+    }
 }
--- a/src/main/java/com/neotel/smfcore/custom/zhongcheSp1568/ZhongCheSPApi.java
查看文件 @7620bb1
+++ b/src/main/java/com/neotel/smfcore/custom/zhongcheSp1568/ZhongCheSPApi.java
查看文件 @7620bb1
@@ -327,7 +327,7 @@ public class ZhongCheSPApi extends BaseSmfApiListener {
        // 搅拌结束: JB_END
        if (rsType == null) {
-            log.warn("TaskStatusChange: 未找到对应的操作类型，task类型: " + task.getType());
+//            log.warn("TaskStatusChange: 未找到对应的操作类型，task类型: " + task.getType());
            return false;
        }
        return SPStatusChange(url,rsType,barcode,task.getUpdateDate());