From 9077c2065bb89e0948405200f9abab399d19a319 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 23 十二月 2024 21:03:47 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs | 65 ++++++++++++++++++++++++++++++++
1 files changed, 64 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 d29ac01..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,5 +162,61 @@
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();
+ try
+ {
+ string searchValue = saveModel.MainData["searchValue"].ToString();
+ string orderNo = saveModel.MainData["orderNo"].ToString();
+ Dt_ReceiveOrder receiveOrder = Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == orderNo).First();
+ if (receiveOrder == null) throw new Exception($"鏈壘鍒板崟鎹紪鍙枫�恵orderNo}銆戜俊鎭�");
+ List<Dt_ReceiveOrderDetail> receiveOrderDetails = new List<Dt_ReceiveOrderDetail>();
+ if (string.IsNullOrEmpty(searchValue))
+ {
+ receiveOrderDetails = Db.Queryable<Dt_ReceiveOrderDetail>().Where(x => x.ReceiveOrderId == receiveOrder.ReceiveOrderId).ToList();
+ }
+ else
+ {
+ receiveOrderDetails = Db.Queryable<Dt_ReceiveOrderDetail>().Where(x => x.ReceiveOrderId == receiveOrder.ReceiveOrderId && x.MaterielCode == searchValue).ToList();
+ }
+
+ content.OK(data: receiveOrderDetails);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3