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_TaskInfoService/TaskService.cs | 128 ++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 68 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index eccebd5..a57d982 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -42,6 +42,7 @@
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
+using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
@@ -53,6 +54,7 @@
using WIDESEA_ITaskInfoService;
using WIDESEA_Model;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Inbound;
using WIDESEA_TaskInfoRepository;
using OrderByType = SqlSugar.OrderByType;
@@ -79,6 +81,8 @@
private readonly IOutboundOrderDetail_HtyRepository _outboundOrderDetail_HtyRepository;
private readonly IOutBoundOrderBYDRepository _outBoundOrderBYDRepository;
private readonly IOutboundOrderDetailBYDRepository _outboundOrderDetailByDRepository;
+ private readonly IMainReturnInventoryRepository _mainReturnInventoryRepository;
+ private readonly IReturnInventoryDetailRepository _returnInventoryDetailRepository;
public ITaskRepository Repository => BaseDal;
private Dictionary<string, OrderByType> _OutLockOrderBy = new Dictionary<string, OrderByType>()
@@ -88,7 +92,7 @@
};
- public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, ISys_JobService sys_JobService, ILabelMasterRepository labelMasterRepository, IOutStockLockInfoRepository outStockLockInfoRepository, IOutboundOrderDetailRepository outboundOrderDetailRepository, IOutBoundOrderBYDRepository outBoundOrderBYDRepository, IOutboundOrderDetailBYDRepository outboundOrderDetailByDRepository, IOutboundOrderRepository outboundOrderRepository, IOutboundOrder_HtyRepository outboundOrder_HtyRepository, IOutboundOrderDetail_HtyRepository outboundOrderDetail_HtyRepository) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, ISys_JobService sys_JobService, ILabelMasterRepository labelMasterRepository, IOutStockLockInfoRepository outStockLockInfoRepository, IOutboundOrderDetailRepository outboundOrderDetailRepository, IOutBoundOrderBYDRepository outBoundOrderBYDRepository, IOutboundOrderDetailBYDRepository outboundOrderDetailByDRepository, IOutboundOrderRepository outboundOrderRepository, IOutboundOrder_HtyRepository outboundOrder_HtyRepository, IOutboundOrderDetail_HtyRepository outboundOrderDetail_HtyRepository, IReturnInventoryDetailRepository returnInventoryDetailRepository,IMainReturnInventoryRepository mainReturnInventoryRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -108,6 +112,9 @@
_outboundOrderRepository = outboundOrderRepository;
_outboundOrder_HtyRepository = outboundOrder_HtyRepository;
_outboundOrderDetail_HtyRepository = outboundOrderDetail_HtyRepository;
+ _returnInventoryDetailRepository = returnInventoryDetailRepository;
+ _mainReturnInventoryRepository = mainReturnInventoryRepository;
+
}
@@ -470,69 +477,57 @@
return WebResponseContent.Instance.Error(ex.Message);
}
- //浣欐枡鍏ュ簱瀹屾垚鍚庯紝闇�瑕佸皢缁勭洏淇℃伅璋冪敤涓婃父WMS鍘熸枡涓婃灦缁撴灉鎺ュ彛
+ //浣欐枡鍏ュ簱瀹屾垚鍚庯紝闇�瑕佸皢缁勭洏淇℃伅璋冪敤涓婃父WMS浣欐枡閫�鍥炵粨鏋滄帴鍙�
#region 鍥炰紶閫昏緫澶勭悊
- //try
- //{
- // PutAwayRequest request = new PutAwayRequest();
- // List<PutAway> itemData = new List<PutAway>();
- // request.ITEMDATA = itemData;
- // request.WERKS = AppSettings.Configuration["WERKS"];
- // request.WH_NUMBER = AppSettings.Configuration["WERKS"];
- // request.IZLID = request.WERKS + request.WH_NUMBER + DateTime.Now.ToString("yyyyMMdd") + task.TaskNum.ToString();
- // request.CREATE_DATE = task.CreateDate.ToString("yyyy-MM-dd HH:mm:ss");
- // request.PSTNG_DATE = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- // request.INBOUND_NO = "";//todo:鍗曞彿瑕佷粠鏉＄爜涓绘暟鎹腑鑾峰彇锛屼笉鐒跺洖浼犱細鎻愮ず锛氳鏉＄爜鏃犺繘浠撳崟鏁版嵁锛�
- // request.RECEIPT_NO = "";//todo:鍗曞彿瑕佷粠鏉＄爜涓绘暟鎹腑锛屼笉鐒跺洖浼犱細鎻愮ず锛氳鏉＄爜鏃犺繘浠撳崟鏁版嵁锛�
- // Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
- // foreach (Dt_StockInfoDetail detail in stockInfo.Details)
- // {
- // Dt_LabelMaster labMaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == detail.SerialNumber);
- // if (labMaster != null)
- // {
- // if (request.INBOUND_NO == "")
- // {
- // request.INBOUND_NO = labMaster.INBOUND_NO;
- // }
- // if (request.RECEIPT_NO == "")
- // {
- // request.RECEIPT_NO = labMaster.RECEIPT_NO;
- // }
- // PutAway putAway = new PutAway();
- // putAway.MATNR = labMaster.MATNR;
- // putAway.BATCH = labMaster.BATCH;
- // putAway.LIFNR = labMaster.LIFNR;
- // putAway.LIKTX = labMaster.LIKTX;
- // putAway.RECEIPT_QTY = labMaster.BOX_QTY;
- // putAway.UNIT = labMaster.UNIT;
- // putAway.LABEL_NO = labMaster.LABEL_NO;
- // putAway.PACK_LABEL_NO = labMaster.Pack_LABEL_No;
- // putAway.PALLET_LABEL_NO = labMaster.Pallet_label_no;
- // putAway.TPNUM = task.PalletCode;
- // putAway.FLAG = "0";
- // putAway.TKTXT = "";
- // putAway.PO_NO = labMaster.PO_NO;
- // putAway.PO_ITEM_NO = labMaster.PO_ITEM_NO;
- // putAway.SOBKZ = labMaster.SOBKZ;
- // putAway.RECEIPT_ITEM_NO = labMaster.RECEIPT_ITEM_NO;
- // putAway.INBOUND_NO = task.TaskNum.ToString();
- // //LABEL _STATUS 鏉＄爜鐘舵�� 02宸叉敹鏂�(鏃犻渶璐ㄦ)03 寰呰繘浠�(宸茶川妫�)锛屽苟涓旓紝QC RESULT CODE璐ㄦ鐘舵�佷负鈥�02鈥� 鎵嶅厑璁′笂鏋�
- // if (labMaster.QC_RESULT_CODE == "02" && (labMaster.LABEL_STATUS == "02" || labMaster.LABEL_STATUS == "03"))
- // {
- // itemData.Add(putAway);
- // }
+ try
+ {
+ PutAwayReturnRequest request = new PutAwayReturnRequest();
+ List<PutAwayReturn> DATA = new List<PutAwayReturn>();
+ request.DATA = DATA;
+ request.WERKS = AppSettings.Configuration["WERKS"];
+ request.WH_NUMBER = AppSettings.Configuration["SYSNO"];
+ request.IZLID = task.OrderNo;//杩欎釜鍊间細鍦ㄦ帴鏀朵笂娓稿洖搴撶粍鐩樹俊鎭椂锛屽瓨鍦ㄥ簱瀛樿〃涓紝鍐嶅瓨鍒颁换鍔¤〃涓�
+ Dt_MainReturnInventory mainReturnInventory = _mainReturnInventoryRepository.QueryFirst(x => x.IZLID == task.OrderNo);
+ if (mainReturnInventory != null)
+ {
+ request.RETURN_NO = mainReturnInventory.RETURN_NO;
+ request.RETURN_ITEM_NO = mainReturnInventory.RETURN_ITEM_NO;
+ request.BUSINESS_NAME = mainReturnInventory.BUSINESS_NAME;
+ request.BUSINESS_CODE = mainReturnInventory.BUSINESS_CODE;
+ request.TPNUM = mainReturnInventory.TPNUM;
+ request.LGORT = mainReturnInventory.LGORT;
+ request.MO_NO = mainReturnInventory.MO_NO;
- // }
- // }
- // if (itemData.Count > 0)
- // {
- // _sys_JobService.CallPutAway(request);
- // }
- //}
- //catch (Exception ex)
- //{
- // return WebResponseContent.Instance.Error(ex.Message);
- //}
+ Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
+ foreach (Dt_StockInfoDetail detail in stockInfo.Details)
+ {
+ Dt_ReturnInventoryDetail dt_ReturnInventoryDetail = _returnInventoryDetailRepository.QueryFirst(x => x.LABEL_NO == detail.SerialNumber);
+ if (dt_ReturnInventoryDetail != null)
+ {
+ PutAwayReturn putAwayReturn = new PutAwayReturn();
+ putAwayReturn.LABEL_NO = dt_ReturnInventoryDetail.LABEL_NO;
+ putAwayReturn.SOBKZ = dt_ReturnInventoryDetail.SOBKZ;
+ putAwayReturn.UNIT = dt_ReturnInventoryDetail.UNIT;
+ putAwayReturn.LGORT = dt_ReturnInventoryDetail.LGORT;
+ putAwayReturn.TOTAL_RETURN_QTY = dt_ReturnInventoryDetail.QTY;
+ putAwayReturn.F_LGORT = dt_ReturnInventoryDetail.F_LGORT;
+ putAwayReturn.MO_NO = mainReturnInventory.MO_NO;
+ putAwayReturn.LIFNR = dt_ReturnInventoryDetail.LIFNR;
+ putAwayReturn.MATNR = dt_ReturnInventoryDetail.MATNR;
+ putAwayReturn.BATCH = "";
+ DATA.Add(putAwayReturn);
+ }
+ }
+ if(DATA.Count>0)
+ {
+ _sys_JobService.CallPutAwayReturn(request);//浣欐枡閫�搴撳洖浼�
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
#endregion
return WebResponseContent.Instance.OK();
}
@@ -621,13 +616,10 @@
PickAndPostRequest request = new PickAndPostRequest();
List<PickAndPost> itemData = new List<PickAndPost>();
request.ITEMDATA = itemData;
- request.WH_NUMBER = AppSettings.Configuration["WERKS"];
+ request.WH_NUMBER = AppSettings.Configuration["SYSNO"];
request.SYSNOD = AppSettings.Configuration["SYSNO"];
- request.WERKS = AppSettings.Configuration["WERKS"];
- //鏆傛椂鏍规嵁鎵樼洏鍙锋煡鍑哄簱閿佸畾琛ㄤ腑Dt_OutStockLockInfo涓殑鐘舵�佷负1鐨勬渶鏂颁竴鏉�,鍥犱负鍏堥攣瀹氾紝鎵嶆湁浠诲姟锛屾墍浠ユ病鏈夊叧鑱斾换鍔″彿
- //Dt_OutStockLockInfo outStockLockInfo= _outStockLockInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode && x.Status == 1, _OutLockOrderBy);
-
-
+ request.WERKS = AppSettings.Configuration["CallMaterialID"];
+
Dt_OutboundOrderDetail_Hty detail = _outboundOrderDetail_HtyRepository.QueryFirst(x => x.SourceId.ToString() == task.Remark);// task.Remark瀛橀渶姹傛槑缁咺D
if (detail != null)
{
--
Gitblit v1.9.3