From 5496134056ef9b9e2bc290edeb1a4d4716e9f37a Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 18 十二月 2024 17:08:30 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
index c32b46a..188c4e0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
@@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -38,6 +39,12 @@
}
private static object _rowNoLocker = new object();
+ /// <summary>
+ /// 鎵爜娣诲姞鏀惰揣鍗曟槑缁嗭紙鍗曚釜锛�
+ /// </summary>
+ /// <param name="serNum">鐗╂枡鐮�</param>
+ /// <param name="orderNo">鏀惰揣鍗曞彿</param>
+ /// <returns></returns>
public WebResponseContent AddReceiveOrderDetail(string serNum, string orderNo)
{
try
@@ -134,7 +141,7 @@
_inboundRepository.ReceiveOrderRepository.UpdateData(receiveOrder);
_inboundRepository.PurchaseOrderDetailRepository.UpdateData(purchaseOrderDetail);
- if (materielInfo.IsCheck == WIDESEA_Common.CommonEnum.WhetherEnum.True)
+ if (materielInfo.IsCheck == WhetherEnum.True)
{
Dt_CheckOrder checkOrder = _mapper.Map<Dt_CheckOrder>(receiveOrderDetail);
checkOrder.ReceiveOrderNo = receiveOrder.ReceiveOrderNo;
@@ -155,6 +162,35 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+ public WebResponseContent ScaninnerCode(string innerCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var innerCodes = innerCode.Split(',');
+ var matCode = innerCodes.FirstOrDefault(x => x.Contains("M:"));//.Replace("M:", "");
+ if (matCode == null) throw new Exception("鏈幏鍙栧埌鐗╂枡鐮�");
+ var batchNo = innerCodes.FirstOrDefault(x => x.Contains("BS:"));//.Replace("BS:", "")
+ if (batchNo == null) throw new Exception("鏈幏鍙栧埌鎵规鍙�");
+ var purchaseOrderNo = innerCodes.FirstOrDefault(x => x.Contains("PO:"));//.Replace("PO:", "")
+ if (purchaseOrderNo == null) throw new Exception("鏈幏鍙栧埌閲囪喘鍗曞彿");
+ var qty = innerCodes.FirstOrDefault(x => x.Contains("Q:"));
+ if (qty == null) throw new Exception("鏈幏鍙栧埌鏁伴噺");
+ InnerCodeDTO innerCodeDTO = new InnerCodeDTO()
+ {
+ matCode = matCode.Replace("M:", ""),
+ batchNo = batchNo.Replace("BS:", ""),
+ purchaseOrderNo = purchaseOrderNo.Replace("PO:", ""),
+ qty = Convert.ToInt32(qty.Replace("Q:", ""))
+ };
+ content.OK("鎵弿鎴愬姛", data: innerCodeDTO);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
public WebResponseContent GetReceiveOrderInfos(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
--
Gitblit v1.9.3