From e86267955cdfb66abd8e807f0a9cd76d61680a84 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 10 十二月 2025 14:13:58 +0800
Subject: [PATCH] 库存明细统计导出

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 368cdfc..32ee656 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -34,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Created by vincent on 2022/4/9
@@ -839,11 +840,15 @@
         if (ts == null) {
             throw new CoolException("timestamp 鐢熸垚澶辫触");
         }
+
+        String barcode = String.valueOf(ts);
+        if (barcode.length() > 16) {
+            barcode = barcode.substring(0, 16);
+        }
+        basAgvMast.setBarcode(barcode);
+
         String locNo = null;
         String staNo = null;
-
-        basAgvMast.setBarcode(Long.toString(ts));
-
         basAgvMast.setTaskNo(commonService.getWorkNo(0));
         basAgvMast.setSourceStaNo(param.getSourceStaNo());
         basAgvMast.setStaNo(param.getStaNo());
@@ -872,7 +877,7 @@
         basAgvMastService.insert(basAgvMast);
 
         bindCtnrAndBinParam bindParam = new bindCtnrAndBinParam();
-        bindParam.setBarcode(Long.toString(ts));
+        bindParam.setBarcode(basAgvMast.getBarcode());
         bindParam.setIndBind("1");
         bindParam.setFloorNo(basAgvMast.getFloorNo());
         bindParam.setLocNo(locNo);
@@ -1046,7 +1051,11 @@
             }
             return false;
         }else {
-            if (basAgvMast.getIoType()==0 && (basAgvMast.getSourceStaNo()==2033 || basAgvMast.getStaNo()==4003)){
+            if (basAgvMast != null
+                    && basAgvMast.getIoType() != null
+                    && (basAgvMast.getIoType() == 0)
+                    && (Objects.equals(basAgvMast.getSourceStaNo(), 2033) || Objects.equals(basAgvMast.getStaNo(), 2034)
+                    || Objects.equals(basAgvMast.getStaNo(), 4003)|| Objects.equals(basAgvMast.getSourceStaNo(), 4006))){
                 AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
                 agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
                 agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());

--
Gitblit v1.9.1