From 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 09 七月 2025 22:55:27 +0800
Subject: [PATCH] 增加质检出入库逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 197 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 136 insertions(+), 61 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 186c642..77e24b0 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"
@@ -32,63 +32,67 @@
/// 涓嬭浇PDA
/// </summary>
/// <returns></returns>
- //[HttpPost, HttpGet, Route("DownLoadApp"), AllowAnonymous]
- //public virtual ActionResult DownLoadApp()
- //{
- // string path = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
- // if (!Directory.Exists(path)) Directory.CreateDirectory(path);
- // path += "WMS-PDA.apk";
+ [HttpPost, HttpGet, Route("DownLoadApp"), AllowAnonymous]
+ public virtual ActionResult DownLoadApp()
+ {
+ string path = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
+ if (!Directory.Exists(path)) Directory.CreateDirectory(path);
+ path += "WMS-PDA.apk";
- // if (System.IO.File.Exists(path))
- // {
- // byte[] fileBytes = System.IO.File.ReadAllBytes(path);
- // return File(
- // fileBytes,
- // System.Net.Mime.MediaTypeNames.Application.Octet,
- // System.IO.Path.GetFileName(path)
- // );
- // }
- // else
- // {
- // return Json(WebResponseContent.Instance.Error($"鏈壘鍒板畨瑁呭寘"));
- // }
+ if (System.IO.File.Exists(path))
+ {
+ byte[] fileBytes = System.IO.File.ReadAllBytes(path);
+ return File(
+ fileBytes,
+ System.Net.Mime.MediaTypeNames.Application.Octet,
+ System.IO.Path.GetFileName(path)
+ );
+ }
+ else
+ {
+ return Json(WebResponseContent.Instance.Error($"鏈壘鍒板畨瑁呭寘"));
+ }
- //}
+ }
- ///// <summary>
- ///// 涓婁紶PDA
- ///// </summary>
- ///// <param name="fileInput"></param>
- ///// <returns></returns>
- //[HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
- //[Consumes("multipart/form-data")]
- //public WebResponseContent UploadApp(IEnumerable<IFormFile> fileInput)
- //{
- // try
- // {
- // List<IFormFile> files = fileInput.ToList();
- // if (files == null || files.Count() == 0)
- // return new WebResponseContent { Status = true, Message = "璇烽�夋嫨涓婁紶鐨勬枃浠�" };
- // IFormFile formFile = files[0];
- // string dicPath = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
- // if (!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
- // string path = $"{dicPath}WMS-PDA{DateTime.Now:yyyyMMddhhmmss}.apk";
- // dicPath = $"{dicPath}WMS-PDA.apk";
- // if (System.IO.File.Exists(dicPath))
- // System.IO.File.Move(dicPath, path);
+ /// <summary>
+ /// 涓婁紶PDA
+ /// </summary>
+ /// <param name="fileInput"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
+ [Consumes("multipart/form-data")]
+ public WebResponseContent UploadApp(IEnumerable<IFormFile> fileInput)
+ {
+ try
+ {
+ List<IFormFile> files = fileInput.ToList();
+ if (files == null || files.Count() == 0)
+ return new WebResponseContent { Status = true, Message = "璇烽�夋嫨涓婁紶鐨勬枃浠�" };
+ IFormFile formFile = files[0];
+ string dicPath = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
+ if (!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
+ string path = $"{dicPath}WMS-PDA{DateTime.Now:yyyyMMddhhmmss}.apk";
+ dicPath = $"{dicPath}WMS-PDA.apk";
+ if (System.IO.File.Exists(dicPath))
+ System.IO.File.Move(dicPath, path);
- // using (var stream = new FileStream(dicPath, FileMode.Create))
- // {
- // formFile.CopyTo(stream);
- // }
- // return new WebResponseContent { Status = true, Message = "鏂囦欢涓婁紶鎴愬姛" };
- // }
- // catch (Exception ex)
- // {
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
-
+ using (var stream = new FileStream(dicPath, FileMode.Create))
+ {
+ formFile.CopyTo(stream);
+ }
+ return new WebResponseContent { Status = true, Message = "鏂囦欢涓婁紶鎴愬姛" };
+ }
+ catch (Exception ex)
+ {
+ 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,82 @@
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="palletCode"></param>
+ /// <param name="qty"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ModifyQty")]
+ public WebResponseContent ModifyQty(string palletCode, int qty)
+ {
+ return _taskService.ModifyQty(palletCode, qty);
+ }
+ /// <summary>
+ /// 璐ㄦ鍑哄簱
+ /// </summary>
+ /// <param name="batchNo"></param>
+ /// <param name="qty"></param>
+ /// <returns></returns>
+ [HttpPost, Route("OutQC")]
+ public WebResponseContent OutQC(string batchNo, int qty)
+ {
+ return _taskService.OutQC(batchNo, qty);
+ }
+
+ /// <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 WebResponseContent.Instance.Error("鏃犱娇鐢ㄦ潈闄�");
+ //return _inboundService.InbounOrderService.PdaAddEmptyStockInfo(barcode, station);
}
- [HttpPost, Route("QueryOrderInfo")]
- public WebResponseContent QueryOrderInfo(int pageNo, string orderNo)
+ /// <summary>
+ /// 绌烘墭鍑哄簱
+ /// </summary>
+ /// <param name="materielGroupDTO"></param>
+ /// <returns></returns>
+ [HttpPost, Route("OutEmpty")]
+ public WebResponseContent OutEmpty()
{
- return _inboundService.InbounOrderService.QueryOrderInfo(pageNo, orderNo);
+ return WebResponseContent.Instance.Error("鏃犱娇鐢ㄦ潈闄�");
+ //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, int orderType)
+ {
+ return _inboundService.InbounOrderService.QueryOrderInfo(pageNo, orderNo, orderType);
+ }
+ /// <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