From 441b6f8d257a01b2998253ef0515a201777d7e68 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 04 七月 2025 14:06:49 +0800
Subject: [PATCH] 修改入库、移库、出库逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
index 90ddf48..b238478 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
@@ -88,7 +88,11 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-
+ /// <summary>
+ /// PDA鐗堟湰
+ /// </summary>
+ /// <param name="version"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
public WebResponseContent GetPDAVersion(string version)
{
@@ -103,7 +107,6 @@
{
return WebResponseContent.Instance.Error(ex.Message);
}
-
}
[HttpPost, Route("CallMateriel")]
@@ -116,6 +119,16 @@
public WebResponseContent MaterielCarry(string startPoint)
{
return _taskService.MaterielCarry(startPoint);
+ }
+ /// <summary>
+ /// 浜哄伐缁勭洏鍏ュ簱
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("InMateriel")]
+ public WebResponseContent InMateriel([FromBody] SaveModel saveModel)
+ {
+ return _taskService.InMateriel(saveModel);
}
[HttpPost, Route("MaterielGroup")]
@@ -130,20 +143,58 @@
return _inboundService.InbounOrderService.PdaAddStockInfo(materielGroupDTO);
}
/// <summary>
- /// 绌烘墭缁勭洏
+ /// 淇敼鎵樼洏鍙�
+ /// </summary>
+ /// <param name="barcode"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ModifyBarcode")]
+ public WebResponseContent ModifyBarcode(string barcode,string newBarcode)
+ {
+ return _taskService.ModifyBarcode(barcode,newBarcode);
+ }
+
+ /// <summary>
+ /// 绌烘墭鍏ュ簱
/// </summary>
/// <param name="materielGroupDTO"></param>
/// <returns></returns>
- [HttpPost, Route("PdaAddEmptyStockInfo")]
- public WebResponseContent PdaAddEmptyStockInfo([FromBody] PdaMaterielGroupDTO materielGroupDTO)
+ [HttpPost, Route("InEmpty")]
+ public WebResponseContent InEmpty(string barcode,string station)
{
- return _inboundService.InbounOrderService.PdaAddEmptyStockInfo(materielGroupDTO);
+ return _inboundService.InbounOrderService.PdaAddEmptyStockInfo(barcode,station);
}
+ /// <summary>
+ /// 绌烘墭鍑哄簱
+ /// </summary>
+ /// <param name="materielGroupDTO"></param>
+ /// <returns></returns>
+ [HttpPost, Route("OutEmpty")]
+ public WebResponseContent OutEmpty()
+ {
+ return _outboundService.OutboundOrderService.PdaOutEmpty();
+ }
+ /// <summary>
+ /// 鏌ヨ鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="pageNo"></param>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
[HttpPost, Route("QueryOrderInfo")]
public WebResponseContent QueryOrderInfo(int pageNo, string orderNo)
{
return _inboundService.InbounOrderService.QueryOrderInfo(pageNo, orderNo);
}
+ /// <summary>
+ /// 鏌ヨ鍏ュ簱鍗曡鎯�
+ /// </summary>
+ /// <param name="pageNo"></param>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
+ [HttpPost, Route("QueryOrderDetailInfo")]
+ public WebResponseContent QueryOrderDetailInfo(int pageNo, string orderNo)
+ {
+ return _inboundService.InbounOrderService.QueryOrderDetailInfo(pageNo, orderNo);
+ }
}
}
--
Gitblit v1.9.3