From 9a0acba23c5b5095be2a89b8ca190fe5202c2ea6 Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期日, 29 十二月 2024 15:58:45 +0800
Subject: [PATCH] 最新修改
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 96 +++++++++++++++++++++++++++---------------------
1 files changed, 54 insertions(+), 42 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
index f5f428e..67ee1f5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
@@ -200,59 +200,71 @@
/// </summary>
/// <param name="inventoryRequest"></param>
/// <returns></returns>
- public ReturnInventoryResponse returnInventory(ReturnInventoryRequest inventoryRequest)
+ public ReturnInventoryResponse returnInventory(string inventoryRequeststr)
{
- string inparam = JsonConvert.SerializeObject(inventoryRequest);
- new LogFactory().GetLog("WMS鎺ュ彛").InfoFormat(true, "returnInventory", "浣欐枡閫�鍥炰俊鎭�", $"{inparam}");
+
+ new LogFactory().GetLog("WMS鎺ュ彛").InfoFormat(true, "returnInventory", "浣欐枡閫�鍥炰俊鎭�", $"{inventoryRequeststr}");
+ ReturnInventoryRequest inventoryRequest = JsonConvert.DeserializeObject<ReturnInventoryRequest>(inventoryRequeststr);
ReturnInventoryResponse response= new ReturnInventoryResponse();
MaterielGroupDTO materielGroupDTO = new MaterielGroupDTO();
materielGroupDTO.PalletCode = inventoryRequest.TPNUM;
materielGroupDTO.OrderNo = inventoryRequest.IZLID; //閫�璐у叆搴撴寚浠�
List<string> SerialNumbers = new List<string>();
- //淇濆瓨鍥為��鏁版嵁鍒版湰鍦�
- Dt_MainReturnInventory dt_MainReturnInventory = new Dt_MainReturnInventory();
- dt_MainReturnInventory.WH_NUMBER= inventoryRequest.WH_NUMBER;
- dt_MainReturnInventory.BUSINESS_CODE = inventoryRequest.BUSINESS_CODE;
- dt_MainReturnInventory.BUSINESS_NAME = inventoryRequest.BUSINESS_NAME;
- dt_MainReturnInventory.WERKS = inventoryRequest.WERKS;
- dt_MainReturnInventory.LGORT = inventoryRequest.LGORT;
- dt_MainReturnInventory.TOTAL_RETURN_QTY=inventoryRequest.TOTAL_RETURN_QTY;
- dt_MainReturnInventory.RETURN_NO = inventoryRequest.RETURN_NO;
- dt_MainReturnInventory.RETURN_ITEM_NO = inventoryRequest.RETURN_ITEM_NO;
- dt_MainReturnInventory.TPNUM = inventoryRequest.TPNUM;
- dt_MainReturnInventory.YLZD1 = inventoryRequest.YLZD1;
- dt_MainReturnInventory.YLZD2 = inventoryRequest.YLZD2;
- dt_MainReturnInventory.YLZD3 = inventoryRequest.YLZD3;
- dt_MainReturnInventory.YLZD4 = inventoryRequest.YLZD4;
- dt_MainReturnInventory.YLZD5 = inventoryRequest.YLZD5;
- dt_MainReturnInventory.IZLID = inventoryRequest.IZLID;
- dt_MainReturnInventory.SYSNOD = inventoryRequest.SYSNOD;
- dt_MainReturnInventory.MO_NO = inventoryRequest.MO_NO;
- foreach (ReturnInventory item in inventoryRequest.DATA)
+ Dt_MainReturnInventory dt_MainReturnInventoryOld = _mainReturnInventoryRepository.QueryFirst(x => x.RETURN_NO == inventoryRequest.RETURN_NO && x.RETURN_ITEM_NO == inventoryRequest.RETURN_ITEM_NO);
+ if (dt_MainReturnInventoryOld == null)
{
- Dt_ReturnInventoryDetail dt_ReturnInventoryDetail = new Dt_ReturnInventoryDetail();
- dt_ReturnInventoryDetail.LABEL_NO = item.LABEL_NO;
- dt_ReturnInventoryDetail.SOBKZ = item.SOBKZ;
- dt_ReturnInventoryDetail.UNIT = item.UNIT;
- dt_ReturnInventoryDetail.LGORT = item.LGORT;
- dt_ReturnInventoryDetail.QTY = item.QTY;
- dt_ReturnInventoryDetail.LIFNR = item.LIFNR;
- dt_ReturnInventoryDetail.F_LGORT = item.F_LGORT;
- dt_ReturnInventoryDetail.MATNR = item.MATNR;
- _ReturnInventoryDetailRepository.AddData(dt_ReturnInventoryDetail);
- SerialNumbers.Add(item.LABEL_NO);
- }
- materielGroupDTO.SerialNumbers = SerialNumbers;
- _mainReturnInventoryRepository.AddData(dt_MainReturnInventory);
- WebResponseContent content = ReturnMaterielGroup(materielGroupDTO, inventoryRequest);
- if(content.Status)
- {
- response.MSGTY = "S";
+ //淇濆瓨鍥為��鏁版嵁鍒版湰鍦�
+ Dt_MainReturnInventory dt_MainReturnInventory = new Dt_MainReturnInventory();
+ dt_MainReturnInventory.WH_NUMBER = inventoryRequest.WH_NUMBER;
+ dt_MainReturnInventory.BUSINESS_CODE = inventoryRequest.BUSINESS_CODE;
+ dt_MainReturnInventory.BUSINESS_NAME = inventoryRequest.BUSINESS_NAME;
+ dt_MainReturnInventory.WERKS = inventoryRequest.WERKS;
+ dt_MainReturnInventory.LGORT = inventoryRequest.LGORT;
+ dt_MainReturnInventory.TOTAL_RETURN_QTY = inventoryRequest.TOTAL_RETURN_QTY;
+ dt_MainReturnInventory.RETURN_NO = inventoryRequest.RETURN_NO;
+ dt_MainReturnInventory.RETURN_ITEM_NO = inventoryRequest.RETURN_ITEM_NO;
+ dt_MainReturnInventory.TPNUM = inventoryRequest.TPNUM;
+ dt_MainReturnInventory.YLZD1 = inventoryRequest.YLZD1;
+ dt_MainReturnInventory.YLZD2 = inventoryRequest.YLZD2;
+ dt_MainReturnInventory.YLZD3 = inventoryRequest.YLZD3;
+ dt_MainReturnInventory.YLZD4 = inventoryRequest.YLZD4;
+ dt_MainReturnInventory.YLZD5 = inventoryRequest.YLZD5;
+ dt_MainReturnInventory.IZLID = inventoryRequest.IZLID;
+ dt_MainReturnInventory.SYSNOD = inventoryRequest.SYSNOD;
+ dt_MainReturnInventory.MO_NO = inventoryRequest.MO_NO;
+ foreach (ReturnInventory item in inventoryRequest.DATA)
+ {
+ Dt_ReturnInventoryDetail dt_ReturnInventoryDetail = new Dt_ReturnInventoryDetail();
+ dt_ReturnInventoryDetail.LABEL_NO = item.LABEL_NO;
+ dt_ReturnInventoryDetail.SOBKZ = item.SOBKZ;
+ dt_ReturnInventoryDetail.UNIT = item.UNIT;
+ dt_ReturnInventoryDetail.LGORT = item.LGORT;
+ dt_ReturnInventoryDetail.QTY = item.QTY;
+ dt_ReturnInventoryDetail.LIFNR = item.LIFNR;
+ dt_ReturnInventoryDetail.F_LGORT = item.F_LGORT;
+ dt_ReturnInventoryDetail.MATNR = item.MATNR;
+ _ReturnInventoryDetailRepository.AddData(dt_ReturnInventoryDetail);
+ SerialNumbers.Add(item.LABEL_NO);
+ }
+ materielGroupDTO.SerialNumbers = SerialNumbers;
+ _mainReturnInventoryRepository.AddData(dt_MainReturnInventory);
+ WebResponseContent content = ReturnMaterielGroup(materielGroupDTO, inventoryRequest);
+ if (content.Status)
+ {
+ response.MSGTY = "S";
+ response.MSGTX = "";
+ }
+ else
+ {
+ response.MSGTY = "E";
+ response.MSGTX = content.Message;
+ }
}
else
{
response.MSGTY = "E";
- response.MSGTX = content.Message;
+ response.MSGTX = "涓嶈兘閲嶅鐢宠锛�";
+
}
return response;
}
--
Gitblit v1.9.3