From 8cdcf8cb6fecf101bd7dd1db2e44f0cf5ddc0fd4 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 15 十二月 2025 10:11:41 +0800
Subject: [PATCH] 添加移位功能，以及修改pad
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index 2c182d4..16e7406 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -200,8 +200,8 @@
cabinOrderDetail.Order_Inqty += Inqty;
if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
return WebResponseContent.Instance.Error($"鍏ュ簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
- //澶т欢搴撴暣绠辨牎楠�
- if (warehouseCode == WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000")&& (materielInfo.MaterielSourceType==MaterielSourceTypeEnum.SelfMadePart))
+ //澶т欢搴撴暣绠辨牎楠�(鎺掗櫎绉诲簱鍏ュ簱)
+ if (warehouseCode == WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000")&& (materielInfo.MaterielSourceType==MaterielSourceTypeEnum.SelfMadePart) &&cabinOrder.Order_type != "40") // 40鏄Щ浣嶅叆搴撶被鍨�)
{
var BoxRule = materielInfo.BoxQty;
if (BoxRule > 0 && Inqty % BoxRule != 0)
@@ -311,6 +311,23 @@
//};
//_supplyTaskService.AddData(supplyTask);
#endregion
+
+ #region 鏂板鍔犱换鍔＄被鍨嬧��40鈥濈Щ搴撳嚭搴�
+ int taskType;
+
+ switch (cabinOrder.Order_type)
+ {
+ case "1":
+ taskType = TaskTypeEnum.In.ObjToInt();
+ break;
+ case "40":
+ taskType = TaskTypeEnum.TransferIn.ObjToInt();
+ break;
+ default:
+ taskType = TaskTypeEnum.OutReturn.ObjToInt(); // 鍏朵粬鎯呭喌閮芥槸鍑哄簱閫�璐�
+ break;
+ }
+ #endregion
Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
{
WarehouseCode = cabinOrderDetail.Reservoirarea,
@@ -322,7 +339,9 @@
MaterielName = inventoryInfo.MaterielName,
MaterielCode = inventoryInfo.MaterielCode,
MaterielSpec = inventoryInfo.MaterielSpec,
- TaskType = cabinOrder.Order_type == "1" ? TaskTypeEnum.In.ObjToInt() : TaskTypeEnum.OutReturn.ObjToInt(),
+ //TaskType = cabinOrder.Order_type == "1" ? TaskTypeEnum.In.ObjToInt() : TaskTypeEnum.OutReturn.ObjToInt(),
+ //浠诲姟绫诲瀷
+ TaskType = taskType,
CreateDate = DateTime.Now,
Creater = App.User.UserName,
LocationCode = location.LocationCode,
@@ -331,6 +350,7 @@
SupplyQuantity = 0,
Remark = "鍏ュ簱"
};
+
_supplyTaskHtyService.AddData(supplyTask_Hty);
#endregion
@@ -380,7 +400,8 @@
#region 鍒涘缓鍏ュ簱鍗�
/// <summary>
- /// 鍒涘缓鍏ュ簱鍗�,杩斿洖涓�涓叆搴撳崟闆嗗悎鍒癲ata
+ /// 鍒涘缓鍏ュ簱鍗�,杩斿洖涓�涓叆搴撳崟闆嗗悎鍒癲ata
+ /// 鍦ㄥ垱寤哄叆搴撳崟鐨勬椂鍊欏氨宸茬粡娣诲姞浜嗕笟鍔℃暟閲忥紝鍚庣画涓氬姟鏁伴噺鐨勫鍔犲湪鍏ュ簱瀹屾垚鐨勬椂鍊欒繘琛岋紙鐩樼泩鍏ュ簱锛�
/// </summary>
public WebResponseContent CreateInboundOrder(UpstreamOrderInfo order)
{
@@ -503,7 +524,7 @@
OrderDetailStatus = "鏂板缓",
Status = 0
};
- materielInfo.Business_qty += ys;
+ materielInfo.Business_qty += ys;//杩欓噷娣诲姞浜嗕笟鍔℃暟閲�
}
#endregion
--
Gitblit v1.9.3