From b39f01141a3ec0dfff105647a485033f7cf27dc7 Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期五, 28 二月 2025 09:02:26 +0800
Subject: [PATCH] 增加数据脚本
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 352 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 307 insertions(+), 45 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 a8c5962..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"
@@ -1,7 +1,10 @@
锘縰sing AutoMapper;
+using LogLibrary.Log;
+using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Reflection.Metadata;
using System.Text;
@@ -17,9 +20,13 @@
using WIDESEA_IBasicService;
using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
+using WIDESEA_InboundRepository;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoRepository;
+using WIDESEA_Model;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Inbound;
+using WIDESEA_Model.Models.System.Request;
namespace WIDESEA_InboundService
{
@@ -46,65 +53,264 @@
WebResponseContent content = new WebResponseContent();
try
{
- List<MatSerialNumberDTO> matSerialNumberDTOs = CodeAnalysisHelper.CodeAnalysis<MatSerialNumberDTO>(AnalysisCode.InnerCode, materielGroupDTO.SerialNumbers);
- (bool, string, object?) result2 = ModelValidate.ValidateModelData(matSerialNumberDTOs);
- if (!result2.Item1) return content = WebResponseContent.Instance.Error(result2.Item2);
-
- List<string> materielCodes = matSerialNumberDTOs.GroupBy(x => x.MaterielCode).Select(x => x.Key).ToList();
-
- List<Dt_MaterielInfo> materielInfos = _basicService.MaterielInfoService.GetMaterielInfos(materielCodes);
-
- Dt_InboundOrder inboundOrder = GetInboundOrder(materielGroupDTO.OrderNo);
-
-
+ materielGroupDTO.OrderNo = GetOrderNo();
Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(materielGroupDTO.PalletCode);
-
- (bool, string, object?) result = CheckMaterielGroupParam(materielGroupDTO, matSerialNumberDTOs, materielInfos, materielCodes, inboundOrder, stockInfo);
+ (bool, string, object?) result = CheckMaterielGroupParam(materielGroupDTO, stockInfo);
if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
-
if (stockInfo == null)
{
stockInfo = new Dt_StockInfo();
- stockInfo.Details = new List<Dt_StockInfoDetail>();
- }
-
- List<Dt_StockInfoDetail> stockInfoDetails = _mapper.Map<List<Dt_StockInfoDetail>>(matSerialNumberDTOs);
- stockInfoDetails.ForEach(x =>
- {
- x.Status = 0;
- x.OrderNo = inboundOrder.OrderNo;
- x.MaterielName = materielInfos.FirstOrDefault(v => v.MaterielCode == x.MaterielCode)?.MaterielName ?? "";
- x.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0;
- });
- if (stockInfo.Id == 0)
- {
stockInfo.PalletCode = materielGroupDTO.PalletCode;
stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
+ stockInfo.Creater = "绔嬪簱WMS";
+ stockInfo.Details = new List<Dt_StockInfoDetail>();
+
}
- stockInfo.Details.AddRange(stockInfoDetails);
-
- List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
- for (int i = 0; i < materielCodes.Count; i++)
+ List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
+ List<Dt_LabelMaster> notExistLabels = new List<Dt_LabelMaster>();
+ foreach (var lablel in materielGroupDTO.SerialNumbers)
{
- decimal stockQuantity = stockInfoDetails.Where(x => x.MaterielCode == materielCodes[i]).Sum(x => x.StockQuantity);
- inboundOrderDetails.AddRange(_inboundOrderDetailService.UpdateReceiptQuantity(inboundOrder.Details.Where(x => x.MaterielCode == materielCodes[i]).ToList(), stockQuantity));
- }
- List<int> updateDetailIds = inboundOrderDetails.Select(x => x.Id).ToList();
- if (inboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null && inboundOrder.Details.FirstOrDefault(x => !updateDetailIds.Contains(x.Id) && x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) == null)
- {
- inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
- BaseDal.DeleteAndMoveIntoHty(inboundOrder, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- for (int i = 0; i < inboundOrderDetails.Count; i++)
+ Dt_LabelMaster labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == lablel);
+ if(labmaster == null)
{
- _inboundOrderDetailService.Repository.DeleteAndMoveIntoHty(inboundOrderDetails[i], App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ //閫氳繃鏉＄爜鎺ュ彛鍚屾鏉＄爜涓绘暟鎹�
+ var res= _sys_JobService.GetLabMaster(lablel);
+ if (res != null && res.Status)
+ {
+ labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == lablel);
+ if (labmaster == null)
+ {
+ notExistLabels.Add(labmaster);
+ }
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("缁勭洏鏉＄爜鍦ㄤ笂娓竁MS绯荤粺涓笉瀛樺湪!");
+ }
+ }
+ if(labmaster!=null)
+ {
+ //涓绘暟鎹潯鐮佺姸鎬佸厑璁哥粍鐩橈細01宸叉敹鏂欏緟璐ㄦ锛�02宸叉敹鏂欐棤闇�璐ㄦ锛�03寰呰繘浠撳凡璐ㄦ锛�09宸蹭笅鏋讹紱
+ //涓绘暟鎹潯鐮佺姸鎬佷笉鍏佽缁勭洏锛�00鍒涘缓锛�04宸茶川妫�寰呴��璐э紝05鏀舵枡鎴块��璐э紝06搴撴埧閫�璐э紝07宸茶繘浠擄紝08宸蹭笂鏋讹紝10宸插嚭搴擄紝11宸插喕缁擄紝12宸查攣瀹氾紝20鍏抽棴鐨勶紱
+ if (labmaster.LABEL_STATUS=="00"|| labmaster.LABEL_STATUS == "04" || labmaster.LABEL_STATUS == "05"|| labmaster.LABEL_STATUS == "06" || labmaster.LABEL_STATUS == "07" || labmaster.LABEL_STATUS == "08" || labmaster.LABEL_STATUS == "10" || labmaster.LABEL_STATUS == "11" || labmaster.LABEL_STATUS == "12" || labmaster.LABEL_STATUS == "20")
+ {
+ return content = WebResponseContent.Instance.Error("涓绘暟鎹潯鐮佺姸鎬佷笉鍏佽缁勭洏!鏉＄爜鐘舵�侊細"+ labmaster.LABEL_STATUS);
+ }
}
}
- else if (inboundOrder.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt())
+ if (notExistLabels.Count == 0)
{
- inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
- }
+ foreach (var item in materielGroupDTO.SerialNumbers)
+ {
+ Dt_LabelMaster labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == item);
+ Dt_StockInfoDetail dt_StockInfoDetail = new Dt_StockInfoDetail();
+ dt_StockInfoDetail.Status = 0;
+ dt_StockInfoDetail.OrderNo = materielGroupDTO.OrderNo;
+ dt_StockInfoDetail.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0;
+ dt_StockInfoDetail.MaterielCode = labmaster.MATNR;
+ dt_StockInfoDetail.MaterielName = labmaster.MAKTX;
+ dt_StockInfoDetail.BatchNo = labmaster.BATCH;
+ dt_StockInfoDetail.SerialNumber = labmaster.LABEL_NO;
+ dt_StockInfoDetail.StockQuantity = int.Parse(labmaster.BOX_QTY);
+ dt_StockInfoDetail.OutboundQuantity = 0;
+ dt_StockInfoDetail.Creater = "System";
+ stockInfoDetails.Add(dt_StockInfoDetail);
+ stockInfo.Details.AddRange(stockInfoDetails);
+ }
+ content = MaterielGroupUpdateData(stockInfo);
- content = MaterielGroupUpdateData(inboundOrder, inboundOrderDetails, stockInfo);
+ }
+ else
+ {
+ content = WebResponseContent.Instance.Error("缁勭洏鏉＄爜鍦ㄤ笂娓竁MS绯荤粺涓笉瀛樺湪!");
+ }
+
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+
+ }
+ return content;
+ }
+
+
+ /// <summary>
+ /// 浣欐枡閫�鍥炵粍鐩�
+ /// </summary>
+ /// <param name="materielGroupDTO"></param>
+ /// <returns></returns>
+ public WebResponseContent ReturnMaterielGroup(MaterielGroupDTO materielGroupDTO, ReturnInventoryRequest inventoryRequest)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(materielGroupDTO.PalletCode);
+ (bool, string, object?) result = CheckMaterielGroupParam(materielGroupDTO, stockInfo);
+ if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
+ if (stockInfo == null)
+ {
+ stockInfo = new Dt_StockInfo();
+ stockInfo.PalletCode = materielGroupDTO.PalletCode;
+ stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
+ stockInfo.Creater = "WMS";
+ stockInfo.Details = new List<Dt_StockInfoDetail>();
+
+ }
+ List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
+
+ foreach (var item in inventoryRequest.DATA)
+ {
+
+ Dt_StockInfoDetail dt_StockInfoDetail = new Dt_StockInfoDetail();
+ dt_StockInfoDetail.Status = 0;
+ dt_StockInfoDetail.OrderNo = materielGroupDTO.OrderNo;
+ dt_StockInfoDetail.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0;
+ dt_StockInfoDetail.MaterielCode = item.MATNR;
+ dt_StockInfoDetail.MaterielName = "";
+ dt_StockInfoDetail.BatchNo = "";
+ dt_StockInfoDetail.SerialNumber = item.LABEL_NO;
+ dt_StockInfoDetail.StockQuantity = int.Parse(item.QTY);
+ dt_StockInfoDetail.OutboundQuantity = 0;
+ dt_StockInfoDetail.Creater = "WMS";
+ stockInfoDetails.Add(dt_StockInfoDetail);
+ stockInfo.Details.AddRange(stockInfoDetails);
+ }
+ content = MaterielGroupUpdateData(stockInfo);
+
+
+
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+
+ }
+ return content;
+ }
+
+ /// <summary>
+ /// 鏍规嵁BYDWMS缁勭洏淇℃伅锛屽啀鐢熸垚绔嬪簱缁勭洏淇℃伅
+ /// </summary>
+ /// <param name="inventoryRequest"></param>
+ /// <returns></returns>
+ public ReturnInventoryResponse returnInventory(string inventoryRequeststr)
+ {
+
+ 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_MainReturnInventoryOld = _mainReturnInventoryRepository.QueryFirst(x => x.RETURN_NO == inventoryRequest.RETURN_NO && x.RETURN_ITEM_NO == inventoryRequest.RETURN_ITEM_NO);
+ if (dt_MainReturnInventoryOld == null)
+ {
+ //淇濆瓨鍥為��鏁版嵁鍒版湰鍦�
+ 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 = "涓嶈兘閲嶅鐢宠锛�";
+
+ }
+ return response;
+ }
+ /// <summary>
+ /// 鐢熸垚璁㈠崟鍙�
+ /// </summary>
+ /// <returns></returns>
+ public string GetOrderNo()
+ {
+ DataTable dt = BaseDal.QueryTable("SELECT FORMAT(NEXT VALUE FOR dbo.seqOrderNum, '000000000');");
+ return DateTime.Now.ToString("yyyyMMdd") + dt.Rows[0][0].ToString();
+ }
+
+ /// <summary>
+ /// 鎾ら攢缁勭洏
+ /// </summary>
+ /// <param name="materielGroupDTO"></param>
+ /// <returns></returns>
+ public WebResponseContent MaterielGroupRevoke(string PalletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(PalletCode);
+ if(stockInfo != null)
+ {
+ if(stockInfo.StockStatus!= (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ {
+ return content = WebResponseContent.Instance.Error("缁勭洏鏆傚瓨鐘舵�佹墠鍙互鎾ら攢缁勭洏锛�");
+ }
+ else
+ {
+ stockInfo.StockStatus = (int)StockStatusEmun.缁勭洏鎾ら攢;
+ foreach (var item in stockInfo.Details)
+ {
+ item.Status = (int)OutStockStatus.鎾ら攢;
+ }
+ }
+ content = MaterielGroupUpdateData(stockInfo);
+
+ }
+ else
+ {
+ return content = WebResponseContent.Instance.Error("缁勭洏淇℃伅涓嶅瓨鍦紒");
+ }
+
}
catch (Exception ex)
{
@@ -141,6 +347,30 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+ /// <summary>
+ /// 缁勭洏鏁版嵁鏇存柊
+ /// </summary>
+ /// <param name="inboundOrder">鍏ュ簱鍗�</param>
+ /// <param name="inboundOrderDetails">鍏ュ簱鍗曟槑缁�</param>
+ /// <param name="stockInfo">缁勭洏鏁版嵁</param>
+ /// <returns></returns>
+ public WebResponseContent MaterielGroupUpdateData(Dt_StockInfo stockInfo)
+ {
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+ _stockService.StockInfoService.AddMaterielGroup(stockInfo);
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
/// <summary>
/// 楠岃瘉缁勭洏鏁版嵁
@@ -219,6 +449,38 @@
return (true, "鎴愬姛", materielGroupDTO);
}
+
+ /// <summary>
+ /// 楠岃瘉缁勭洏鏁版嵁
+ /// </summary>
+ /// <param name="materielGroupDTO">鐗╂枡缁勭洏DTO</param>
+ /// <param name="stockInfo">缁勭洏淇℃伅</param>
+ /// <returns></returns>
+ public (bool, string, object?) CheckMaterielGroupParam(MaterielGroupDTO materielGroupDTO, Dt_StockInfo stockInfo)
+ {
+ (bool, string, object?) result = ModelValidate.ValidateModelData(materielGroupDTO);
+ if (!result.Item1) return result;
+
+ if (_taskRepository.QueryFirst(x => x.PalletCode == materielGroupDTO.PalletCode) != null)
+ {
+ return (false, "璇ユ墭鐩樺彿宸叉湁浠诲姟", materielGroupDTO);
+ }
+
+ if (stockInfo != null && !string.IsNullOrEmpty(stockInfo.LocationCode) && stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
+ {
+ return (false, "宸蹭笂鏋剁殑鎵樼洏涓嶈兘鍐嶆缁勭洏", materielGroupDTO);
+ }
+
+ if (_stockService.StockInfoDetailService.ExistSerialNumbers(materielGroupDTO.SerialNumbers))
+ {
+ return (false, "鏈夊簭鍒楀彿鍦ㄥ簱瀛樹腑宸插瓨鍦�", materielGroupDTO);
+ }
+
+ return (true, "鎴愬姛", materielGroupDTO);
+ }
+
+
+
/// <summary>
/// PDA鍒嗛〉鏌ヨ鏁版嵁
/// </summary>
--
Gitblit v1.9.3