From e1383d0a6ee0558c34f013f4e2561063bc2353b3 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期日, 26 十月 2025 09:40:45 +0800
Subject: [PATCH] 修改盘点移入历史
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
index 355747b..f475cd1 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
@@ -139,7 +139,7 @@
}
else if (order.order_type == "5")//鎶ユ孩鍏ュ簱
{
-
+ _cabinOrderServices.CreateCheckInOrder(order);
}
};
_cabinOrderServices.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
@@ -173,8 +173,8 @@
var responseContent = new WebResponseContent();
try
{
- var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
- //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ //var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
+ var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
if (string.IsNullOrEmpty(SearchOutDate)) SearchOutDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//// 璇锋眰鍙傛暟
var requestData = new
@@ -259,7 +259,7 @@
}
else if (outorder.order_type == "6")//鎶ユ崯鍑哄簱
{
-
+ _deliveryOrderServices.CreateCheckOutOrder(outorder);
}
}
@@ -344,7 +344,7 @@
//鍏ュ簱鍗曞彿
externalOrderNo = order.Order_no,
//鍏ュ簱鍗曠被鍨�
- inOrderType = order.Order_type == "1" ? "10" : "20",
+ inOrderType = order.Order_type == "5" ? "20" : "10",
//浼樺厛绾�
priority = 0,
//鏄惁鍙栨秷
@@ -413,11 +413,12 @@
public WebResponseContent EdiOut()
{
var responseContent = new WebResponseContent();
+ var WarehouseLk = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
try
{
// 1. 鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご=鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
var outOrders = _deliveryOrderServices.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
- .Where(o => o.OutStatus == "鏂板缓" && o.Warehouse_no == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
+ .Where(o => o.OutStatus == "鏂板缓" && o.Warehouse_no == WarehouseLk)
.Includes(o => o.Details, d => d.MedicineGoods)
.ToList();
@@ -445,13 +446,23 @@
//濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
materialCode = firstDetail.MedicineGoods.MaterielErpType;
}
+ switch (order.Out_type)
+ {
+ case "1"://姝ｅ父鍑哄簱
+ case "3"://鍏ュ簱閫�璐�
+ order.Out_type = "10";//涓�鑸氦鏄撳嚭搴撳崟
+ break;
+ case "6"://鐩樹簭鍑哄簱
+ order.Out_type = "30";//鐩樹簭鍑哄簱鍗�
+ break;
+ }
// 3. 缁勮 DTO
var ediDto = new TowcsDto.ToediOutInfo
{
customerCode = "905",
materialCode = materialCode,
externalOrderNo = order.Out_no,
- outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "3" ? "20" : "30",//鍑哄簱鍗曠被鍨嬫槸1灏辨槸姝ｅ父鐨勶紝3灏辨槸鐩樼偣
+ outOrderType = order.Out_type,//20鏄洏鐐瑰嚭搴撳崟
priority = 1,
Is_cancel = 0,
details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
@@ -471,8 +482,8 @@
};
// 4. 璋冪敤鎺ュ彛
- var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
- //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
+ //var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
+ var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
var result = HttpHelper.Post(url, ediDto.ToJsonString());
var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
--
Gitblit v1.9.3