From 01824c5104590b96a3040faa317969bcd812bcca Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 08:17:04 +0800
Subject: [PATCH] Merge branch 'xgmFlasrs' into xgmFlasrs2 hebing

---
 src/main/java/com/zy/asrs/utils/VersionUtils.java            |    3 ++-
 src/main/java/com/zy/third/erp/task/ERPItemService.java      |   10 +++++++---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |    2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index a788a36..4a5d121 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -102,6 +102,7 @@
                                 if (orderDetl.getMatnr().equals(wrkDetl.getMatnr())) {
                                     OrderDetl newOrderDetl = new OrderDetl();
                                     newOrderDetl.sync(wrkDetl);
+                                    newOrderDetl.setAnfme(orderDetl.getAnfme());
                                     newOrderDetl.setQty(orderDetl.getAnfme());
                                     newOrderDetl.setOrderId(order.getId());
                                     newOrderDetl.setOrderNo(orderNo);
@@ -119,6 +120,7 @@
                                 if (orderDetl.getMatnr().equals(wrkDetl.getMatnr()) && orderDetl.getBatch().equals(wrkDetl.getBatch())) {
                                     OrderDetl newOrderDetl = new OrderDetl();
                                     newOrderDetl.sync(wrkDetl);
+                                    newOrderDetl.setAnfme(orderDetl.getAnfme());
                                     newOrderDetl.setQty(orderDetl.getAnfme());
                                     newOrderDetl.setOrderId(order.getId());
                                     newOrderDetl.setOrderNo(orderNo);
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index bdf8dd8..4f59591 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -28,7 +28,8 @@
      **/
     public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
         // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
-        return dto.getLocType1().equals(loc.getLocType1());
+
+        return loc.getLocType1() >= dto.getLocType1();
     }
 
 }
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemService.java b/src/main/java/com/zy/third/erp/task/ERPItemService.java
index fb751fc..8a81a98 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemService.java
@@ -77,10 +77,14 @@
                     }
                 }
             }
-            priTag = tagService.selectByName(itemTB.getItemKind(), 2);
-            mat = sync(mat, itemTB);
+            if (!Cools.isEmpty(itemTB.getItemKind())) {
+                priTag = tagService.selectByName(itemTB.getItemKind(), 2);
+            }
 
-            mat.setTagId(priTag.getId());
+            mat = sync(mat, itemTB);
+            if (priTag!=null){
+                mat.setTagId(priTag.getId());
+            }
             mat.setStatus(1);
             mat.setCreateTime(now);
             mat.setUpdateTime(now);

--
Gitblit v1.9.1