From cfb3f2c7e9cde8cc2eb2a19263d0802c0c5410a3 Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期一, 06 四月 2026 15:41:04 +0800
Subject: [PATCH] mes接口

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs |   82 ++++++++++++++++++++++++++---------------
 1 files changed, 52 insertions(+), 30 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs"
index 7cd033f..2bfa380 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/FillingOrderService.cs"
@@ -10,6 +10,7 @@
 using WIDESEA_Core.BaseServices;
 using WIDESEA_Core.Helper;
 using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.MES;
 using WIDESEA_IBasicService;
 using WIDESEA_Model.Models.Basic;
 using WIDESEAWCS_Model.Models.TaskInfo;
@@ -36,39 +37,60 @@
         }
 
         //娣诲姞浜岀淮鐮佷俊鎭�
-        public WebResponseContent InsertFilling(FillingOrder fillingOrder)
+        public Messages InsertFilling(FillingOrder fillingOrder)
         {
-            WebResponseContent content = new WebResponseContent();
-            Dt_FillingOrder Filling = new Dt_FillingOrder();
-
-            //鍒涘缓浜岀淮鐮佷俊鎭�
-            Filling.ArticleNum = fillingOrder.ArticleNum;
-            Filling.ArticleName = fillingOrder.ArticleName;
-            Filling.Specification = fillingOrder.Specification;
-            Filling.batchNum = fillingOrder.batchNum;
-            Filling.BarCode = fillingOrder.BarCode;
-            Filling.WorkOrder = fillingOrder.WorkOrder;
-            Filling.BarNum = (decimal)fillingOrder.BarNum;
-            Filling.CreationTime = fillingOrder.CreationTime;
-            Filling.WorkID = fillingOrder.WorkID;
-            Filling.ProductType = fillingOrder.ProductType;
-            Filling.BarStatus = (int)FillingStatusEnum.Queue;
-            Filling.BarCodeID = fillingOrder.BarCodeID;
-            Filling.ArticleNumID = fillingOrder.ArticleNumID;
-            Filling.MaterialName = fillingOrder.MaterialName;
-            Filling.WarehouseType = fillingOrder.WarehouseType;
-            Filling.MaterialCode = fillingOrder.MaterialCode;
-            Filling.Standby1 = fillingOrder.Standby1;
-            Filling.Standby2 = fillingOrder.Standby2;
-
-            BaseDal.AddData(Filling);
-            //鍙戦�佺粰WCS
-            string address = AppSettings.Get("WCS");
-            if (!string.IsNullOrEmpty(address))
+            Messages Message = new Messages();
+            if (fillingOrder != null)
             {
-                HttpHelper.Post($"{address}/api/FillingOrder/InsertFilling/", fillingOrder.Serialize());
+                //鏌ヨ鏉$爜鍊奸槻姝㈤噸澶�
+                Dt_FillingOrder Fillings = BaseDal.QueryFirst(x=>x.BarCode == fillingOrder.BarCode);
+                if(Fillings != null)
+                {
+                    Message.Status = false;
+                    Message.Code = 500;
+                    Message.Message = "鍙戦�佺殑鏉$爜鍊奸噸澶�";
+                    return Message;
+                }
+                Dt_FillingOrder Filling = new Dt_FillingOrder();
+
+                //鍒涘缓浜岀淮鐮佷俊鎭�
+                Filling.ArticleNum = fillingOrder.ArticleNum;
+                Filling.ArticleName = fillingOrder.ArticleName;
+                Filling.Specification = fillingOrder.Specification;
+                Filling.batchNum = fillingOrder.batchNum;
+                Filling.BarCode = fillingOrder.BarCode;
+                Filling.WorkOrder = fillingOrder.WorkOrder;
+                Filling.BarNum = (decimal)fillingOrder.BarNum;
+                Filling.CreationTime = fillingOrder.CreationTime;
+                Filling.WorkID = fillingOrder.WorkID;
+                Filling.ProductType = fillingOrder.ProductType;
+                Filling.BarStatus = (int)FillingStatusEnum.Queue;
+                Filling.BarCodeID = fillingOrder.BarCodeID;
+                Filling.ArticleNumID = fillingOrder.ArticleNumID;
+                Filling.MaterialName = fillingOrder.MaterialName;
+                Filling.WarehouseType = fillingOrder.WarehouseType;
+                Filling.MaterialCode = fillingOrder.MaterialCode;
+                Filling.Standby1 = fillingOrder.Standby1;
+                Filling.Standby2 = fillingOrder.Standby2;
+
+                BaseDal.AddData(Filling);
+                //鍙戦�佺粰WCS
+                string address = AppSettings.Get("WCS");
+                if (!string.IsNullOrEmpty(address))
+                {
+                    HttpHelper.Post($"{address}/api/FillingOrder/InsertFilling/", fillingOrder.Serialize());
+                }
+
+                Message.Status = true;
+                Message.Code = 200;
             }
-            return content;
+            else
+            {
+                Message.Status = false;
+                Message.Code = 500;
+                Message.Message = "鍙戦�佺殑鏁版嵁涓虹┖";
+            }
+            return Message;
         }
     }
 }

--
Gitblit v1.9.3