From 00a72fff219241eb5b0405a066cc859d07cf7735 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 10:23:44 +0800
Subject: [PATCH] 1111
---
entity/MesInvItemIns.cs | 2
entity/Base/ItemDetailModel.cs | 4
service/Warehouse/MesCgthSqManager.cs | 171
Dto/base/ImageDto.cs | 6
entity/VIpqcSj.cs | 2
Controllers/Warehouse/MesItemBlController.cs | 8
service/Warehouse/KwbgManager.cs | 117
entity/MesShouTuo.cs | 2
service/QC/OAJyService.cs | 234
Dto/service/OaToMesRecord.cs | 92
entity/MesScthSqDetail.cs | 22
service/Warehouse/MesDbckManager.cs | 5
Controllers/Warehouse/MesKwcxController.cs | 8
Dto/Warehouse/DefineTask001Dto.cs | 25
entity/Base/ItemInBaseModel.cs | 7
Controllers/Warehouse/MesItemQtController.cs | 8
entity/TblBarcodeInformation.cs | 322 +-
entity/MesShouTuoDetail.cs | 2
service/base/MesPrintMangeer.cs | 162
entity/SalesOrder.cs | 7
service/Warehouse/MesInvItemOutCDetailsManager.cs | 8
service/Warehouse/MesItemBlManager.cs | 168
entity/SalesReturnNotice.cs | 2
entity/SalesOrderDetail.cs | 6
service/Warehouse/MesInvItemInCDetailsManager.cs | 203
Controllers/Warehouse/MesStrkController.cs | 173
Controllers/QC/LljController.cs | 2
service/Warehouse/MesItemQtrkManager.cs | 124
service/Warehouse/MesKwcxManager.cs | 60
service/Warehouse/MesInvItemArnManager.cs | 5
entity/MesWorkProd.cs | 1
entity/vDhmx.cs | 137
Controllers/Warehouse/MesItemTblController.cs | 3
Dto/ErpKc.cs | 31
Dto/service/XJPageResult.cs | 2
entity/MesItemQt.cs | 75
entity/SalesDeliverDetail.cs | 2
entity/MesQaItemsDetectDetail5.cs | 16
Controllers/QC/OAJyController.cs | 21
Controllers/Warehouse/KwbgController.cs | 49
Controllers/Wom/WomdaaController.cs | 51
service/Warehouse/MesDepotSectionsManager.cs | 29
Controllers/QC/OaToMesController.cs | 11
service/Warehouse/MesItemQtManager.cs | 108
service/base/MesDepotsManager.cs | 3
entity/VIpqcXj.cs | 4
entity/DeliveryNoticeDetail.cs | 150
service/Warehouse/MesXkyService.cs | 357 +-
service/base/MesImageManager.cs | 9
Dto/Warehouse/DefineTask002Dto.cs | 31
service/Warehouse/MesXkyShdManager.cs | 45
service/Warehouse/MesXsckManager.cs | 595 ---
service/QC/OaApi.cs | 285 -
service/Warehouse/MesOaToMesManager.cs | 60
service/Warehouse/MesXsthManager.cs | 66
util/XkyApiHelper.cs | 105
util/BillNo.cs | 18
service/base/WmsBaseMangeer.cs | 256
Controllers/Warehouse/MesXsckController.cs | 24
Controllers/Warehouse/MesBarCFController.cs | 9
Controllers/Warehouse/TransferOutController.cs | 4
service/Warehouse/MesSttlManager.cs | 17
entity/MesInvItemStocks.cs | 3
service/Wom/WomdaaManager.cs | 582 +--
DB/DbHelperSQL.cs | 677 ++++
service/QC/IpqcService.cs | 118
Controllers/Warehouse/MesCgthSqController.cs | 16
Controllers/Warehouse/MesXkyController.cs | 51
service/Warehouse/InventoryManager.cs | 95
entity/SalesDeliver.cs | 2
service/Warehouse/TransferOutManager.cs | 51
Dto/service/WorkflowRequestDto.cs | 19
entity/MesItemQtrk.cs | 2
Controllers/Warehouse/MesXkyShdController.cs | 5
Controllers/Warehouse/MesDbckController.cs | 1
Dto/Xky/XkyBarcodeDataDto.cs | 117
entity/SalesReturnNoticeDetail.cs | 2
service/JJGZ/OaToMesRecordManager.cs | 448 +-
entity/DeliveryNotice.cs | 97
entity/MesQaItemsDetectDetail13.cs | 2
util/LogUtil.cs | 86
entity/MesScthSq.cs | 32
Controllers/base/MesPrintController.cs | 4
Controllers/QC/IpqcController.cs | 38
service/QC/LljService.cs | 63
service/Warehouse/MesCprkManager.cs | 10
entity/MesDbck.cs | 2
Controllers/JJGZ/OaToMesRecordController.cs | 116
Controllers/base/MesImageController.cs | 6
entity/Inventory.cs | 13
service/Warehouse/MesItemTblManager.cs | 93
service/Wom/WwGdManager.cs | 268
service/Warehouse/MesBarCFManager.cs | 42
service/Warehouse/MesSctkManager.cs | 6
service/Wom/WomdaahbManager.cs | 1
entity/MesShouTuiDetail.cs | 2
Controllers/Warehouse/InventoryController.cs | 13
Controllers/Warehouse/MesCprkController.cs | 5
Controllers/BaseController.cs | 9
Dto/Warehouse/DefineTask006Dto.cs | 26
Controllers/Warehouse/MesXsthController.cs | 174
service/base/LoginService.cs | 50
Controllers/AuthController.cs | 519 +-
entity/Base/RequestInfo.cs | 22
entity/MesShouTui.cs | 2
service/Wom/MesWorkProdManager.cs | 35
Controllers/Warehouse/MesItemQtrkController.cs | 3
Controllers/Wom/WwGdController.cs | 63
Controllers/Warehouse/MesSctkController.cs | 1
Controllers/Warehouse/MesSttlController.cs | 191
entity/ErpMesKc.cs | 18
Dto/service/OaToMesQuery.cs | 82
entity/MesDbckDetail.cs | 2
Dto/service/LLJDto.cs | 1
service/Warehouse/MesStrkManager.cs | 26
Dto/service/ProductionPickDto.cs | 4
Dto/Warehouse/DefineTask005Dto.cs | 22
service/Warehouse/MesInvItemOutsManager.cs | 53
Controllers/base/WmsBaseController.cs | 1
119 files changed, 4,587 insertions(+), 4,336 deletions(-)
diff --git a/Controllers/AuthController.cs b/Controllers/AuthController.cs
index 4e3c064..e9a308e 100644
--- a/Controllers/AuthController.cs
+++ b/Controllers/AuthController.cs
@@ -1,24 +1,27 @@
-using System.Net;
-using System.Security.Cryptography;
-using System.Text;
using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Security.Cryptography;
using Newtonsoft.Json;
+using System.Text;
+using System.Net;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.Extensions.Hosting;
-namespace NewPdaSqlServer.Controllers;
-
-[Route("api/[controller]")]
-[ApiController]
-public class AuthController : ControllerBase
+namespace NewPdaSqlServer.Controllers
{
- // 浠ヤ笅甯搁噺寤鸿鏀惧湪appsettings.json閰嶇疆鏂囦欢涓�
- private const string APPID = "303233EF-AC39-40C1-8364-AC989C6258A5";
+ [Route("api/[controller]")]
+ [ApiController]
+ public class AuthController : ControllerBase
+ {
+ // 浠ヤ笅甯搁噺寤鸿鏀惧湪appsettings.json閰嶇疆鏂囦欢涓�
+ private const string APPID = "303233EF-AC39-40C1-8364-AC989C6258A5";
+ private const string SECRET = "30b41949-bcfb-48f8-9847-feb6e043fe72";
+ // private const string SPK = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
+ private const string HOST = "http://192.168.1.149:8099";
- private const string SECRET = "30b41949-bcfb-48f8-9847-feb6e043fe72";
-
- // private const string SPK = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
- private const string HOST = "http://192.168.1.149:8099";
-
- private const string SPK = @"-----BEGIN PUBLIC KEY-----
+ private const string SPK = @"-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEc
E94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlI
JBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlb
@@ -28,138 +31,135 @@
twIDAQAB
-----END PUBLIC KEY-----";
- [HttpGet("token")]
- public ActionResult<string> GetToken()
- {
- var http = new HttpManager();
- var headers = new Dictionary<string, string>
+ [HttpGet("token")]
+ public ActionResult<string> GetToken()
{
- ["appid"] = APPID,
- ["secret"] = RsaHelper.Encrypt(SECRET, SPK)
- };
-
- try
- {
- var response = http.PostDataSSL(
- $"{HOST}/api/ec/dev/auth/applytoken",
- new Dictionary<string, string>(), headers);
-
- if (!string.IsNullOrEmpty(response))
- {
- var res = JsonConvert.DeserializeObject<dynamic>(response);
- if (res.status == "true") return res.token.ToString();
- }
-
- return BadRequest("Failed to get token");
- }
- catch (Exception ex)
- {
- // 寤鸿浣跨敤ILogger璁板綍鏃ュ織
- return StatusCode(500, ex.Message);
- }
- }
-
-
- [HttpPost("getUserId")]
- public ActionResult<string> GetUserId()
- {
- var http = new HttpManager();
- var tokenResult = http.GetToken();
- if (tokenResult is not null)
- {
- var url = new Uri($"{HOST}/api/T100/GetSecretUserId");
- return http.GetOaKqInfo(url, tokenResult, "DQ000344");
- }
-
- return BadRequest("鏃犳硶鑾峰彇鏈夋晥Token");
- }
-
-
- [HttpPost("createWorkflow")]
- public ActionResult<string> CreateWorkflowRequest(
- [FromBody] WorkflowRequestDto request)
- {
- try
- {
- // 鍔犲瘑鐢ㄦ埛ID
- var encryptedUserId = RsaHelper.Encrypt(request.UserId, SPK);
- var token = GetToken().ToString();
- // 璁剧疆璇锋眰澶�
+ var http = new HttpManager();
var headers = new Dictionary<string, string>
{
- ["token"] = token,
["appid"] = APPID,
- ["userid"] = encryptedUserId
+ ["secret"] = RsaHelper.Encrypt(SECRET, SPK)
};
- // 鏋勫缓璇锋眰鍙傛暟
- var parameters = new Dictionary<string, string>
+ try
{
- ["mainData"] = JsonConvert.SerializeObject(request.MainData),
- ["workflowId"] = "",
- ["requestName"] = request.RequestName
- };
+ var response = http.PostDataSSL($"{HOST}/api/ec/dev/auth/applytoken",
+ new Dictionary<string, string>(), headers);
- // 娣诲姞鍙�夊弬鏁�
- if (request.DetailData != null)
- parameters.Add("detailData",
- JsonConvert.SerializeObject(request.DetailData));
-
- if (request.OtherParams != null)
- parameters.Add("otherParams",
- JsonConvert.SerializeObject(request.OtherParams));
-
- // 鍙戦�佽姹�
- var response = new HttpManager().PostDataSSL(
- $"{HOST}/api/workflow/paService/doCreateRequest",
- parameters,
- headers);
-
- dynamic res = JsonConvert.DeserializeObject(response);
- if (res.code == "SUCCESS")
- return Ok(res.data.requestid.ToString());
-
- return BadRequest($"鍒涘缓澶辫触锛歿res.errMsg}");
+ if (!string.IsNullOrEmpty(response))
+ {
+ var res = JsonConvert.DeserializeObject<dynamic>(response);
+ if (res.status == "true")
+ {
+ return res.token.ToString();
+ }
+ }
+ return BadRequest("Failed to get token");
+ }
+ catch (Exception ex)
+ {
+ // 寤鸿浣跨敤ILogger璁板綍鏃ュ織
+ return StatusCode(500, ex.Message);
+ }
}
- catch (Exception ex)
+
+
+ [HttpPost("getUserId")]
+ public ActionResult<string> GetUserId()
{
- return StatusCode(500, $"绯荤粺寮傚父锛歿ex.Message}");
+ var http = new HttpManager();
+ var tokenResult = http.GetToken();
+ if (tokenResult is not null)
+ {
+ Uri url = new Uri($"{HOST}/api/T100/GetSecretUserId");
+ return http.GetOaKqInfo(url, tokenResult, "DQ000344");
+ }
+ return BadRequest("鏃犳硶鑾峰彇鏈夋晥Token");
+ }
+
+
+
+ [HttpPost("createWorkflow")]
+ public ActionResult<string> CreateWorkflowRequest([FromBody] WorkflowRequestDto request)
+ {
+ try
+ {
+ // 鍔犲瘑鐢ㄦ埛ID
+ var encryptedUserId = RsaHelper.Encrypt(request.UserId, SPK);
+ var token = GetToken().ToString();
+ // 璁剧疆璇锋眰澶�
+ var headers = new Dictionary<string, string>
+ {
+ ["token"] = token,
+ ["appid"] = APPID,
+ ["userid"] = encryptedUserId
+ };
+
+ // 鏋勫缓璇锋眰鍙傛暟
+ var parameters = new Dictionary<string, string>
+ {
+ ["mainData"] = JsonConvert.SerializeObject(request.MainData),
+ ["workflowId"] = "",
+ ["requestName"] = request.RequestName
+ };
+
+ // 娣诲姞鍙�夊弬鏁�
+ if (request.DetailData != null)
+ parameters.Add("detailData", JsonConvert.SerializeObject(request.DetailData));
+
+ if (request.OtherParams != null)
+ parameters.Add("otherParams", JsonConvert.SerializeObject(request.OtherParams));
+
+ // 鍙戦�佽姹�
+ var response = new HttpManager().PostDataSSL(
+ $"{HOST}/api/workflow/paService/doCreateRequest",
+ parameters,
+ headers);
+
+ dynamic res = JsonConvert.DeserializeObject(response);
+ if (res.code == "SUCCESS")
+ return Ok(res.data.requestid.ToString());
+
+ return BadRequest($"鍒涘缓澶辫触锛歿res.errMsg}");
+ }
+ catch (Exception ex)
+ {
+ return StatusCode(500, $"绯荤粺寮傚父锛歿ex.Message}");
+ }
}
}
-}
-public static class RsaHelper
-{
- public static string Encrypt(string plainText, string publicKeyPem)
+ public static class RsaHelper
{
- // 灏哖EM鏍煎紡鐨勫叕閽ヨ浆鎹负XML鏍煎紡
- var rsa = RSA.Create();
- rsa.ImportFromPem(publicKeyPem); // 浣跨敤.NET 5+ 鍐呯疆PEM瑙ｆ瀽鏂规硶
+ public static string Encrypt(string plainText, string publicKeyPem)
+ {
+ // 灏哖EM鏍煎紡鐨勫叕閽ヨ浆鎹负XML鏍煎紡
+ var rsa = RSA.Create();
+ rsa.ImportFromPem(publicKeyPem); // 浣跨敤.NET 5+ 鍐呯疆PEM瑙ｆ瀽鏂规硶
- var parameters = rsa.ExportParameters(false);
- var publicKeyXml =
- $"<RSAKeyValue><Modulus>{Convert.ToBase64String(parameters.Modulus)}</Modulus><Exponent>{Convert.ToBase64String(parameters.Exponent)}</Exponent></RSAKeyValue>";
+ var parameters = rsa.ExportParameters(false);
+ string publicKeyXml = $"<RSAKeyValue><Modulus>{Convert.ToBase64String(parameters.Modulus)}</Modulus><Exponent>{Convert.ToBase64String(parameters.Exponent)}</Exponent></RSAKeyValue>";
- using var rsaProvider = new RSACryptoServiceProvider();
- rsaProvider.FromXmlString(publicKeyXml); // 浣跨敤杞崲鍚庣殑XML鏍煎紡鍏挜
+ using var rsaProvider = new RSACryptoServiceProvider();
+ rsaProvider.FromXmlString(publicKeyXml); // 浣跨敤杞崲鍚庣殑XML鏍煎紡鍏挜
- var data = Encoding.UTF8.GetBytes(plainText);
- var encrypted = rsaProvider.Encrypt(data, false);
- return Convert.ToBase64String(encrypted);
+ var data = Encoding.UTF8.GetBytes(plainText);
+ var encrypted = rsaProvider.Encrypt(data, false);
+ return Convert.ToBase64String(encrypted);
+ }
}
-}
-public class HttpManager
-{
- // 浠ヤ笅甯搁噺寤鸿鏀惧湪appsettings.json閰嶇疆鏂囦欢涓�
- private const string APPID = "303233EF-AC39-40C1-8364-AC989C6258A5";
+ public class HttpManager
+ {
+ private readonly HttpClient _client = new HttpClient();
- private const string SECRET = "30b41949-bcfb-48f8-9847-feb6e043fe72";
+ // 浠ヤ笅甯搁噺寤鸿鏀惧湪appsettings.json閰嶇疆鏂囦欢涓�
+ private const string APPID = "303233EF-AC39-40C1-8364-AC989C6258A5";
+ private const string SECRET = "30b41949-bcfb-48f8-9847-feb6e043fe72";
+ // private const string SPK = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
+ private const string HOST = "http://192.168.1.149:8099";
- // private const string SPK = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
- private const string HOST = "http://192.168.1.149:8099";
-
- private const string SPK = @"-----BEGIN PUBLIC KEY-----
+ private const string SPK = @"-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEc
E94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlI
JBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlb
@@ -169,159 +169,160 @@
twIDAQAB
-----END PUBLIC KEY-----";
- private readonly HttpClient _client = new();
-
- public string PostDataSSL(string url,
- Dictionary<string, string> parameters,
- Dictionary<string, string> headers)
- {
- var request = new HttpRequestMessage(HttpMethod.Post, url);
-
- foreach (var header in headers)
- request.Headers.Add(header.Key, header.Value);
-
- // 濡傛灉闇�瑕佽〃鍗曞弬鏁�
- if (parameters.Count > 0)
- request.Content = new FormUrlEncodedContent(parameters);
-
- var response = _client.SendAsync(request).Result;
- return response.Content.ReadAsStringAsync().Result;
- }
-
- public string GetToken()
- {
- var http = new HttpManager();
- var headers = new Dictionary<string, string>
+ public string PostDataSSL(string url,
+ Dictionary<string, string> parameters,
+ Dictionary<string, string> headers)
{
- ["appid"] = APPID,
- ["secret"] = RsaHelper.Encrypt(SECRET, SPK)
- };
+ var request = new HttpRequestMessage(HttpMethod.Post, url);
- try
- {
- var response = http.PostDataSSL(
- $"{HOST}/api/ec/dev/auth/applytoken",
- new Dictionary<string, string>(), headers);
-
- if (!string.IsNullOrEmpty(response))
+ foreach (var header in headers)
{
- var res = JsonConvert.DeserializeObject<dynamic>(response);
- if (res.status == "true") return res.token.ToString();
+ request.Headers.Add(header.Key, header.Value);
}
- return "token涓嶅瓨鍦紒";
- }
- catch (Exception ex)
- {
- // 寤鸿浣跨敤ILogger璁板綍鏃ュ織
- return ex.Message;
- }
- }
-
- public string GetOaKqInfo(Uri url, string token, string userId)
- {
- try
- {
- ServicePointManager.ServerCertificateValidationCallback +=
- (s, cert, chain, sslPolicyErrors) => true;
- ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
-
- var request = WebRequest.Create(url) as HttpWebRequest;
- request.Method = "POST";
- request.Timeout = 20000; // 20绉掕秴鏃�
- request.ContentType =
- "application/x-www-form-urlencoded; charset=utf-8"; // 鏄庣‘鎸囧畾缂栫爜
-
- // 娣诲姞璋冭瘯澶翠俊鎭�
- request.Headers.Add("appid", APPID);
- request.Headers.Add("token", token);
- request.Headers.Add("userId", userId);
-
- // 鏋勫缓甯︽椂鍖虹殑鏃ユ湡鍙傛暟
- var postData = new StringBuilder();
- var dateParam = DateTime.Now.AddDays(-1)
- .ToString("yyyy-MM-ddTHH:mm:sszzz");
- postData.AppendFormat("KQSDATE={0}&KQEDATE={1}",
- Uri.EscapeDataString(dateParam),
- Uri.EscapeDataString(dateParam));
-
- var byteData =
- Encoding.UTF8.GetBytes(postData.ToString()); // 鏀圭敤UTF8缂栫爜
-
- // 鏇村畬鍠勭殑璇锋眰鍐欏叆
- using (var stream = request.GetRequestStream())
+ // 濡傛灉闇�瑕佽〃鍗曞弬鏁�
+ if (parameters.Count > 0)
{
- stream.Write(byteData, 0, byteData.Length);
+ request.Content = new FormUrlEncodedContent(parameters);
}
- // 澶勭悊HTTP閿欒鐘舵�佺爜
- using (var response = request.GetResponse() as HttpWebResponse)
- {
- if (response.StatusCode != HttpStatusCode.OK)
- throw new WebException(
- $"鏈嶅姟鍣ㄨ繑鍥為敊璇姸鎬佺爜: {(int)response.StatusCode} {response.StatusDescription}");
+ var response = _client.SendAsync(request).Result;
+ return response.Content.ReadAsStringAsync().Result;
+ }
- using (var stream = response.GetResponseStream())
- using (var reader = new StreamReader(stream, Encoding.UTF8))
+ public string GetToken()
+ {
+
+
+ var http = new HttpManager();
+ var headers = new Dictionary<string, string>
+ {
+ ["appid"] = APPID,
+ ["secret"] = RsaHelper.Encrypt(SECRET, SPK)
+ };
+
+ try
+ {
+ var response = http.PostDataSSL($"{HOST}/api/ec/dev/auth/applytoken",
+ new Dictionary<string, string>(), headers);
+
+ if (!string.IsNullOrEmpty(response))
{
- return reader.ReadToEnd();
+ var res = JsonConvert.DeserializeObject<dynamic>(response);
+ if (res.status == "true")
+ {
+ return res.token.ToString();
+ }
+ }
+ return "token涓嶅瓨鍦紒";
+ }
+ catch (Exception ex)
+ {
+ // 寤鸿浣跨敤ILogger璁板綍鏃ュ織
+ return ex.Message;
+ }
+ }
+
+ public string GetOaKqInfo(Uri url, string token, string userId)
+ {
+ try
+ {
+ ServicePointManager.ServerCertificateValidationCallback += (s, cert, chain, sslPolicyErrors) => true;
+ ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+
+ var request = WebRequest.Create(url) as HttpWebRequest;
+ request.Method = "POST";
+ request.Timeout = 20000; // 20绉掕秴鏃�
+ request.ContentType = "application/x-www-form-urlencoded; charset=utf-8"; // 鏄庣‘鎸囧畾缂栫爜
+
+ // 娣诲姞璋冭瘯澶翠俊鎭�
+ request.Headers.Add("appid", APPID);
+ request.Headers.Add("token", token);
+ request.Headers.Add("userId", userId);
+
+ // 鏋勫缓甯︽椂鍖虹殑鏃ユ湡鍙傛暟
+ var postData = new StringBuilder();
+ var dateParam = DateTime.Now.AddDays(-1).ToString("yyyy-MM-ddTHH:mm:sszzz");
+ postData.AppendFormat("KQSDATE={0}&KQEDATE={1}",
+ Uri.EscapeDataString(dateParam),
+ Uri.EscapeDataString(dateParam));
+
+ byte[] byteData = Encoding.UTF8.GetBytes(postData.ToString()); // 鏀圭敤UTF8缂栫爜
+
+ // 鏇村畬鍠勭殑璇锋眰鍐欏叆
+ using (var stream = request.GetRequestStream())
+ {
+ stream.Write(byteData, 0, byteData.Length);
+ }
+
+ // 澶勭悊HTTP閿欒鐘舵�佺爜
+ using (var response = request.GetResponse() as HttpWebResponse)
+ {
+ if (response.StatusCode != HttpStatusCode.OK)
+ {
+ throw new WebException($"鏈嶅姟鍣ㄨ繑鍥為敊璇姸鎬佺爜: {(int)response.StatusCode} {response.StatusDescription}");
+ }
+
+ using (var stream = response.GetResponseStream())
+ using (var reader = new StreamReader(stream, Encoding.UTF8))
+ {
+ return reader.ReadToEnd();
+ }
}
}
- }
- catch (WebException ex) when (ex.Response is HttpWebResponse response)
- {
- // 璁板綍璇︾粏閿欒淇℃伅
- var errorStream = response.GetResponseStream();
- using (var reader = new StreamReader(errorStream))
+ catch (WebException ex) when (ex.Response is HttpWebResponse response)
{
- var errorDetails = reader.ReadToEnd();
- throw new Exception(
- $"璇锋眰澶辫触 [Status: {response.StatusCode}]: {errorDetails}",
- ex);
+ // 璁板綍璇︾粏閿欒淇℃伅
+ var errorStream = response.GetResponseStream();
+ using (var reader = new StreamReader(errorStream))
+ {
+ string errorDetails = reader.ReadToEnd();
+ throw new Exception($"璇锋眰澶辫触 [Status: {response.StatusCode}]: {errorDetails}", ex);
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"璇锋眰寮傚父: {ex.Message}", ex);
}
}
- catch (Exception ex)
- {
- throw new Exception($"璇锋眰寮傚父: {ex.Message}", ex);
- }
}
-}
-// 鏂板DTO绫�
-public class WorkflowRequestDto
-{
- /// <summary>
- /// 鐢ㄦ埛璁よ瘉浠ょ墝
- /// </summary>
- public string Token { get; set; }
+ // 鏂板DTO绫�
+ public class WorkflowRequestDto
+ {
+ /// <summary>
+ /// 鐢ㄦ埛璁よ瘉浠ょ墝
+ /// </summary>
+ public string Token { get; set; }
- /// <summary>
- /// 鍘熷鐢ㄦ埛ID锛堝姞瀵嗗墠锛�
- /// </summary>
- public string UserId { get; set; }
+ /// <summary>
+ /// 鍘熷鐢ㄦ埛ID锛堝姞瀵嗗墠锛�
+ /// </summary>
+ public string UserId { get; set; }
- /// <summary>
- /// 娴佺▼ID锛堝繀濉級
- /// </summary>
- public int WorkflowId { get; set; }
+ /// <summary>
+ /// 娴佺▼ID锛堝繀濉級
+ /// </summary>
+ public int WorkflowId { get; set; }
- /// <summary>
- /// 娴佺▼鏍囬锛堝繀濉級
- /// </summary>
- public string RequestName { get; set; }
+ /// <summary>
+ /// 娴佺▼鏍囬锛堝繀濉級
+ /// </summary>
+ public string RequestName { get; set; }
- /// <summary>
- /// 涓昏〃鏁版嵁锛堝繀濉級
- /// </summary>
- public Dictionary<string, object> MainData { get; set; }
+ /// <summary>
+ /// 涓昏〃鏁版嵁锛堝繀濉級
+ /// </summary>
+ public Dictionary<string, object> MainData { get; set; }
- /// <summary>
- /// 鏄庣粏琛ㄦ暟鎹紙閫夊～锛�
- /// </summary>
- public Dictionary<string, object> DetailData { get; set; }
+ /// <summary>
+ /// 鏄庣粏琛ㄦ暟鎹紙閫夊～锛�
+ /// </summary>
+ public Dictionary<string, object> DetailData { get; set; }
- /// <summary>
- /// 鍏朵粬鍙傛暟锛堥�夊～锛�
- /// </summary>
- public Dictionary<string, object> OtherParams { get; set; }
+ /// <summary>
+ /// 鍏朵粬鍙傛暟锛堥�夊～锛�
+ /// </summary>
+ public Dictionary<string, object> OtherParams { get; set; }
+ }
}
\ No newline at end of file
diff --git a/Controllers/BaseController.cs b/Controllers/BaseController.cs
index 9e42d4e..52ffce2 100644
--- a/Controllers/BaseController.cs
+++ b/Controllers/BaseController.cs
@@ -1,7 +1,5 @@
锘縰sing Microsoft.AspNetCore.Mvc;
-using NewPdaSqlServer.entity.Base;
-
-namespace NewPdaSqlServer.Controllers;
+using Microsoft.Extensions.DependencyInjection;
public class BaseController : ControllerBase
{
@@ -12,10 +10,11 @@
get
{
if (_requestInfo == null)
+ {
//蹇呭～椤�
//_requestInfo.ValidateRequired("OrgId");
- _requestInfo =
- HttpContext.RequestServices.GetService<RequestInfo>();
+ _requestInfo = HttpContext.RequestServices.GetService<RequestInfo>();
+ }
return _requestInfo;
}
}
diff --git a/Controllers/JJGZ/OaToMesRecordController.cs b/Controllers/JJGZ/OaToMesRecordController.cs
index 8ea7acc..f862059 100644
--- a/Controllers/JJGZ/OaToMesRecordController.cs
+++ b/Controllers/JJGZ/OaToMesRecordController.cs
@@ -1,70 +1,72 @@
锘縰sing Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.service.JJGZ;
+using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
-namespace NewPdaSqlServer.Controllers.JJGZ;
-
-[Route("api/[controller]")]
-[ApiController]
-public class OaToMesRecordController : ControllerBase
+namespace NewPdaSqlServer.Controllers.JJGZ
{
- private readonly OaToMesRecordManager m = new();
-
- [HttpPost("ApproveRecord")]
- public ResponseResult ApproveRecord(OaToMesRecord queryObj)
+ [Route("api/[controller]")]
+ [ApiController]
+ public class OaToMesRecordController : ControllerBase
{
- try
+ OaToMesRecordManager m = new OaToMesRecordManager();
+
+ [HttpPost("ApproveRecord")]
+ public ResponseResult ApproveRecord(OaToMesRecord queryObj)
{
- var rtnMsg = m.ApproveRecord(queryObj);
- return new ResponseResult
+ try
{
- status = 0,
- message = rtnMsg,
- data = null
- };
+ string rtnMsg = m.ApproveRecord(queryObj);
+ return new ResponseResult
+ {
+ status = 0,
+ message = rtnMsg,
+ data = null
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
}
- catch (Exception ex)
+
+ [HttpPost("ApproveUser")]
+ public ResponseResult ApproveUser(OaToMesUser queryObj)
{
- return ResponseResult.ResponseError(ex);
+ try
+ {
+ string rtnMsg = m.ApproveUser(queryObj);
+ return new ResponseResult
+ {
+ status = 0,
+ message = rtnMsg,
+ data = null
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("ApproveDepartment")]
+ public ResponseResult ApproveDepartment(OaToMesDepartment queryObj)
+ {
+ try
+ {
+ string rtnMsg = m.ApproveDepartment(queryObj);
+ return new ResponseResult
+ {
+ status = 0,
+ message = rtnMsg,
+ data = null
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
}
}
-
- [HttpPost("ApproveUser")]
- public ResponseResult ApproveUser(OaToMesUser queryObj)
- {
- try
- {
- var rtnMsg = m.ApproveUser(queryObj);
- return new ResponseResult
- {
- status = 0,
- message = rtnMsg,
- data = null
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("ApproveDepartment")]
- public ResponseResult ApproveDepartment(OaToMesDepartment queryObj)
- {
- try
- {
- var rtnMsg = m.ApproveDepartment(queryObj);
- return new ResponseResult
- {
- status = 0,
- message = rtnMsg,
- data = null
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
+}
diff --git a/Controllers/QC/IpqcController.cs b/Controllers/QC/IpqcController.cs
index 0e8553e..bad00b2 100644
--- a/Controllers/QC/IpqcController.cs
+++ b/Controllers/QC/IpqcController.cs
@@ -1,9 +1,9 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.QC;
using NewPdaSqlServer.util;
-using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace NewPdaSqlServer.Controllers.QC;
@@ -12,10 +12,10 @@
[ApiController]
public class IpqcController : ControllerBase
{
- private readonly IpqcService m = new();
+ IpqcService m = new IpqcService();
/// <summary>
- /// 棣栨鍗曟嵁鏌ヨ
+ /// 棣栨鍗曟嵁鏌ヨ
/// </summary>
/// <param name="queryObj"></param>
/// <returns></returns>
@@ -70,7 +70,7 @@
/// <summary>
- /// 棣栨鍗曟嵁鏌ヨ
+ /// 棣栨鍗曟嵁鏌ヨ
/// </summary>
/// <param name="queryObj"></param>
/// <returns></returns>
@@ -118,9 +118,8 @@
return ResponseResult.ResponseError(ex);
}
}
-
/// <summary>
- /// 棣栨鍗曟嵁鏌ヨ
+ /// 棣栨鍗曟嵁鏌ヨ
/// </summary>
[HttpPost("createByWomdaa")]
public ResponseResult CreateByWomdaa(dynamic query)
@@ -141,9 +140,8 @@
return ResponseResult.ResponseError(ex);
}
}
-
/// <summary>
- /// 鑾峰彇琛ㄦ牸閰嶇疆
+ /// 鑾峰彇琛ㄦ牸閰嶇疆
/// </summary>
[HttpPost("GetTableConfig")]
public ResponseResult GetTableConfig([FromBody] dynamic query)
@@ -154,7 +152,7 @@
throw new ArgumentException("鏄庣粏璁板綍GUID涓嶈兘涓虹┖");
var configData = m.GetTableConfig(query.mxguid?.ToString());
-
+
if (configData == null)
throw new Exception("鏈壘鍒扮浉鍏抽厤缃俊鎭�");
@@ -175,9 +173,8 @@
return ResponseResult.ResponseError(ex);
}
}
-
/// <summary>
- /// 淇濆瓨琛ㄦ牸閰嶇疆
+ /// 淇濆瓨琛ㄦ牸閰嶇疆
/// </summary>
[HttpPost("SaveTableConfig")]
public ResponseResult SaveTableConfig([FromBody] dynamic query)
@@ -194,7 +191,7 @@
var affectedRows = m.UpdateTableConfig(
query.selectedWater?.ToString(),
query.selectedFlow?.ToString(),
- JsonConvert.SerializeObject(query.tableData),
+ Newtonsoft.Json.JsonConvert.SerializeObject(query.tableData),
query.mxguid?.ToString()
);
@@ -210,9 +207,8 @@
return ResponseResult.ResponseError(ex);
}
}
-
/// <summary>
- /// 鑾峰彇璁よ瘉淇℃伅鍒楄〃
+ /// 鑾峰彇璁よ瘉淇℃伅鍒楄〃
/// </summary>
[HttpPost("GetRzxxList")]
public ResponseResult GetRzxxList([FromBody] dynamic query)
@@ -223,7 +219,7 @@
throw new ArgumentException("妫�楠岄」鐩瓽UID涓嶈兘涓虹┖");
var rzxxList = m.GetRzxxList(query.mxguid?.ToString());
-
+
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = rzxxList;
@@ -239,9 +235,8 @@
return ResponseResult.ResponseError(ex);
}
}
-
/// <summary>
- /// 鏇存柊璁よ瘉淇℃伅_鐢熶骇鏃ユ湡
+ /// 鏇存柊璁よ瘉淇℃伅_鐢熶骇鏃ユ湡
/// </summary>
[HttpPost("updateScDate")]
public ResponseResult UpdateScDate([FromBody] dynamic query)
@@ -272,7 +267,7 @@
}
/// <summary>
- /// 淇濆瓨璁よ瘉淇℃伅鐩稿叧浣跨敤鏁伴噺
+ /// 淇濆瓨璁よ瘉淇℃伅鐩稿叧浣跨敤鏁伴噺
/// </summary>
[HttpPost("saveIpqcrzxxNum")]
public ResponseResult SaveIpqcrzxxNum([FromBody] dynamic query)
@@ -299,9 +294,8 @@
return ResponseResult.ResponseError(ex);
}
}
-
/// <summary>
- /// 淇濆瓨鍝佹按娴嬭瘯鏄惁鏈夊紓鍛�
+ /// 淇濆瓨鍝佹按娴嬭瘯鏄惁鏈夊紓鍛�
/// </summary>
[HttpPost("saveIpqCpscs")]
public ResponseResult SaveIpqCpscs([FromBody] dynamic query)
@@ -331,7 +325,7 @@
/// <summary>
- /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
+ /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -374,4 +368,6 @@
return ResponseResult.ResponseError(ex);
}
}
+
+
}
\ No newline at end of file
diff --git a/Controllers/QC/LljController.cs b/Controllers/QC/LljController.cs
index 4ab24fe..0b2c7de 100644
--- a/Controllers/QC/LljController.cs
+++ b/Controllers/QC/LljController.cs
@@ -340,4 +340,6 @@
return ResponseResult.ResponseError(ex);
}
}
+
+
}
\ No newline at end of file
diff --git a/Controllers/QC/OAJyController.cs b/Controllers/QC/OAJyController.cs
index 8a3c1c3..d1efc34 100644
--- a/Controllers/QC/OAJyController.cs
+++ b/Controllers/QC/OAJyController.cs
@@ -1,6 +1,10 @@
+using System.Dynamic;
using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.QC;
using NewPdaSqlServer.util;
+using Newtonsoft.Json.Linq;
namespace NewPdaSqlServer.Controllers.QC;
@@ -8,22 +12,20 @@
[ApiController]
public class OAJyController : ControllerBase
{
- private readonly OaApiService m = new();
+ OaApiService m = new OaApiService();
[HttpPost("SumbitIQCToOA")]
- public ResponseResult SumbitIQCToOA(dynamic queryObj)
+ public ResponseResult SumbitIQCToOA(dynamic queryObj)
{
try
{
- var resultInfos = m.SubmitIQCToOA(queryObj);
-
+ dynamic resultInfos = m.SubmitIQCToOA(queryObj);
+
return new ResponseResult
{
- status = resultInfos.code?.ToString().ToUpper() == "SUCCESS"
- ? 0
- : 1,
- message = resultInfos.code?.ToString().ToUpper() == "SUCCESS"
- ? "OK"
+ status = (resultInfos.code?.ToString().ToUpper() == "SUCCESS") ? 0 : 1,
+ message = (resultInfos.code?.ToString().ToUpper() == "SUCCESS")
+ ? "OK"
: resultInfos.errMsg?.ToString() ?? "鏈煡閿欒",
data = resultInfos
};
@@ -33,4 +35,5 @@
return ResponseResult.ResponseError(ex);
}
}
+
}
\ No newline at end of file
diff --git a/Controllers/QC/OaToMesController.cs b/Controllers/QC/OaToMesController.cs
index 46e26e6..a0418e0 100644
--- a/Controllers/QC/OaToMesController.cs
+++ b/Controllers/QC/OaToMesController.cs
@@ -1,7 +1,11 @@
+using System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.QC;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
+using Newtonsoft.Json.Linq;
namespace NewPdaSqlServer.Controllers.QC;
@@ -9,14 +13,14 @@
[ApiController]
public class OaToMesController : ControllerBase
{
- private readonly MesOaToMesManager m = new();
+ MesOaToMesManager m = new MesOaToMesManager();
[HttpPost("ApproveIqcEx")]
public ResponseResult ApproveIqcEx(OaToMesQuery queryObj)
{
try
{
- var rtnMsg = m.ApproveIqcEx(queryObj);
+ string rtnMsg = m.ApproveIqcEx(queryObj);
return new ResponseResult
{
status = 0,
@@ -36,7 +40,7 @@
{
try
{
- var rtnMsg = m.RetrunIqcEx(queryObj);
+ string rtnMsg = m.RetrunIqcEx(queryObj);
return new ResponseResult
{
status = 0,
@@ -49,4 +53,5 @@
return ResponseResult.ResponseError(ex);
}
}
+
}
\ No newline at end of file
diff --git a/Controllers/Warehouse/InventoryController.cs b/Controllers/Warehouse/InventoryController.cs
index 2af07d0..ae03c9d 100644
--- a/Controllers/Warehouse/InventoryController.cs
+++ b/Controllers/Warehouse/InventoryController.cs
@@ -11,8 +11,9 @@
[Route("api/[controller]")]
public class InventoryController : ControllerBase
{
- private readonly MesPrintMangeer _mCf = new();
private readonly InventoryManager m = new();
+
+ private readonly MesPrintMangeer _mCf = new();
/// <summary>
/// 鎵弿搴撲綅鏉＄爜鐨勬帶鍒跺櫒鏂规硶
@@ -81,7 +82,7 @@
}
/// <summary>
- /// 鏈熷垵鎵撳嵃鎵弿搴撲綅鑾峰彇浠撳簱淇℃伅鍜屽簱瀛樼粍缁囦俊鎭�
+ /// 鏈熷垵鎵撳嵃鎵弿搴撲綅鑾峰彇浠撳簱淇℃伅鍜屽簱瀛樼粍缁囦俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -106,8 +107,8 @@
}
- /// <summary>
- /// 鏈熷垵鎵撳嵃鎵弿搴撲綅鑾峰彇浠撳簱淇℃伅鍜屽簱瀛樼粍缁囦俊鎭�
+ /// <summary>
+ /// 鏈熷垵鎵撳嵃鎵弿搴撲綅鑾峰彇浠撳簱淇℃伅鍜屽簱瀛樼粍缁囦俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -130,7 +131,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
[HttpPost("printBeginBar")]
public ResponseResult PrintBeginBar([FromBody] dynamic query)
{
@@ -140,7 +141,7 @@
resultInfos.tbBillList = new ExpandoObject();
resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
//var scanResult = m.BarCF(unity);
- resultInfos.tbBillList.cfBarInfo = m.ExecuteBeginBar(query);
+ resultInfos.tbBillList.cfBarInfo = m.ExecuteBeginBar(query);
//resultInfos.tbBillList = m.ExecuteBeginBar(query);
return new ResponseResult
{
diff --git a/Controllers/Warehouse/KwbgController.cs b/Controllers/Warehouse/KwbgController.cs
index 730f666..029b76d 100644
--- a/Controllers/Warehouse/KwbgController.cs
+++ b/Controllers/Warehouse/KwbgController.cs
@@ -1,35 +1,27 @@
-锘縰sing System.Dynamic;
-using Microsoft.AspNetCore.Mvc;
-using NewPdaSqlServer.service.@base;
-using NewPdaSqlServer.service.Warehouse;
-using NewPdaSqlServer.util;
-// 寮曞叆鍔ㄦ�佺被鍨嬫敮鎸�
-// 寮曞叆闃茬梾姣掑伐鍏峰簱锛堜絾鏈湪浠ｇ爜涓娇鐢級
-// 寮曞叆ASP.NET Core MVC鍔熻兘
-// 寮曞叆椤圭洰鐗瑰畾鐨凞TO鏈嶅姟
-// 寮曞叆椤圭洰瀹炰綋绫�
-// 寮曞叆鍩虹鏈嶅姟
-// 寮曞叆浠撳簱鏈嶅姟
-// 寮曞叆宸ュ叿绫�
+锘縰sing System.Dynamic; // 寮曞叆鍔ㄦ�佺被鍨嬫敮鎸�
+using Masuit.Tools.Win32.AntiVirus; // 寮曞叆闃茬梾姣掑伐鍏峰簱锛堜絾鏈湪浠ｇ爜涓娇鐢級
+using Microsoft.AspNetCore.Mvc; // 寮曞叆ASP.NET Core MVC鍔熻兘
+using NewPdaSqlServer.Dto.service; // 寮曞叆椤圭洰鐗瑰畾鐨凞TO鏈嶅姟
+using NewPdaSqlServer.entity; // 寮曞叆椤圭洰瀹炰綋绫�
+using NewPdaSqlServer.service.@base; // 寮曞叆鍩虹鏈嶅姟
+using NewPdaSqlServer.service.Warehouse; // 寮曞叆浠撳簱鏈嶅姟
+using NewPdaSqlServer.util; // 寮曞叆宸ュ叿绫�
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory; // 寮曞叆EF鏃ュ織绫诲埆锛堜絾鏈湪浠ｇ爜涓娇鐢級
-// 寮曞叆EF鏃ュ織绫诲埆锛堜絾鏈湪浠ｇ爜涓娇鐢級
-
-namespace NewPdaSqlServer.Controllers.Warehouse;
-// 鎺у埗鍣ㄥ懡鍚嶇┖闂�
+namespace NewPdaSqlServer.Controllers.Warehouse; // 鎺у埗鍣ㄥ懡鍚嶇┖闂�
/// <summary>
-/// 搴撲綅鍙樻洿鎺у埗鍣紝澶勭悊涓庡簱浣嶅彉鏇寸浉鍏崇殑API璇锋眰
+/// 搴撲綅鍙樻洿鎺у埗鍣紝澶勭悊涓庡簱浣嶅彉鏇寸浉鍏崇殑API璇锋眰
/// </summary>
[ApiController] // 鏍囪璇ョ被涓篈PI鎺у埗鍣紝鑷姩杩涜妯″瀷楠岃瘉鍜岄敊璇鐞�
[Route("api/[controller]")] // 瀹氫箟鎺у埗鍣ㄨ矾鐢辨ā鏉匡紝璺敱鍓嶇紑涓篴pi/鎺у埗鍣ㄥ悕锛圞wbg锛�
-public class
- KwbgController : ControllerBase // 鎺у埗鍣ㄧ被缁ф壙鑷狢ontrollerBase锛屾彁渚沇eb API鍔熻兘
+public class KwbgController : ControllerBase // 鎺у埗鍣ㄧ被缁ф壙鑷狢ontrollerBase锛屾彁渚沇eb API鍔熻兘
{
- private readonly MesPrintMangeer _kBG = new(); // 鍒涘缓鎵撳嵃绠＄悊鍣ㄥ疄渚嬶紝鐢ㄤ簬澶勭悊鎵撳嵃鐩稿叧涓氬姟
private readonly KwbgManager k = new(); // 鍒涘缓搴撲綅鍙樻洿绠＄悊鍣ㄥ疄渚嬶紝鐢ㄤ簬澶勭悊涓氬姟閫昏緫
+ private readonly MesPrintMangeer _kBG = new(); // 鍒涘缓鎵撳嵃绠＄悊鍣ㄥ疄渚嬶紝鐢ㄤ簬澶勭悊鎵撳嵃鐩稿叧涓氬姟
/// <summary>
- /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
/// </summary>
/// <param name="unity">鍓嶇浼犻�掔殑WarehouseQuery瀵硅薄锛屽寘鍚煡璇㈠弬鏁�</param>
/// <returns>缁熶竴鐨勫搷搴旂粨鏋滐紝鍖呭惈鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�</returns>
@@ -40,8 +32,7 @@
try // 鎹曡幏寮傚父锛屼繚璇佹帴鍙ｇǔ瀹氭��
{
dynamic resultInfos = new ExpandoObject(); // 鍒涘缓鍔ㄦ�佸璞★紝鐢ㄤ簬瀛樺偍杩斿洖缁撴灉
- resultInfos.tbBillList =
- k.GetBarInfo(unity); // 璋冪敤绠＄悊鍣ㄦ柟娉曪紝鑾峰彇鏉＄爜淇℃伅锛岃祴鍊肩粰鍔ㄦ�佸璞＄殑tbBillList灞炴��
+ resultInfos.tbBillList = k.GetBarInfo(unity); // 璋冪敤绠＄悊鍣ㄦ柟娉曪紝鑾峰彇鏉＄爜淇℃伅锛岃祴鍊肩粰鍔ㄦ�佸璞＄殑tbBillList灞炴��
return new ResponseResult // 鏋勯�犵粺涓�鍝嶅簲缁撴灉瀵硅薄
{
status = 0, // 鐘舵�佺爜0琛ㄧず鎴愬姛
@@ -56,14 +47,14 @@
}
/// <summary>
- /// 搴撲綅鍙樻洿鎺ュ彛銆�
- /// 鎺ユ敹鍓嶇浼犻�掔殑WarehouseQuery鍙傛暟锛屽畬鎴愭潯鐮佸彉鏇村強鐩稿叧淇℃伅鐨勬煡璇㈠拰杩斿洖銆�
+ /// 搴撲綅鍙樻洿鎺ュ彛銆�
+ /// 鎺ユ敹鍓嶇浼犻�掔殑WarehouseQuery鍙傛暟锛屽畬鎴愭潯鐮佸彉鏇村強鐩稿叧淇℃伅鐨勬煡璇㈠拰杩斿洖銆�
/// </summary>
/// <param name="unity">
- /// WarehouseQuery瀵硅薄锛屽寘鍚潯鐮併�佹媶鍒嗘暟閲忋�佺敤鎴峰悕绛夊簱浣嶅彉鏇存墍闇�鍙傛暟銆�
+ /// WarehouseQuery瀵硅薄锛屽寘鍚潯鐮併�佹媶鍒嗘暟閲忋�佺敤鎴峰悕绛夊簱浣嶅彉鏇存墍闇�鍙傛暟銆�
/// </param>
/// <returns>
- /// 杩斿洖ResponseResult缁熶竴鍝嶅簲瀵硅薄锛宻tatus涓�0琛ㄧず鎴愬姛锛宒ata鍖呭惈鍙樻洿鍚庣殑鏉＄爜鍙婃墦鍗颁俊鎭��
+ /// 杩斿洖ResponseResult缁熶竴鍝嶅簲瀵硅薄锛宻tatus涓�0琛ㄧず鎴愬姛锛宒ata鍖呭惈鍙樻洿鍚庣殑鏉＄爜鍙婃墦鍗颁俊鎭��
/// </returns>
[HttpPost("ChangeDepotSection")]
public ResponseResult ChangeDepotSection(dynamic unity)
@@ -76,7 +67,7 @@
resultInfos.tbBillList = new ExpandoObject();
//resultInfos.tbBillList.printInfo = _kBG.getPrintInfo(unity);// 鑾峰彇鎵撳嵃淇℃伅锛岃皟鐢ㄦ墦鍗扮鐞嗗櫒鐨刧etPrintInfo鏂规硶锛岀粨鏋滆祴鍊肩粰tbBillList.printInfo
-
+
// 璋冪敤搴撲綅鍙樻洿绠＄悊鍣ㄧ殑ChangeDepotSection鏂规硶锛屾墽琛屾潯鐮佸彉鏇存搷浣滐紝杩斿洖鎷嗗垎缁撴灉scanResult
var scanResult = k.ChangeDepotSection(unity);
diff --git a/Controllers/Warehouse/MesBarCFController.cs b/Controllers/Warehouse/MesBarCFController.cs
index 2f33766..09436ea 100644
--- a/Controllers/Warehouse/MesBarCFController.cs
+++ b/Controllers/Warehouse/MesBarCFController.cs
@@ -1,9 +1,12 @@
锘縰sing System.Dynamic;
+using Masuit.Tools.Win32.AntiVirus;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.Controllers.Warehouse;
@@ -11,8 +14,9 @@
[Route("api/[controller]")]
public class MesBarCFController : ControllerBase
{
- private readonly MesPrintMangeer _mCf = new();
private readonly MesBarCFManager m = new();
+
+ private readonly MesPrintMangeer _mCf = new();
/// <summary>
/// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
@@ -50,8 +54,7 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.GetBarInfoBefore(unity);
- resultInfos.tbMesItems =
- m.GetItemNo(resultInfos.tbBillList.ITEM_ID);
+ resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ITEM_ID);
return new ResponseResult
{
status = 0,
diff --git a/Controllers/Warehouse/MesCgthSqController.cs b/Controllers/Warehouse/MesCgthSqController.cs
index b2dd732..f27b6f4 100644
--- a/Controllers/Warehouse/MesCgthSqController.cs
+++ b/Controllers/Warehouse/MesCgthSqController.cs
@@ -10,10 +10,10 @@
[ApiController]
[Route("api/[controller]")]
-public class MesCgthSqController : ControllerBase
+public class MesCgthSqController : BaseController
{
- private readonly MesPrintMangeer _mCf = new();
private readonly MesCgthSqManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
/// <summary>
@@ -26,7 +26,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetMesCgthSq();
+ resultInfos.tbBillList = m.GetMesCgthSq(RequestInfo);
return new ResponseResult
{
status = 0,
@@ -50,7 +50,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetSumItem(query);
+ resultInfos.tbBillList = m.GetSumItem(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -66,7 +66,7 @@
//ScanCode
/// <summary>
- /// 閲囪喘閫�璐�
+ /// 閲囪喘閫�璐�
/// </summary>
/// <returns></returns>
[HttpPost("ScanCode")]
@@ -77,12 +77,14 @@
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.ScanCode(query);
if (resultInfos.tbBillList.result == "2")
+ {
return new ResponseResult
{
status = Convert.ToInt32(resultInfos.tbBillList.result),
message = resultInfos.tbBillList.strMsg,
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
@@ -98,7 +100,7 @@
//ScanCode
/// <summary>
- /// 閲囪喘楠岄��
+ /// 閲囪喘楠岄��
/// </summary>
/// <returns></returns>
[HttpPost("ScanCgyt")]
@@ -126,7 +128,7 @@
//ScanCode
/// <summary>
- /// 閲囪喘閫�璐у垹闄�
+ /// 閲囪喘閫�璐у垹闄�
/// </summary>
/// <returns></returns>
[HttpPost("deleteCgyt")]
diff --git a/Controllers/Warehouse/MesCprkController.cs b/Controllers/Warehouse/MesCprkController.cs
index 569959e..b4fb843 100644
--- a/Controllers/Warehouse/MesCprkController.cs
+++ b/Controllers/Warehouse/MesCprkController.cs
@@ -1,6 +1,7 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
@@ -23,13 +24,15 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.GetBarInfo(unity);
- if (resultInfos.tbBillList == null)
+ if(resultInfos.tbBillList == null)
+ {
return new ResponseResult
{
status = -1,
message = "姝ゆ潯鐮佷笉瀛樺湪锛侊紒锛�",
data = resultInfos
};
+ }
resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ItemId);
return new ResponseResult
{
diff --git a/Controllers/Warehouse/MesDbckController.cs b/Controllers/Warehouse/MesDbckController.cs
index 96f0768..8556a00 100644
--- a/Controllers/Warehouse/MesDbckController.cs
+++ b/Controllers/Warehouse/MesDbckController.cs
@@ -1,5 +1,6 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
diff --git a/Controllers/Warehouse/MesItemBlController.cs b/Controllers/Warehouse/MesItemBlController.cs
index 24036d0..5505fed 100644
--- a/Controllers/Warehouse/MesItemBlController.cs
+++ b/Controllers/Warehouse/MesItemBlController.cs
@@ -1,4 +1,5 @@
锘縰sing System.Dynamic;
+using Masuit.Tools.Win32.AntiVirus;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
@@ -331,13 +332,15 @@
var (success, pendingList) = _manager.ScblScanBarcode(query);
resultInfos.success = success;
resultInfos.pendingList = pendingList;
- if (success.status == 2)
+ if(success.status == 2)
+ {
return new ResponseResult
{
status = Convert.ToInt32(success.status),
message = success.message,
data = resultInfos.success
};
+ }
return new ResponseResult
{
status = 0,
@@ -504,8 +507,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- _manager.GetMesItemWWBlDetailByBillNo(query);
+ resultInfos.tbBillList = _manager.GetMesItemWWBlDetailByBillNo(query);
return new ResponseResult
{
status = 0,
diff --git a/Controllers/Warehouse/MesItemQtController.cs b/Controllers/Warehouse/MesItemQtController.cs
index c27e795..3a80f9e 100644
--- a/Controllers/Warehouse/MesItemQtController.cs
+++ b/Controllers/Warehouse/MesItemQtController.cs
@@ -94,14 +94,12 @@
/// <response code="200">鎴愬姛鑾峰彇閫�鏂欏崟鏄庣粏</response>
/// <response code="400">鑾峰彇澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
[HttpPost("GetPendingQtDetailList")]
- public ResponseResult GetPendingQtDetailList(
- [FromBody] WarehouseQuery query)
+ public ResponseResult GetPendingQtDetailList([FromBody] WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- _manager.GetPendingQtDetailList(query, RequestInfo);
+ resultInfos.tbBillList = _manager.GetPendingQtDetailList(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -162,12 +160,14 @@
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = _manager.ScanCode(query);
if (resultInfos.tbBillList.result == "2")
+ {
return new ResponseResult
{
status = Convert.ToInt32(resultInfos.tbBillList.result),
message = resultInfos.tbBillList.strMsg,
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
diff --git a/Controllers/Warehouse/MesItemQtrkController.cs b/Controllers/Warehouse/MesItemQtrkController.cs
index ee3dda7..bef03d4 100644
--- a/Controllers/Warehouse/MesItemQtrkController.cs
+++ b/Controllers/Warehouse/MesItemQtrkController.cs
@@ -134,8 +134,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- _manager.GetQtckDetailList(query, RequestInfo);
+ resultInfos.tbBillList = _manager.GetQtckDetailList(query, RequestInfo);
//if(resultInfos.tbBillList.Count < 1)
//{
diff --git a/Controllers/Warehouse/MesItemTblController.cs b/Controllers/Warehouse/MesItemTblController.cs
index 3b7d490..8fa0035 100644
--- a/Controllers/Warehouse/MesItemTblController.cs
+++ b/Controllers/Warehouse/MesItemTblController.cs
@@ -200,8 +200,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- m.GetMesItemTblDetailByBillNo(query, RequestInfo);
+ resultInfos.tbBillList = m.GetMesItemTblDetailByBillNo(query, RequestInfo);
//if(resultInfos.tbBillList.Count < 1)
//{
diff --git a/Controllers/Warehouse/MesKwcxController.cs b/Controllers/Warehouse/MesKwcxController.cs
index 3db883e..308f38e 100644
--- a/Controllers/Warehouse/MesKwcxController.cs
+++ b/Controllers/Warehouse/MesKwcxController.cs
@@ -1,5 +1,7 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
@@ -46,13 +48,15 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBarInfo = m.GetBarInfo(query);
- if (resultInfos.tbBarInfo == null)
+ if(resultInfos.tbBarInfo == null)
+ {
return new ResponseResult
{
status = -1,
message = "姝ゆ潯鐮佷笉瀛樺湪锛侊紒锛�",
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
@@ -112,7 +116,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbItemInfo = m.GetItemInfoList(query, RequestInfo);
+ resultInfos.tbItemInfo = m.GetItemInfoList(query,RequestInfo);
return new ResponseResult
{
status = 0,
diff --git a/Controllers/Warehouse/MesSctkController.cs b/Controllers/Warehouse/MesSctkController.cs
index 2c780de..a0e4517 100644
--- a/Controllers/Warehouse/MesSctkController.cs
+++ b/Controllers/Warehouse/MesSctkController.cs
@@ -1,4 +1,5 @@
锘縰sing System.Dynamic;
+using MES.Service.Models;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
diff --git a/Controllers/Warehouse/MesStrkController.cs b/Controllers/Warehouse/MesStrkController.cs
index 670104d..fdb9a09 100644
--- a/Controllers/Warehouse/MesStrkController.cs
+++ b/Controllers/Warehouse/MesStrkController.cs
@@ -16,92 +16,7 @@
{
private readonly MesStrkManager _manager = new();
-
- /// <summary>
- /// 鑾峰彇鍙楁墭鍏ュ簱鐢宠鍒楄〃
- /// </summary>
- /// <returns>鍙楁墭鍏ュ簱鐢宠鍒楄〃</returns>
- [HttpPost("GetStrkBillNo")]
- public ResponseResult GetStrkBillNo(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetStrkBillNo(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁鍗曞彿鑾峰彇鍙楁墭鍏ュ簱鍗曟槑缁�
- /// </summary>
- /// <param name="query">鏌ヨ鍙傛暟</param>
- /// <returns>鍙楁墭鍏ュ簱鍗曟槑缁嗗垪琛�</returns>
- [HttpPost("GetMesItemDetailByBillNo")]
- public ResponseResult GetMesItemDetailByBillNo(
- [FromBody] WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetMesItemDetailByBillNo(query);
-
- if (resultInfos.tbBillList.Count < 1)
- return new ResponseResult
- {
- status = 1,
- message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
- data = ""
- };
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost("XsthScanBarcode")]
- public ResponseResult XsthScanBarcode(WarehouseQuery unity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.XsthScanBarcode(unity);
- return new ResponseResult
- {
- status = 0,
- message = resultInfos.tbBillList,
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
#region 鍩虹
-
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
/// <summary>
@@ -249,4 +164,92 @@
}
#endregion
+
+
+ /// <summary>
+ /// 鑾峰彇鍙楁墭鍏ュ簱鐢宠鍒楄〃
+ /// </summary>
+ /// <returns>鍙楁墭鍏ュ簱鐢宠鍒楄〃</returns>
+ [HttpPost("GetStrkBillNo")]
+ public ResponseResult GetStrkBillNo(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.GetStrkBillNo(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曞彿鑾峰彇鍙楁墭鍏ュ簱鍗曟槑缁�
+ /// </summary>
+ /// <param name="query">鏌ヨ鍙傛暟</param>
+ /// <returns>鍙楁墭鍏ュ簱鍗曟槑缁嗗垪琛�</returns>
+ [HttpPost("GetMesItemDetailByBillNo")]
+ public ResponseResult GetMesItemDetailByBillNo(
+ [FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.GetMesItemDetailByBillNo(query);
+
+ if (resultInfos.tbBillList.Count < 1)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
+ data = ""
+ };
+ }
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("XsthScanBarcode")]
+ public ResponseResult XsthScanBarcode(WarehouseQuery unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.XsthScanBarcode(unity);
+ return new ResponseResult
+ {
+ status = 0,
+ message = resultInfos.tbBillList,
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
}
\ No newline at end of file
diff --git a/Controllers/Warehouse/MesSttlController.cs b/Controllers/Warehouse/MesSttlController.cs
index 52cfd21..2496b66 100644
--- a/Controllers/Warehouse/MesSttlController.cs
+++ b/Controllers/Warehouse/MesSttlController.cs
@@ -4,6 +4,7 @@
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.Controllers.Warehouse;
@@ -16,99 +17,7 @@
{
private readonly MesSttlManager _manager = new();
-
- /// <summary>
- /// 鑾峰彇鍙楁墭閫�鏂欑敵璇峰垪琛�
- /// </summary>
- /// <returns>鍙楁墭閫�鏂欑敵璇峰垪琛�</returns>
- [HttpPost("GetSttlBillNo")]
- public ResponseResult GetSttlBillNo(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetSttlBillNo(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁鍗曞彿鑾峰彇鍙楁墭閫�鏂欏崟鏄庣粏
- /// </summary>
- /// <param name="query">鏌ヨ鍙傛暟</param>
- /// <returns>鍙楁墭閫�鏂欏崟鏄庣粏鍒楄〃</returns>
- [HttpPost("GetMesItemDetailByBillNo")]
- public ResponseResult GetMesItemDetailByBillNo(
- [FromBody] WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetMesItemDetailByBillNo(query);
-
- if (resultInfos.tbBillList.Count < 1)
- return new ResponseResult
- {
- status = 1,
- message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
- data = ""
- };
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost("SttlScanBarcode")]
- public ResponseResult SttlScanBarcode(WarehouseQuery unity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.SttlScanBarcode(unity);
- if (resultInfos.tbBillList.result == "2")
- return new ResponseResult
- {
- status = Convert.ToInt32(resultInfos.tbBillList.result),
- message = resultInfos.tbBillList.strMsg,
- data = resultInfos
- };
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
#region 鍩虹
-
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
/// <summary>
@@ -256,4 +165,102 @@
}
#endregion
+
+
+ /// <summary>
+ /// 鑾峰彇鍙楁墭閫�鏂欑敵璇峰垪琛�
+ /// </summary>
+ ///
+ /// <returns>鍙楁墭閫�鏂欑敵璇峰垪琛�</returns>
+ [HttpPost("GetSttlBillNo")]
+ public ResponseResult GetSttlBillNo(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.GetSttlBillNo(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曞彿鑾峰彇鍙楁墭閫�鏂欏崟鏄庣粏
+ /// </summary>
+ /// <param name="query">鏌ヨ鍙傛暟</param>
+ /// <returns>鍙楁墭閫�鏂欏崟鏄庣粏鍒楄〃</returns>
+ [HttpPost("GetMesItemDetailByBillNo")]
+ public ResponseResult GetMesItemDetailByBillNo(
+ [FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.GetMesItemDetailByBillNo(query);
+
+ if (resultInfos.tbBillList.Count < 1)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
+ data = ""
+ };
+ }
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("SttlScanBarcode")]
+ public ResponseResult SttlScanBarcode(WarehouseQuery unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.SttlScanBarcode(unity);
+ if (resultInfos.tbBillList.result == "2")
+ {
+ return new ResponseResult
+ {
+ status = Convert.ToInt32(resultInfos.tbBillList.result),
+ message = resultInfos.tbBillList.strMsg,
+ data = resultInfos
+ };
+ }
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
}
\ No newline at end of file
diff --git a/Controllers/Warehouse/MesXkyController.cs b/Controllers/Warehouse/MesXkyController.cs
index be70a77..b98b049 100644
--- a/Controllers/Warehouse/MesXkyController.cs
+++ b/Controllers/Warehouse/MesXkyController.cs
@@ -1,8 +1,10 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.QC;
-using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
+using Newtonsoft.Json.Linq;
namespace NewPdaSqlServer.Controllers.Warehouse;
@@ -10,10 +12,32 @@
[ApiController]
public class MesXkyController : ControllerBase
{
- private readonly MesXkyService m = new();
+ //鍒拌揣鍗曟帹閫乯son
+ public class XKYGetDhdRequest
+ {
+ public long? startDate { get; set; }
+ public long? endDate { get; set; }
+ public string? erpCode { get; set; }
+ }
+
+ //鍒拌揣鍗曟槑缁唈son 鍜� 鍒拌揣鍗曟潯鐮�
+ public class XKYGetDhdDeatilRequest
+ {
+ public string? deliveryNo { get; set; }
+ public string? erpCode { get; set; }
+ }
+
+ //鍒拌揣鍗曟槑缁唈son 鍜� 鍒拌揣鍗曟潯鐮�
+ public class XKYGetDhdHwsdRequest
+ {
+ public string? dnXkNo { get; set; }
+ public string? erpCode { get; set; }
+ }
+
+ MesXkyService m = new MesXkyService();
[HttpPost("GetXkyDhd")]
- public ResponseResult GetXkyDhd(XKYGetDhdRequest request)
+ public ResponseResult GetXkyDhd( XKYGetDhdRequest request)
{
try
{
@@ -97,25 +121,4 @@
}
}
- //鍒拌揣鍗曟帹閫乯son
- public class XKYGetDhdRequest
- {
- public long? startDate { get; set; }
- public long? endDate { get; set; }
- public string? erpCode { get; set; }
- }
-
- //鍒拌揣鍗曟槑缁唈son 鍜� 鍒拌揣鍗曟潯鐮�
- public class XKYGetDhdDeatilRequest
- {
- public string? deliveryNo { get; set; }
- public string? erpCode { get; set; }
- }
-
- //鍒拌揣鍗曟槑缁唈son 鍜� 鍒拌揣鍗曟潯鐮�
- public class XKYGetDhdHwsdRequest
- {
- public string? dnXkNo { get; set; }
- public string? erpCode { get; set; }
- }
}
\ No newline at end of file
diff --git a/Controllers/Warehouse/MesXkyShdController.cs b/Controllers/Warehouse/MesXkyShdController.cs
index 6dcf854..8aad5e8 100644
--- a/Controllers/Warehouse/MesXkyShdController.cs
+++ b/Controllers/Warehouse/MesXkyShdController.cs
@@ -1,6 +1,7 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
@@ -48,13 +49,15 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.GetBarInfo(unity);
- if (resultInfos.tbBillList == null)
+ if(resultInfos.tbBillList == null)
+ {
return new ResponseResult
{
status = -1,
message = "姝ゆ潯鐮佷笉瀛樺湪锛侊紒锛�",
data = resultInfos
};
+ }
resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ItemId);
return new ResponseResult
{
diff --git a/Controllers/Warehouse/MesXsckController.cs b/Controllers/Warehouse/MesXsckController.cs
index 7522d21..6b984aa 100644
--- a/Controllers/Warehouse/MesXsckController.cs
+++ b/Controllers/Warehouse/MesXsckController.cs
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
@@ -15,6 +16,8 @@
public class MesXsckController : BaseController
{
private readonly MesXsckManager _manager = new();
+
+ private readonly MesPrintMangeer _mCf = new();
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
@@ -196,14 +199,21 @@
/// <response code="200">鎷嗗垎鎴愬姛</response>
/// <response code="400">鎷嗗垎澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
[HttpPost("SplitBarcode")]
- public ResponseResult SplitBarcode([FromBody] WarehouseQuery query)
+ public ResponseResult SplitBarcode(WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- var (success, pendingList) = _manager.SplitBarcode(query);
- resultInfos.success = success;
- resultInfos.pendingList = pendingList;
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+ var scanResult = _manager.SplitBarcode(query);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
+
+ //dynamic resultInfos = new ExpandoObject();
+ //var (success, pendingList) = _manager.SplitBarcode(query);
+ //resultInfos.success = success;
+ //resultInfos.pendingList = pendingList;
+
return new ResponseResult
{
status = 0,
@@ -266,8 +276,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- _manager.GetMesItemFHTZetailByBillNo(query, RequestInfo);
+ resultInfos.tbBillList = _manager.GetMesItemFHTZetailByBillNo(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -306,12 +315,14 @@
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = _manager.XSCKScanBarcode(query);
if (resultInfos.tbBillList.result == "2")
+ {
return new ResponseResult
{
status = Convert.ToInt32(resultInfos.tbBillList.result),
message = resultInfos.tbBillList.strMsg,
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
@@ -326,4 +337,5 @@
}
#endregion
+
}
\ No newline at end of file
diff --git a/Controllers/Warehouse/MesXsthController.cs b/Controllers/Warehouse/MesXsthController.cs
index b056063..6b6e66f 100644
--- a/Controllers/Warehouse/MesXsthController.cs
+++ b/Controllers/Warehouse/MesXsthController.cs
@@ -16,93 +16,7 @@
{
private readonly MesXsthManager _manager = new();
-
- /// <summary>
- /// 鑾峰彇閿�鍞��璐х敵璇峰垪琛�
- /// </summary>
- /// <returns>閿�鍞��璐х敵璇峰垪琛�</returns>
- [HttpPost("GetXsthBillNo")]
- public ResponseResult GetXsthBillNo(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetXsthBillNo(query, RequestInfo);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁鍗曞彿鑾峰彇閿�鍞��璐у崟鏄庣粏
- /// </summary>
- /// <param name="query">鏌ヨ鍙傛暟</param>
- /// <returns>閿�鍞��璐у崟鏄庣粏鍒楄〃</returns>
- [HttpPost("GetMesItemDetailByBillNo")]
- public ResponseResult GetMesItemDetailByBillNo(
- [FromBody] WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- _manager.GetMesItemDetailByBillNo(query, RequestInfo);
-
- if (resultInfos.tbBillList.Count < 1)
- return new ResponseResult
- {
- status = 1,
- message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
- data = ""
- };
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost("XsthScanBarcode")]
- public ResponseResult XsthScanBarcode(WarehouseQuery unity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.XsthScanBarcode(unity);
- return new ResponseResult
- {
- status = 0,
- message = resultInfos.tbBillList,
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
#region 鍩虹
-
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
/// <summary>
@@ -250,4 +164,92 @@
}
#endregion
+
+
+ /// <summary>
+ /// 鑾峰彇閿�鍞��璐х敵璇峰垪琛�
+ /// </summary>
+ /// <returns>閿�鍞��璐х敵璇峰垪琛�</returns>
+ [HttpPost("GetXsthBillNo")]
+ public ResponseResult GetXsthBillNo(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.GetXsthBillNo(query, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曞彿鑾峰彇閿�鍞��璐у崟鏄庣粏
+ /// </summary>
+ /// <param name="query">鏌ヨ鍙傛暟</param>
+ /// <returns>閿�鍞��璐у崟鏄庣粏鍒楄〃</returns>
+ [HttpPost("GetMesItemDetailByBillNo")]
+ public ResponseResult GetMesItemDetailByBillNo(
+ [FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.GetMesItemDetailByBillNo(query, RequestInfo);
+
+ if (resultInfos.tbBillList.Count < 1)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
+ data = ""
+ };
+ }
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("XsthScanBarcode")]
+ public ResponseResult XsthScanBarcode(WarehouseQuery unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = _manager.XsthScanBarcode(unity);
+ return new ResponseResult
+ {
+ status = 0,
+ message = resultInfos.tbBillList,
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
}
\ No newline at end of file
diff --git a/Controllers/Warehouse/TransferOutController.cs b/Controllers/Warehouse/TransferOutController.cs
index e430eeb..e4a02de 100644
--- a/Controllers/Warehouse/TransferOutController.cs
+++ b/Controllers/Warehouse/TransferOutController.cs
@@ -172,7 +172,7 @@
[HttpPost("GetTransferInDetailListByBillNo")]
public ResponseResult GetTransferInDetailListByBillNo(
- [FromBody] WarehouseQuery query)
+ [FromBody] WarehouseQuery query)
{
try
{
@@ -226,12 +226,14 @@
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = _manager.ScanMoveBarcode(query);
if (resultInfos.tbBillList.result == "2")
+ {
return new ResponseResult
{
status = Convert.ToInt32(resultInfos.tbBillList.result),
message = resultInfos.tbBillList.strMsg,
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index 685e347..3b5c3ca 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -1,5 +1,6 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
@@ -12,8 +13,8 @@
[Route("api/[controller]")]
public class WomdaaController : BaseController
{
- private readonly MesPrintMangeer _mCf = new();
private readonly WomdaaManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
#region 鐢熶骇棰嗘枡
@@ -28,8 +29,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- m.GetProductionPickDaa001(query, RequestInfo);
+ resultInfos.tbBillList = m.GetProductionPickDaa001(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -79,13 +79,15 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.ScanCode(query);
- if (resultInfos.tbBillList.result == "2")
+ if(resultInfos.tbBillList.result == "2")
+ {
return new ResponseResult
{
status = Convert.ToInt32(resultInfos.tbBillList.result),
message = resultInfos.tbBillList.strMsg,
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
@@ -135,6 +137,30 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.GetBarKwByItem(unity);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鐢熶骇棰嗘枡鐐瑰嚮鐗╂枡鏄庣粏鑾峰彇鐩稿叧鏉＄爜淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetBarKwByItemCK")]
+ public ResponseResult GetBarKwByItemCK(dynamic unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetBarKwByItemCK(unity);
return new ResponseResult
{
status = 0,
@@ -268,7 +294,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
/// <summary>
/// 淇敼
@@ -293,10 +319,10 @@
return ResponseResult.ResponseError(ex);
}
}
-
#endregion
#region 鐜板満绠＄悊
+
/// <summary>
/// 鎵弿娉ㄥ鐮侊紝鑾峰彇宸ュ崟鍜屾潯鐮佷俊鎭�
@@ -535,7 +561,7 @@
/// <summary>
- /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
+ /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -623,8 +649,7 @@
// 鍏堝垵濮嬪寲tbBillList灞炴��
resultInfos.tbBillList = new ExpandoObject();
resultInfos.tbBillList.ZsBarInfo = m.getHgBarInfo(query);
- resultInfos.tbBillList.Traceability =
- m.getTraceabilityByLsBar(query);
+ resultInfos.tbBillList.Traceability = m.getTraceabilityByLsBar(query);
return new ResponseResult
{
status = 0,
@@ -689,7 +714,7 @@
/// <summary>
- /// AGV鍛煎彨绾夸綋鍒楄〃
+ /// AGV鍛煎彨绾夸綋鍒楄〃
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -716,8 +741,8 @@
#endregion
- #region pda璋冪敤AGV鐩稿叧
+ #region pda璋冪敤AGV鐩稿叧
/// <summary>
/// AGV閫佹
/// </summary>
@@ -741,7 +766,7 @@
}
}
- /// <summary>
+ /// <summary>
/// AGV鍛煎彨
/// </summary>
[HttpPost("handleAGVCall")]
@@ -765,7 +790,7 @@
}
/// <summary>
- /// AGV妫�楠屽鐞�
+ /// AGV妫�楠屽鐞�
/// </summary>
[HttpPost("handleAgvJy")]
public ResponseResult HandleAgvJy([FromBody] dynamic query)
diff --git a/Controllers/Wom/WwGdController.cs b/Controllers/Wom/WwGdController.cs
index c6d08ba..4e39fb9 100644
--- a/Controllers/Wom/WwGdController.cs
+++ b/Controllers/Wom/WwGdController.cs
@@ -9,7 +9,7 @@
[ApiController]
[Route("api/[controller]")]
-public class WwGdController : ControllerBase
+public class WwGdController : BaseController
{
private readonly WwGdManager m = new();
@@ -36,12 +36,14 @@
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.ScanCode(query);
if (resultInfos.tbBillList.result == "2")
+ {
return new ResponseResult
{
status = Convert.ToInt32(resultInfos.tbBillList.result),
message = resultInfos.tbBillList.strMsg,
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
@@ -92,6 +94,61 @@
}
}
+
+ /// <summary>
+ /// 鑾峰彇搴撲綅淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetBarKwByItem")]
+ public ResponseResult GetBarKwByItem(dynamic unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetBarKwByItem(unity);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <summary>
+ /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("GetXcslDaa")]
+ public ResponseResult GetXcslDaa([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetXcslDaa(query, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
/// <summary>
/// 鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁�
/// </summary>
@@ -112,7 +169,7 @@
{
// 璋冪敤WwGdManager鐨凣etItemsByDaa001鏂规硶鑾峰彇浠ｉ鐗╂枡鏄庣粏
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItemsByDaa001(query);
+ resultInfos.tbBillList = m.GetItemsByDaa001(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -152,12 +209,14 @@
resultInfos.success = success;
resultInfos.pendingList = pendingList;
if (success.status == 2)
+ {
return new ResponseResult
{
status = Convert.ToInt32(success.status),
message = success.message,
data = resultInfos.success
};
+ }
return new ResponseResult
{
status = 0,
diff --git a/Controllers/base/MesImageController.cs b/Controllers/base/MesImageController.cs
index b218c7e..4c15216 100644
--- a/Controllers/base/MesImageController.cs
+++ b/Controllers/base/MesImageController.cs
@@ -1,8 +1,9 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
-using NewPdaSqlServer.Dto.@base;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
+using NewPdaSqlServer.service.QC;
using NewPdaSqlServer.util;
namespace NewPdaSqlServer.Controllers.@base;
@@ -11,7 +12,7 @@
[Route("api/[controller]")]
public class MesImageController : ControllerBase
{
- private readonly MesImageManager m = new();
+ private MesImageManager m = new();
//鑾峰彇鍥剧墖
[HttpPost("getImage")]
@@ -56,4 +57,5 @@
return ResponseResult.ResponseError(ex);
}
}
+
}
\ No newline at end of file
diff --git a/Controllers/base/MesPrintController.cs b/Controllers/base/MesPrintController.cs
index ae020e5..224e620 100644
--- a/Controllers/base/MesPrintController.cs
+++ b/Controllers/base/MesPrintController.cs
@@ -1,6 +1,9 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
+using NewPdaSqlServer.service.Wom;
using NewPdaSqlServer.util;
namespace NewPdaSqlServer.Controllers.@base;
@@ -65,4 +68,5 @@
return ResponseResult.ResponseError(ex);
}
}
+
}
\ No newline at end of file
diff --git a/Controllers/base/WmsBaseController.cs b/Controllers/base/WmsBaseController.cs
index 62d9d96..2321d60 100644
--- a/Controllers/base/WmsBaseController.cs
+++ b/Controllers/base/WmsBaseController.cs
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.service.@base;
+using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
namespace NewPdaSqlServer.Controllers.@base;
diff --git a/DB/DbHelperSQL.cs b/DB/DbHelperSQL.cs
new file mode 100644
index 0000000..cf0d708
--- /dev/null
+++ b/DB/DbHelperSQL.cs
@@ -0,0 +1,677 @@
+锘縰sing System.Collections;
+using System.Data;
+using System.Data.SqlClient;
+using NewPdaSqlServer.util;
+
+namespace NewPdaSqlServer.DB;
+
+/// <summary>
+/// 鏁版嵁璁块棶绫�
+/// </summary>
+public abstract class DbHelperSQL
+{
+ //鏁版嵁搴撹繛鎺ュ瓧绗︿覆(web.config鏉ラ厤缃�)
+ public static readonly string strConn =
+ AppsettingsUtility.Settings.DataBaseConn;
+
+ #region 鍏敤鏂规硶
+
+ /// <summary>
+ /// 鍙栧埌鏈�澶у瓧娈靛��
+ /// </summary>
+ /// <param name="FieldName"></param>
+ /// <param name="TableName"></param>
+ /// <returns></returns>
+ public static int GetMaxID(string FieldName, string TableName)
+ {
+ var strsql = "select max(" + FieldName + ") from " + TableName;
+ var obj = GetSingle(strsql);
+ if (obj == null)
+ return 0;
+ return int.Parse(obj.ToString());
+ }
+
+ /// <summary>
+ /// 鏄惁瀛樺湪鏌愭潯璁板綍
+ /// </summary>
+ /// <param name="strSql"></param>
+ /// <param name="cmdParms"></param>
+ /// <returns></returns>
+ public static bool Exists(string strSql, params SqlParameter[] cmdParms)
+ {
+ var obj = GetSingle(strSql, cmdParms);
+ int cmdresult;
+ if (Equals(obj, null) || Equals(obj, DBNull.Value))
+ cmdresult = 0;
+ else
+ cmdresult = int.Parse(obj.ToString());
+ if (cmdresult == 0)
+ return false;
+ return true;
+ }
+
+ #endregion
+
+ #region 鎵ц绠�鍗昐QL璇彞
+
+ /// <summary>
+ /// 鎵цSQL璇彞锛岃繑鍥炲奖鍝嶇殑璁板綍鏁�
+ /// </summary>
+ /// <param name="SQLString">SQL璇彞</param>
+ /// <returns>褰卞搷鐨勮褰曟暟</returns>
+ public static int ExecuteSql(string SQLString)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ using (var cmd = new SqlCommand(SQLString, connection))
+ {
+ try
+ {
+ connection.Open();
+ var rows = cmd.ExecuteNonQuery();
+ return rows;
+ }
+ catch (SqlException E)
+ {
+ connection.Close();
+ throw new Exception(E.Message);
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц澶氭潯SQL璇彞锛屽疄鐜版暟鎹簱浜嬪姟銆�
+ /// </summary>
+ /// <param name="SQLStringList">澶氭潯SQL璇彞</param>
+ public static void ExecuteSqlTran(ArrayList SQLStringList)
+ {
+ using (var conn = new SqlConnection(strConn))
+ {
+ conn.Open();
+ var cmd = new SqlCommand();
+ cmd.Connection = conn;
+ var tx = conn.BeginTransaction();
+ cmd.Transaction = tx;
+ try
+ {
+ for (var n = 0; n < SQLStringList.Count; n++)
+ {
+ var strsql = SQLStringList[n].ToString();
+ if (strsql.Trim().Length > 1)
+ {
+ cmd.CommandText = strsql;
+ cmd.ExecuteNonQuery();
+ }
+ }
+
+ tx.Commit();
+ }
+ catch (SqlException E)
+ {
+ tx.Rollback();
+ throw new Exception(E.Message);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц甯︿竴涓瓨鍌ㄨ繃绋嬪弬鏁扮殑鐨凷QL璇彞銆�
+ /// </summary>
+ /// <param name="SQLString">SQL璇彞</param>
+ /// <param name="content">鍙傛暟鍐呭,姣斿涓�涓瓧娈垫槸鏍煎紡澶嶆潅鐨勬枃绔狅紝鏈夌壒娈婄鍙凤紝鍙互閫氳繃杩欎釜鏂瑰紡娣诲姞</param>
+ /// <returns>褰卞搷鐨勮褰曟暟</returns>
+ public static int ExecuteSql(string SQLString, string content)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ var cmd = new SqlCommand(SQLString, connection);
+ var myParameter = new SqlParameter("@content", SqlDbType.NText);
+ myParameter.Value = content;
+ cmd.Parameters.Add(myParameter);
+ try
+ {
+ connection.Open();
+ var rows = cmd.ExecuteNonQuery();
+ return rows;
+ }
+ catch (SqlException E)
+ {
+ throw new Exception(E.Message);
+ }
+ finally
+ {
+ cmd.Dispose();
+ connection.Close();
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鍚戞暟鎹簱閲屾彃鍏ュ浘鍍忔牸寮忕殑瀛楁(鍜屼笂闈㈡儏鍐电被浼肩殑鍙︿竴绉嶅疄渚�)
+ /// </summary>
+ /// <param name="strSQL">SQL璇彞</param>
+ /// <param name="fs">鍥惧儚瀛楄妭,鏁版嵁搴撶殑瀛楁绫诲瀷涓篿mage鐨勬儏鍐�</param>
+ /// <returns>褰卞搷鐨勮褰曟暟</returns>
+ public static int ExecuteSqlInsertImg(string strSQL, byte[] fs)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ var cmd = new SqlCommand(strSQL, connection);
+ var myParameter = new SqlParameter("@fs", SqlDbType.Image);
+ myParameter.Value = fs;
+ cmd.Parameters.Add(myParameter);
+ try
+ {
+ connection.Open();
+ var rows = cmd.ExecuteNonQuery();
+ return rows;
+ }
+ catch (SqlException E)
+ {
+ throw new Exception(E.Message);
+ }
+ finally
+ {
+ cmd.Dispose();
+ connection.Close();
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц涓�鏉¤绠楁煡璇㈢粨鏋滆鍙ワ紝杩斿洖鏌ヨ缁撴灉锛坥bject锛夈��
+ /// </summary>
+ /// <param name="SQLString">璁＄畻鏌ヨ缁撴灉璇彞</param>
+ /// <returns>鏌ヨ缁撴灉锛坥bject锛�</returns>
+ public static object GetSingle(string SQLString)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ using (var cmd = new SqlCommand(SQLString, connection))
+ {
+ try
+ {
+ connection.Open();
+ var obj = cmd.ExecuteScalar();
+ if (Equals(obj, null) || Equals(obj, DBNull.Value))
+ return null;
+ return obj;
+ }
+ catch (SqlException e)
+ {
+ connection.Close();
+ throw new Exception(e.Message);
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц鏌ヨ璇彞锛岃繑鍥濻qlDataReader
+ /// </summary>
+ /// <param name="strSQL">鏌ヨ璇彞</param>
+ /// <returns>SqlDataReader</returns>
+ public static SqlDataReader ExecuteReader(string strSQL)
+ {
+ var connection = new SqlConnection(strConn);
+ var cmd = new SqlCommand(strSQL, connection);
+ try
+ {
+ connection.Open();
+ var myReader = cmd.ExecuteReader();
+ return myReader;
+ }
+ catch (SqlException e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц鏌ヨ璇彞锛岃繑鍥濪ataSet
+ /// </summary>
+ /// <param name="SQLString">鏌ヨ璇彞</param>
+ /// <returns>DataSet</returns>
+ public static DataSet Query(string SQLString)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ var ds = new DataSet();
+ try
+ {
+ connection.Open();
+ var command = new SqlDataAdapter(SQLString, connection);
+ command.Fill(ds, "ds");
+ }
+ catch (SqlException ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
+ return ds;
+ }
+ }
+
+ #endregion
+
+ #region 鎵ц甯﹀弬鏁扮殑SQL璇彞
+
+ /// <summary>
+ /// 鎵цSQL璇彞锛岃繑鍥炲奖鍝嶇殑璁板綍鏁�
+ /// </summary>
+ /// <param name="SQLString">SQL璇彞</param>
+ /// <returns>褰卞搷鐨勮褰曟暟</returns>
+ public static int ExecuteSql(string SQLString,
+ params SqlParameter[] cmdParms)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ using (var cmd = new SqlCommand())
+ {
+ try
+ {
+ PrepareCommand(cmd, connection, null, SQLString, cmdParms);
+ var rows = cmd.ExecuteNonQuery();
+ cmd.Parameters.Clear();
+ return rows;
+ }
+ catch (SqlException E)
+ {
+ throw new Exception(E.Message);
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц澶氭潯SQL璇彞锛屽疄鐜版暟鎹簱浜嬪姟銆�
+ /// </summary>
+ /// <param name="SQLStringList">SQL璇彞鐨勫搱甯岃〃锛坘ey涓簊ql璇彞锛寁alue鏄璇彞鐨凷qlParameter[]锛�</param>
+ public static void ExecuteSqlTran(Hashtable SQLStringList)
+ {
+ using (var conn = new SqlConnection(strConn))
+ {
+ conn.Open();
+ using (var trans = conn.BeginTransaction())
+ {
+ var cmd = new SqlCommand();
+ try
+ {
+ //寰幆
+ foreach (DictionaryEntry myDE in SQLStringList)
+ {
+ var cmdText = myDE.Key.ToString();
+ var cmdParms = (SqlParameter[])myDE.Value;
+ PrepareCommand(cmd, conn, trans, cmdText, cmdParms);
+ var val = cmd.ExecuteNonQuery();
+ cmd.Parameters.Clear();
+
+ //trans.Commit();
+ }
+
+ trans.Commit();
+ }
+ catch
+ {
+ trans.Rollback();
+ throw;
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц澶氭潯SQL璇彞锛屽疄鐜版暟鎹簱浜嬪姟銆�
+ /// </summary>
+ /// <param name="SQLStringList">SQL璇彞鐨勫搱甯岃〃锛坘ey涓簊ql璇彞锛寁alue鏄璇彞鐨凷qlParameter[]锛�</param>
+ public static int ExecuteSqlTranRtn(Hashtable SQLStringList)
+ {
+ var d = 0;
+ using (var conn = new SqlConnection(strConn))
+ {
+ conn.Open();
+ using (var trans = conn.BeginTransaction())
+ {
+ var cmd = new SqlCommand();
+ try
+ {
+ //寰幆
+ foreach (DictionaryEntry myDE in SQLStringList)
+ {
+ var cmdText = myDE.Key.ToString();
+ var cmdParms = (SqlParameter[])myDE.Value;
+ PrepareCommand(cmd, conn, trans, cmdText, cmdParms);
+ var val = cmd.ExecuteNonQuery();
+ d = d + val;
+ cmd.Parameters.Clear();
+
+ //trans.Commit();
+ }
+
+ trans.Commit();
+ }
+ catch
+ {
+ trans.Rollback();
+ throw;
+ }
+ }
+ }
+
+ return d;
+ }
+
+ /// <summary>
+ /// 鎵ц澶氭潯SQL璇彞锛屽疄鐜版暟鎹簱浜嬪姟
+ /// </summary>
+ /// <param name="SQLStringList">SQL璇彞鐨勫搱甯岃〃锛坘ey涓烘爣璇嗭紝value鏄璇彞鐨凷qlParameter[]锛�</param>
+ public static void ExecuteSqlTran(string sqltxt, Hashtable SQLStringList)
+ {
+ using (var conn = new SqlConnection(strConn))
+ {
+ conn.Open();
+ using (var trans = conn.BeginTransaction())
+ {
+ var cmd = new SqlCommand();
+ try
+ {
+ //寰幆
+ foreach (DictionaryEntry myDE in SQLStringList)
+ {
+ var cmdText = sqltxt;
+ var cmdParms = (SqlParameter[])myDE.Value;
+ PrepareCommand(cmd, conn, trans, cmdText, cmdParms);
+ var val = cmd.ExecuteNonQuery();
+ cmd.Parameters.Clear();
+ }
+
+ trans.Commit();
+ }
+ catch
+ {
+ trans.Rollback();
+ throw;
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц涓�鏉¤绠楁煡璇㈢粨鏋滆鍙ワ紝杩斿洖鏌ヨ缁撴灉锛坥bject锛夈��
+ /// </summary>
+ /// <param name="SQLString">璁＄畻鏌ヨ缁撴灉璇彞</param>
+ /// <returns>鏌ヨ缁撴灉锛坥bject锛�</returns>
+ public static object GetSingle(string SQLString,
+ params SqlParameter[] cmdParms)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ using (var cmd = new SqlCommand())
+ {
+ try
+ {
+ PrepareCommand(cmd, connection, null, SQLString, cmdParms);
+ var obj = cmd.ExecuteScalar();
+ cmd.Parameters.Clear();
+ if (Equals(obj, null) || Equals(obj, DBNull.Value))
+ return null;
+ return obj;
+ }
+ catch (SqlException e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц鏌ヨ璇彞锛岃繑鍥濻qlDataReader
+ /// </summary>
+ /// <param name="strSQL">鏌ヨ璇彞</param>
+ /// <returns>SqlDataReader</returns>
+ public static SqlDataReader ExecuteReader(string SQLString,
+ params SqlParameter[] cmdParms)
+ {
+ var connection = new SqlConnection(strConn);
+ var cmd = new SqlCommand();
+ try
+ {
+ PrepareCommand(cmd, connection, null, SQLString, cmdParms);
+ var myReader = cmd.ExecuteReader();
+ cmd.Parameters.Clear();
+ return myReader;
+ }
+ catch (SqlException e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц鏌ヨ璇彞锛岃繑鍥濪ataSet
+ /// </summary>
+ /// <param name="SQLString">鏌ヨ璇彞</param>
+ /// <returns>DataSet</returns>
+ public static DataSet Query(string SQLString,
+ params SqlParameter[] cmdParms)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ var cmd = new SqlCommand();
+ PrepareCommand(cmd, connection, null, SQLString, cmdParms);
+ using (var da = new SqlDataAdapter(cmd))
+ {
+ var ds = new DataSet();
+ try
+ {
+ da.Fill(ds, "ds");
+ cmd.Parameters.Clear();
+ }
+ catch (SqlException ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
+ return ds;
+ }
+ }
+ }
+
+ //private static void PrepareCommand(SqlCommand cmd, SqlConnection conn, SqlTransaction trans, string cmdText, SqlParameter[] cmdParms)
+ //{
+
+ // if (conn.State != ConnectionState.Open)
+ // conn.Open();
+ // cmd.Connection = conn;
+ // cmd.CommandText = cmdText;
+ // if (trans != null)
+ // cmd.Transaction = trans;
+ // cmd.CommandType = CommandType.Text;//cmdType;
+ // if (cmdParms != null)
+ // {
+ // foreach (SqlParameter parameter in cmdParms)
+ // {
+ // if ((parameter.Direction == ParameterDirection.InputOutput || parameter.Direction == ParameterDirection.Input) &&
+ // (parameter.Value == null))
+ // {
+ // parameter.Value = DBNull.Value;
+ // }
+ // cmd.Parameters.Add(parameter);
+ // }
+ // }
+ //}
+ private static void PrepareCommand(SqlCommand cmd, SqlConnection conn,
+ SqlTransaction trans, string cmdText, SqlParameter[] cmdParms)
+ {
+ if (conn.State != ConnectionState.Open)
+ conn.Open();
+ cmd.Connection = conn;
+ cmd.CommandText = cmdText;
+ if (trans != null)
+ cmd.Transaction = trans;
+ cmd.CommandType = CommandType.Text; //cmdType;
+ if (cmdParms != null)
+ foreach (var parm in cmdParms)
+ {
+ //cmd.Parameters.Add(parm);
+ if ((parm.Direction == ParameterDirection.InputOutput ||
+ parm.Direction == ParameterDirection.Input) &&
+ parm.Value == null)
+ parm.Value = DBNull.Value;
+ cmd.Parameters.Add(parm);
+ }
+ }
+
+ #endregion
+
+ #region 瀛樺偍杩囩▼鎿嶄綔
+
+ /// <summary>
+ /// 鎵ц瀛樺偍杩囩▼
+ /// </summary>
+ /// <param name="storedProcName">瀛樺偍杩囩▼鍚�</param>
+ /// <param name="parameters">瀛樺偍杩囩▼鍙傛暟</param>
+ /// <returns>SqlDataReader</returns>
+ public static SqlDataReader RunProcedure(string storedProcName,
+ IDataParameter[] parameters)
+ {
+ var connection = new SqlConnection(strConn);
+ SqlDataReader returnReader;
+ connection.Open();
+ var command = BuildQueryCommand(connection, storedProcName, parameters);
+ command.CommandType = CommandType.StoredProcedure;
+ returnReader = command.ExecuteReader();
+ return returnReader;
+ }
+
+ /// <summary>
+ /// 鎵ц甯﹁緭鍑哄弬鏁扮殑瀛樺偍杩囩▼
+ /// </summary>
+ /// <param name="storedProcName">瀛樺偍杩囩▼鍚�</param>
+ /// <param name="parameters">瀛樺偍杩囩▼鍙傛暟,OutName 杈撳嚭鍙傛暟鐨勫悕瀛楋紙濡傛灉鏄涓互@涓哄垎鍓茬锛�</param>
+ /// <returns>string(浠鍒嗗壊鐨勮緭鍑哄弬鏁扮殑鍊�)</returns>
+ public static string RunProcedureOut(string storedProcName,
+ IDataParameter[] parameters, string outName)
+ {
+ var connection = new SqlConnection(strConn);
+ var returnstring = string.Empty;
+ connection.Open();
+ var command = BuildQueryCommand(connection, storedProcName, parameters);
+ command.CommandType = CommandType.StoredProcedure;
+ command.ExecuteNonQuery();
+ var str = string.Empty;
+ //瑙ｆ瀽绌胯繃鏉ョ殑鍙傛暟
+ var Arraystr = outName.Split('|');
+ foreach (var st in Arraystr)
+ {
+ var a = st;
+ if (str == string.Empty)
+ str = command.Parameters[a].Value.ToString();
+ else
+ str = str + "|" + command.Parameters[a].Value;
+ }
+
+ return str;
+ }
+
+ /// <summary>
+ /// 鎵ц瀛樺偍杩囩▼
+ /// </summary>
+ /// <param name="storedProcName">瀛樺偍杩囩▼鍚�</param>
+ /// <param name="parameters">瀛樺偍杩囩▼鍙傛暟</param>
+ /// <param name="tableName">DataSet缁撴灉涓殑琛ㄥ悕</param>
+ /// <returns>DataSet</returns>
+ public static DataSet RunProcedure(string storedProcName,
+ IDataParameter[] parameters, string tableName)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ var dataSet = new DataSet();
+ connection.Open();
+ var sqlDA = new SqlDataAdapter();
+ sqlDA.SelectCommand =
+ BuildQueryCommand(connection, storedProcName, parameters);
+ sqlDA.Fill(dataSet, tableName);
+ connection.Close();
+ return dataSet;
+ }
+ }
+
+ /// <summary>
+ /// 鏋勫缓 SqlCommand 瀵硅薄(鐢ㄦ潵杩斿洖涓�涓粨鏋滈泦锛岃�屼笉鏄竴涓暣鏁板��)
+ /// </summary>
+ /// <param name="connection">鏁版嵁搴撹繛鎺�</param>
+ /// <param name="storedProcName">瀛樺偍杩囩▼鍚�</param>
+ /// <param name="parameters">瀛樺偍杩囩▼鍙傛暟</param>
+ /// <returns>SqlCommand</returns>
+ private static SqlCommand BuildQueryCommand(SqlConnection connection,
+ string storedProcName, IDataParameter[] parameters)
+ {
+ var command = new SqlCommand(storedProcName, connection);
+ command.CommandType = CommandType.StoredProcedure;
+ foreach (SqlParameter parameter in parameters)
+ command.Parameters.Add(parameter);
+ return command;
+ }
+
+ /// <summary>
+ /// 鎵ц瀛樺偍杩囩▼锛岃繑鍥炲奖鍝嶇殑琛屾暟
+ /// </summary>
+ /// <param name="storedProcName">瀛樺偍杩囩▼鍚�</param>
+ /// <param name="parameters">瀛樺偍杩囩▼鍙傛暟</param>
+ /// <param name="rowsAffected">褰卞搷鐨勮鏁�</param>
+ /// <returns></returns>
+ public static int RunProcedure(string storedProcName,
+ IDataParameter[] parameters, out int rowsAffected)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ int result;
+ connection.Open();
+ var command =
+ BuildIntCommand(connection, storedProcName, parameters);
+ rowsAffected = command.ExecuteNonQuery();
+ result = (int)command.Parameters["ReturnValue"].Value;
+ //Connection.Close();
+ return result;
+ }
+ }
+
+ /// <summary>
+ /// 鎵ц瀛樺偍杩囩▼锛岃繑鍥炲奖鍝嶈鏁�
+ /// </summary>
+ /// <param name="storedProcName">string绫诲瀷瀛樺偍杩囩▼鍚�</param>
+ /// <param name="parameters">SqlParameters[]瀛樺偍杩囩▼鍙傛暟</param>
+ /// <returns>int 褰卞搷琛屾暟</returns>
+ public static int RunProcedure_NonQuery(string storedProcName,
+ IDataParameter[] parameters)
+ {
+ using (var connection = new SqlConnection(strConn))
+ {
+ connection.Open();
+ var command =
+ BuildQueryCommand(connection, storedProcName, parameters);
+ return command.ExecuteNonQuery();
+ }
+ }
+
+ /// <summary>
+ /// 鍒涘缓 SqlCommand 瀵硅薄瀹炰緥(鐢ㄦ潵杩斿洖涓�涓暣鏁板��)
+ /// </summary>
+ /// <param name="storedProcName">瀛樺偍杩囩▼鍚�</param>
+ /// <param name="parameters">瀛樺偍杩囩▼鍙傛暟</param>
+ /// <returns>SqlCommand 瀵硅薄瀹炰緥</returns>
+ private static SqlCommand BuildIntCommand(SqlConnection connection,
+ string storedProcName, IDataParameter[] parameters)
+ {
+ var command = BuildQueryCommand(connection, storedProcName, parameters);
+ command.Parameters.Add(new SqlParameter("ReturnValue",
+ SqlDbType.Int, 4, ParameterDirection.ReturnValue,
+ false, 0, 0, string.Empty, DataRowVersion.Default, null));
+ return command;
+ }
+
+ #endregion
+}
\ No newline at end of file
diff --git a/Dto/ErpKc.cs b/Dto/ErpKc.cs
index a784e04..a6845de 100644
--- a/Dto/ErpKc.cs
+++ b/Dto/ErpKc.cs
@@ -1,16 +1,17 @@
-锘縩amespace NewPdaSqlServer.Dto;
-
-public class ErpKc
+锘縩amespace NewPdaSqlServer.Dto
{
- public string? FMaterialId { get; set; }
- public string? FStockId { get; set; }
- public string? FMtoNo { get; set; }
- public string? FLot { get; set; }
- public string? FStockUnitId { get; set; }
- public string? FBaseUnitId { get; set; }
- public string? FStockStatusId { get; set; }
- public string? FBASEQTY { get; set; }
- public string? FSTOREURNOM { get; set; }
- public string? FSTOREURNUM { get; set; }
- public string? FStockOrgId { get; set; }
-}
\ No newline at end of file
+ public class ErpKc
+ {
+ public string? FMaterialId { get; set; }
+ public string? FStockId { get; set; }
+ public string? FMtoNo { get; set; }
+ public string? FLot { get; set; }
+ public string? FStockUnitId { get; set; }
+ public string? FBaseUnitId { get; set; }
+ public string? FStockStatusId { get; set; }
+ public string? FBASEQTY { get; set; }
+ public string? FSTOREURNOM { get; set; }
+ public string? FSTOREURNUM { get; set; }
+ public string? FStockOrgId { get; set; }
+ }
+}
diff --git a/Dto/Warehouse/DefineTask001Dto.cs b/Dto/Warehouse/DefineTask001Dto.cs
index c92de4d..a98d722 100644
--- a/Dto/Warehouse/DefineTask001Dto.cs
+++ b/Dto/Warehouse/DefineTask001Dto.cs
@@ -1,49 +1,50 @@
-using System.ComponentModel.DataAnnotations;
-
namespace NewPdaSqlServer.Dto.Warehouse;
-
+using System.ComponentModel.DataAnnotations;
/// <summary>
-/// 绔嬪簱閫佹鏁版嵁浼犺緭瀵硅薄
+/// 绔嬪簱閫佹鏁版嵁浼犺緭瀵硅薄
/// </summary>
public class DefineTask001Dto
{
/// <summary>
- /// MES浠诲姟鏍囪瘑
+ /// MES浠诲姟鏍囪瘑
/// </summary>
[Required(ErrorMessage = "MES浠诲姟鏍囪瘑蹇呭～")]
public string MesId { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜
+ /// 鐗╂枡缂栫爜
/// </summary>
[Required(ErrorMessage = "鐗╂枡缂栫爜蹇呭～")]
public string MatId { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
+ /// 鐗╂枡鍚嶇О
/// </summary>
public string MatName { get; set; }
/// <summary>
- /// 鐗╂枡瑙勬牸
+ /// 鐗╂枡瑙勬牸
/// </summary>
public string MatStandard { get; set; }
/// <summary>
- /// 鐗╂枡鏁伴噺
+ /// 鐗╂枡鏁伴噺
/// </summary>
[Range(1, int.MaxValue, ErrorMessage = "鐗╂枡鏁伴噺蹇呴』澶т簬0涓斾负鏁存暟")]
public int MatNumber { get; set; }
/// <summary>
- /// 鐗╂枡鍗曚綅
+ /// 鐗╂枡鍗曚綅
/// </summary>
[Required(ErrorMessage = "鐗╂枡鍗曚綅蹇呭～")]
public string MatUnit { get; set; }
/// <summary>
- /// 涓婃枡浣嶇疆
+ /// 涓婃枡浣嶇疆
/// </summary>
[Range(1, int.MaxValue, ErrorMessage = "鏈夋晥浣嶇疆缂栧彿蹇呭～")]
public int Postition { get; set; }
-}
\ No newline at end of file
+}
+
+
+
diff --git a/Dto/Warehouse/DefineTask002Dto.cs b/Dto/Warehouse/DefineTask002Dto.cs
index 4902807..160c258 100644
--- a/Dto/Warehouse/DefineTask002Dto.cs
+++ b/Dto/Warehouse/DefineTask002Dto.cs
@@ -1,18 +1,21 @@
using System.ComponentModel.DataAnnotations;
+namespace NewPdaSqlServer.Dto.Warehouse{
-namespace NewPdaSqlServer.Dto.Warehouse;
+ public class DefineTask002Dto
+ {
+ /// <summary>
+ /// 鏉＄爜缂栧彿
+ /// </summary>
+ [Required(ErrorMessage = "MES浠诲姟鏍囪瘑蹇呭～")]
+ public string MesId { get; set; }
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ [Required(ErrorMessage = "妫�楠岀姸鎬佸繀濉�")]
+ public string MatStatus { get; set; }
+ }
-public class DefineTask002Dto
-{
- /// <summary>
- /// 鏉＄爜缂栧彿
- /// </summary>
- [Required(ErrorMessage = "MES浠诲姟鏍囪瘑蹇呭～")]
- public string MesId { get; set; }
+}
- /// <summary>
- /// 妫�楠岀姸鎬�
- /// </summary>
- [Required(ErrorMessage = "妫�楠岀姸鎬佸繀濉�")]
- public string MatStatus { get; set; }
-}
\ No newline at end of file
+
+
diff --git a/Dto/Warehouse/DefineTask005Dto.cs b/Dto/Warehouse/DefineTask005Dto.cs
index ba4c23b..b738781 100644
--- a/Dto/Warehouse/DefineTask005Dto.cs
+++ b/Dto/Warehouse/DefineTask005Dto.cs
@@ -1,12 +1,16 @@
using System.ComponentModel.DataAnnotations;
+namespace NewPdaSqlServer.Dto.Warehouse{
-namespace NewPdaSqlServer.Dto.Warehouse;
+ public class DefineTask005Dto
+ {
+ /// <summary>
+ /// 鍛煎彨鐐逛綅
+ /// </summary>
+ [Range(1, int.MaxValue, ErrorMessage = "鏈夋晥浣嶇疆缂栧彿蹇呭～")]
+ public int Postition { get; set; }
+ }
-public class DefineTask005Dto
-{
- /// <summary>
- /// 鍛煎彨鐐逛綅
- /// </summary>
- [Range(1, int.MaxValue, ErrorMessage = "鏈夋晥浣嶇疆缂栧彿蹇呭～")]
- public int Postition { get; set; }
-}
\ No newline at end of file
+}
+
+
+
diff --git a/Dto/Warehouse/DefineTask006Dto.cs b/Dto/Warehouse/DefineTask006Dto.cs
index 8250e0d..16c623c 100644
--- a/Dto/Warehouse/DefineTask006Dto.cs
+++ b/Dto/Warehouse/DefineTask006Dto.cs
@@ -1,48 +1,50 @@
+namespace NewPdaSqlServer.Dto.Warehouse;
using System.ComponentModel.DataAnnotations;
-namespace NewPdaSqlServer.Dto.Warehouse;
-
/// <summary>
-/// 绔嬪簱鍏ュ簱鏁版嵁浼犺緭瀵硅薄
+/// 绔嬪簱鍏ュ簱鏁版嵁浼犺緭瀵硅薄
/// </summary>
public class DefineTask006Dto
{
/// <summary>
- /// MES浠诲姟鏍囪瘑
+ /// MES浠诲姟鏍囪瘑
/// </summary>
[Required(ErrorMessage = "MES浠诲姟鏍囪瘑蹇呭～")]
public string MesId { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜
+ /// 鐗╂枡缂栫爜
/// </summary>
[Required(ErrorMessage = "鐗╂枡缂栫爜蹇呭～")]
public string MatId { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
+ /// 鐗╂枡鍚嶇О
/// </summary>
public string MatName { get; set; }
/// <summary>
- /// 鐗╂枡瑙勬牸
+ /// 鐗╂枡瑙勬牸
/// </summary>
public string MatStandard { get; set; }
/// <summary>
- /// 鐗╂枡鏁伴噺
+ /// 鐗╂枡鏁伴噺
/// </summary>
[Range(1, int.MaxValue, ErrorMessage = "鐗╂枡鏁伴噺蹇呴』澶т簬0涓斾负鏁存暟")]
public int MatNumber { get; set; }
/// <summary>
- /// 鐗╂枡鍗曚綅
+ /// 鐗╂枡鍗曚綅
/// </summary>
public string MatUnit { get; set; }
/// <summary>
- /// 鎵�鍦ㄦゼ灞�
+ /// 鎵�鍦ㄦゼ灞�
/// </summary>
- [Range(1, int.MaxValue, ErrorMessage = "鎵�鍦ㄦゼ灞傚繀濉�")]
+ [Range(1, int.MaxValue, ErrorMessage = "鎵�鍦ㄦゼ灞傚繀濉�")]
public int Postition { get; set; }
-}
\ No newline at end of file
+}
+
+
+
diff --git a/Dto/Xky/XkyBarcodeDataDto.cs b/Dto/Xky/XkyBarcodeDataDto.cs
index 91ea7b7..d713ae0 100644
--- a/Dto/Xky/XkyBarcodeDataDto.cs
+++ b/Dto/Xky/XkyBarcodeDataDto.cs
@@ -1,82 +1,103 @@
using Newtonsoft.Json;
-namespace NewPdaSqlServer.Dto.Xky;
-
-public class XkyBarcodeDataDto
+namespace NewPdaSqlServer.Dto.Xky
{
- [JsonProperty("poErpNo")] public string PoErpNo { get; set; }
+ public class XkyBarcodeDataDto
+ {
+ [JsonProperty("poErpNo")]
+ public string PoErpNo { get; set; }
- [JsonProperty("poLineNo")] public string PoLineNo { get; set; }
+ [JsonProperty("poLineNo")]
+ public string PoLineNo { get; set; }
- [JsonProperty("productCode")] public string ProductCode { get; set; }
+ [JsonProperty("productCode")]
+ public string ProductCode { get; set; }
- [JsonProperty("productName")] public string ProductName { get; set; }
+ [JsonProperty("productName")]
+ public string ProductName { get; set; }
- [JsonProperty("productScale")] public string ProductScale { get; set; }
+ [JsonProperty("productScale")]
+ public string ProductScale { get; set; }
- [JsonProperty("smallBarcode")] public string SmallBarcode { get; set; }
+ [JsonProperty("smallBarcode")]
+ public string SmallBarcode { get; set; }
- [JsonProperty("bigBarcode")] public string BigBarcode { get; set; }
+ [JsonProperty("bigBarcode")]
+ public string BigBarcode { get; set; }
- [JsonProperty("outerBarcode")] public string OuterBarcode { get; set; }
+ [JsonProperty("outerBarcode")]
+ public string OuterBarcode { get; set; }
- [JsonProperty("includeQty")] public decimal IncludeQty { get; set; }
+ [JsonProperty("includeQty")]
+ public decimal IncludeQty { get; set; }
- [JsonProperty("smallPackageLength")]
- public int? SmallPackageLength { get; set; }
+ [JsonProperty("smallPackageLength")]
+ public int? SmallPackageLength { get; set; }
- [JsonProperty("smallPackageWidth")]
- public int? SmallPackageWidth { get; set; }
+ [JsonProperty("smallPackageWidth")]
+ public int? SmallPackageWidth { get; set; }
- [JsonProperty("smallPackageHeight")]
- public int? SmallPackageHeight { get; set; }
+ [JsonProperty("smallPackageHeight")]
+ public int? SmallPackageHeight { get; set; }
- [JsonProperty("bigPackageLength")]
- public int? BigPackageLength { get; set; }
+ [JsonProperty("bigPackageLength")]
+ public int? BigPackageLength { get; set; }
- [JsonProperty("bigPackageWidth")] public int? BigPackageWidth { get; set; }
+ [JsonProperty("bigPackageWidth")]
+ public int? BigPackageWidth { get; set; }
- [JsonProperty("bigPackageHeight")]
- public int? BigPackageHeight { get; set; }
+ [JsonProperty("bigPackageHeight")]
+ public int? BigPackageHeight { get; set; }
- [JsonProperty("outerPackageLength")]
- public int? OuterPackageLength { get; set; }
+ [JsonProperty("outerPackageLength")]
+ public int? OuterPackageLength { get; set; }
- [JsonProperty("outerPackageWidth")]
- public int? OuterPackageWidth { get; set; }
+ [JsonProperty("outerPackageWidth")]
+ public int? OuterPackageWidth { get; set; }
- [JsonProperty("outerPackageHeight")]
- public int? OuterPackageHeight { get; set; }
+ [JsonProperty("outerPackageHeight")]
+ public int? OuterPackageHeight { get; set; }
- [JsonProperty("smallPackageSn")] public string SmallPackageSn { get; set; }
+ [JsonProperty("smallPackageSn")]
+ public string SmallPackageSn { get; set; }
- [JsonProperty("bigPackageSn")] public string BigPackageSn { get; set; }
+ [JsonProperty("bigPackageSn")]
+ public string BigPackageSn { get; set; }
- [JsonProperty("outerPackageSn")] public string OuterPackageSn { get; set; }
+ [JsonProperty("outerPackageSn")]
+ public string OuterPackageSn { get; set; }
- [JsonProperty("dnLines")] public string DnLines { get; set; }
+ [JsonProperty("dnLines")]
+ public string DnLines { get; set; }
- [JsonProperty("dynamicData")]
- public XkyDynamicDataDto DynamicData { get; set; }
+ [JsonProperty("dynamicData")]
+ public XkyDynamicDataDto DynamicData { get; set; }
- [JsonProperty("createType")] public int CreateType { get; set; }
+ [JsonProperty("createType")]
+ public int CreateType { get; set; }
- [JsonProperty("packLevel")] public int PackLevel { get; set; }
-}
+ [JsonProperty("packLevel")]
+ public int PackLevel { get; set; }
+ }
-public class XkyDynamicDataDto
-{
- [JsonProperty("poErpNo")] public string PoErpNo { get; set; }
+ public class XkyDynamicDataDto
+ {
+ [JsonProperty("poErpNo")]
+ public string PoErpNo { get; set; }
- [JsonProperty("poLineNo")] public string PoLineNo { get; set; }
+ [JsonProperty("poLineNo")]
+ public string PoLineNo { get; set; }
- [JsonProperty("innerVendorCode")]
- public string InnerVendorCode { get; set; }
+ [JsonProperty("innerVendorCode")]
+ public string InnerVendorCode { get; set; }
- [JsonProperty("customize1")] public string Customize1 { get; set; }
+ [JsonProperty("customize1")]
+ public string Customize1 { get; set; }
- [JsonProperty("customize2")]
- public string Customize2 { get; set; } // 注锟解：JSON锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷1747584000000
+ [JsonProperty("customize2")]
+ public string Customize2 { get; set; } // 注意：JSON中这里是数字1747584000000
- [JsonProperty("customize3")] public string Customize3 { get; set; }
+ [JsonProperty("customize3")]
+ public string Customize3 { get; set; }
+ }
}
\ No newline at end of file
diff --git a/Dto/base/ImageDto.cs b/Dto/base/ImageDto.cs
index 8dfcdda..7b29397 100644
--- a/Dto/base/ImageDto.cs
+++ b/Dto/base/ImageDto.cs
@@ -1,10 +1,12 @@
-锘縩amespace NewPdaSqlServer.Dto.@base;
+锘縰sing NewPdaSqlServer.entity;
+
+namespace NewPdaSqlServer.Dto.service;
public class ImageDto
{
//鍏宠仈鍗曟嵁id
public string? parentId { get; set; }
-
//鍥剧墖淇℃伅id
public string? id { get; set; }
+
}
\ No newline at end of file
diff --git a/Dto/service/LLJDto.cs b/Dto/service/LLJDto.cs
index 438b13a..e01e503 100644
--- a/Dto/service/LLJDto.cs
+++ b/Dto/service/LLJDto.cs
@@ -17,7 +17,6 @@
//瀛欒〃id
public string? id { get; set; }
-
//瀛欒〃id2锛堟牱鏈�糹d锛�
public string? id13 { get; set; }
diff --git a/Dto/service/OaToMesQuery.cs b/Dto/service/OaToMesQuery.cs
index 24dafe8..c2fd75a 100644
--- a/Dto/service/OaToMesQuery.cs
+++ b/Dto/service/OaToMesQuery.cs
@@ -1,44 +1,48 @@
-锘縰sing System.ComponentModel.DataAnnotations;
+锘縰sing System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
-namespace NewPdaSqlServer.Dto.service;
-
-public class OaToMesQuery
+namespace NewPdaSqlServer.Dto.service
{
- [Required(ErrorMessage = "寮傚父鍗曞彿涓嶈兘涓虹┖")]
- [StringLength(100, ErrorMessage = "寮傚父鍗曞彿闀垮害涓嶈兘瓒呰繃100涓瓧绗�")]
- public string iqcExNo { get; set; }
+ public class OaToMesQuery
+ {
+ [Required(ErrorMessage = "寮傚父鍗曞彿涓嶈兘涓虹┖")]
+ [StringLength(100, ErrorMessage = "寮傚父鍗曞彿闀垮害涓嶈兘瓒呰繃100涓瓧绗�")]
+ public string iqcExNo { get; set; }
- [Required(ErrorMessage = "妫�楠屾暟鎹笉鑳戒负绌�")]
- [MinLength(1, ErrorMessage = "鑷冲皯闇�瑕�1鏉℃楠屾暟鎹�")]
- public List<IQCDataItem> dataJson { get; set; }
+ [Required(ErrorMessage = "妫�楠屾暟鎹笉鑳戒负绌�")]
+ [MinLength(1, ErrorMessage = "鑷冲皯闇�瑕�1鏉℃楠屾暟鎹�")]
+ public List<IQCDataItem> dataJson { get; set; }
- public string requestId { get; set; }
+ public string requestId { get; set; }
+ }
+
+ public class IQCDataItem
+ {
+ [Required(ErrorMessage = "妫�楠屽崟鍙蜂笉鑳戒负绌�")]
+ [StringLength(100, ErrorMessage = "妫�楠屽崟鍙烽暱搴︿笉鑳借秴杩�100涓瓧绗�")]
+ public string jyd { get; set; }
+
+ [Required(ErrorMessage = "閫夊埆绫诲埆涓嶈兘涓虹┖")]
+ [StringLength(100, ErrorMessage = "閫夊埆绫诲埆闀垮害涓嶈兘瓒呰繃100涓瓧绗�")]
+ public string xblb { get; set; }
+
+ [Required(ErrorMessage = "澶勭悊鎰忚涓嶈兘涓虹┖")]
+ // [RegularExpression("閫�鏂欒ˉ鏂檤鐗归噰", ErrorMessage = "澶勭悊鎰忚鍙兘鏄�'閫�鏂欒ˉ鏂�'鎴�'鐗归噰'")]
+ public string clyj { get; set; }
+
+ [Required(ErrorMessage = "鎺ユ敹鏁伴噺涓嶈兘涓虹┖")]
+ [Range(0, float.MaxValue, ErrorMessage = "鎺ユ敹鏁伴噺蹇呴』澶т簬绛変簬0")]
+ public float jssl { get; set; } // 淇敼涓烘暟鍊肩被鍨�
+ }
+
+
+ public class OaToMesRQuery
+ {
+ [Required(ErrorMessage = "寮傚父鍗曞彿涓嶈兘涓虹┖")]
+ [StringLength(100, ErrorMessage = "寮傚父鍗曞彿闀垮害涓嶈兘瓒呰繃100涓瓧绗�")]
+ public string iqcExNo { get; set; }
+
+ public string requestId { get; set; }
+
+ }
}
-
-public class IQCDataItem
-{
- [Required(ErrorMessage = "妫�楠屽崟鍙蜂笉鑳戒负绌�")]
- [StringLength(100, ErrorMessage = "妫�楠屽崟鍙烽暱搴︿笉鑳借秴杩�100涓瓧绗�")]
- public string jyd { get; set; }
-
- [Required(ErrorMessage = "閫夊埆绫诲埆涓嶈兘涓虹┖")]
- [StringLength(100, ErrorMessage = "閫夊埆绫诲埆闀垮害涓嶈兘瓒呰繃100涓瓧绗�")]
- public string xblb { get; set; }
-
- [Required(ErrorMessage = "澶勭悊鎰忚涓嶈兘涓虹┖")]
- // [RegularExpression("閫�鏂欒ˉ鏂檤鐗归噰", ErrorMessage = "澶勭悊鎰忚鍙兘鏄�'閫�鏂欒ˉ鏂�'鎴�'鐗归噰'")]
- public string clyj { get; set; }
-
- [Required(ErrorMessage = "鎺ユ敹鏁伴噺涓嶈兘涓虹┖")]
- [Range(0, float.MaxValue, ErrorMessage = "鎺ユ敹鏁伴噺蹇呴』澶т簬绛変簬0")]
- public float jssl { get; set; } // 淇敼涓烘暟鍊肩被鍨�
-}
-
-public class OaToMesRQuery
-{
- [Required(ErrorMessage = "寮傚父鍗曞彿涓嶈兘涓虹┖")]
- [StringLength(100, ErrorMessage = "寮傚父鍗曞彿闀垮害涓嶈兘瓒呰繃100涓瓧绗�")]
- public string iqcExNo { get; set; }
-
- public string requestId { get; set; }
-}
\ No newline at end of file
diff --git a/Dto/service/OaToMesRecord.cs b/Dto/service/OaToMesRecord.cs
index a47d52c..b6906d5 100644
--- a/Dto/service/OaToMesRecord.cs
+++ b/Dto/service/OaToMesRecord.cs
@@ -1,47 +1,51 @@
-锘縩amespace NewPdaSqlServer.Dto.service;
+锘縰sing Microsoft.AspNetCore.Mvc;
+using System.ComponentModel.DataAnnotations;
-public class OaToMesRecord
+namespace NewPdaSqlServer.Dto.service
{
- public List<Record> dataJson { get; set; }
+ public class OaToMesRecord
+ {
+ public List<Record> dataJson { get; set; }
+ }
+
+ public class Record
+ {
+ public string StaffId { get; set; }
+ public string StaffNo { get; set; }
+
+ public string StaffName { get; set; }
+ public string LineNo { get; set; }
+ public string LineName { get; set; }
+ public DateTime? CheckTime { get; set; }
+ public string Classes { get; set; }
+ public string OrgId { get; set; }
+ }
+
+ public class OaToMesUser
+ {
+ public List<User> dataJson { get; set; }
+ }
+
+ public class User
+ {
+ public string Id { get; set; }
+ public string Name { get; set; }
+
+ public string Jobnumber { get; set; }
+ public string Department { get; set; }
+ }
+
+ public class OaToMesDepartment
+ {
+ public List<Department> dataJson { get; set; }
+ }
+
+ public class Department
+ {
+ public string Id { get; set; }
+ public string Parentid { get; set; }
+
+ public string Name { get; set; }
+ public string OrgId { get; set; }
+ }
}
-
-public class Record
-{
- public string StaffId { get; set; }
- public string StaffNo { get; set; }
-
- public string StaffName { get; set; }
- public string LineNo { get; set; }
- public string LineName { get; set; }
- public DateTime? CheckTime { get; set; }
- public string Classes { get; set; }
- public string OrgId { get; set; }
-}
-
-public class OaToMesUser
-{
- public List<User> dataJson { get; set; }
-}
-
-public class User
-{
- public string Id { get; set; }
- public string Name { get; set; }
-
- public string Jobnumber { get; set; }
- public string Department { get; set; }
-}
-
-public class OaToMesDepartment
-{
- public List<Department> dataJson { get; set; }
-}
-
-public class Department
-{
- public string Id { get; set; }
- public string Parentid { get; set; }
-
- public string Name { get; set; }
- public string OrgId { get; set; }
-}
\ No newline at end of file
diff --git a/Dto/service/ProductionPickDto.cs b/Dto/service/ProductionPickDto.cs
index a44b366..e24eee0 100644
--- a/Dto/service/ProductionPickDto.cs
+++ b/Dto/service/ProductionPickDto.cs
@@ -16,7 +16,6 @@
public string? splitNum { get; set; }
public string? barcode { get; set; }
-
//鎷嗗垎鍚庢潯鐮�
public string? cfBarcode { get; set; }
@@ -24,15 +23,12 @@
//杩斿洖淇℃伅
public string? strMsg { get; set; }
-
//杩斿洖鍙傛暟绫诲瀷 -1锛氬け璐� 1锛氭垚鍔�
public string? result { get; set; }
public dynamic? daaInfo { get; set; }
-
//寰呮壂
public List<ItemDetailModel>? items { get; set; }
-
//宸叉壂
public List<ItemDetailModel>? Ysitems { get; set; }
diff --git a/Dto/service/WorkflowRequestDto.cs b/Dto/service/WorkflowRequestDto.cs
index 5957187..02e6b98 100644
--- a/Dto/service/WorkflowRequestDto.cs
+++ b/Dto/service/WorkflowRequestDto.cs
@@ -1,39 +1,42 @@
-锘縩amespace NewPdaSqlServer.Dto.service;
+锘縰sing NewPdaSqlServer.Dto.@base;
+
+namespace NewPdaSqlServer.Dto.service;
+
public class WorkflowRequestDto
{
/// <summary>
- /// 鐢ㄦ埛璁よ瘉浠ょ墝
+ /// 鐢ㄦ埛璁よ瘉浠ょ墝
/// </summary>
public string Token { get; set; }
/// <summary>
- /// 鍘熷鐢ㄦ埛ID锛堝姞瀵嗗墠锛�
+ /// 鍘熷鐢ㄦ埛ID锛堝姞瀵嗗墠锛�
/// </summary>
public string UserId { get; set; }
/// <summary>
- /// 娴佺▼ID锛堝繀濉級
+ /// 娴佺▼ID锛堝繀濉級
/// </summary>
public int WorkflowId { get; set; }
/// <summary>
- /// 娴佺▼鏍囬锛堝繀濉級
+ /// 娴佺▼鏍囬锛堝繀濉級
/// </summary>
public string RequestName { get; set; }
/// <summary>
- /// 涓昏〃鏁版嵁锛堝繀濉級
+ /// 涓昏〃鏁版嵁锛堝繀濉級
/// </summary>
public Dictionary<string, object> MainData { get; set; }
/// <summary>
- /// 鏄庣粏琛ㄦ暟鎹紙閫夊～锛�
+ /// 鏄庣粏琛ㄦ暟鎹紙閫夊～锛�
/// </summary>
public Dictionary<string, object> DetailData { get; set; }
/// <summary>
- /// 鍏朵粬鍙傛暟锛堥�夊～锛�
+ /// 鍏朵粬鍙傛暟锛堥�夊～锛�
/// </summary>
public Dictionary<string, object> OtherParams { get; set; }
}
\ No newline at end of file
diff --git a/Dto/service/XJPageResult.cs b/Dto/service/XJPageResult.cs
index 258bfae..a56366a 100644
--- a/Dto/service/XJPageResult.cs
+++ b/Dto/service/XJPageResult.cs
@@ -9,5 +9,5 @@
public string? id { get; set; }
- public string? keyword { get; set; }
+ public string? keyword { get; set; }
}
\ No newline at end of file
diff --git a/entity/Base/ItemDetailModel.cs b/entity/Base/ItemDetailModel.cs
index 18c733d..ab5de75 100644
--- a/entity/Base/ItemDetailModel.cs
+++ b/entity/Base/ItemDetailModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace NewPdaSqlServer.entity.Base;
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity.Base;
//璋冩嫧鍑哄叆搴撳崟閫氱敤绫�
public class ItemDetailModel
diff --git a/entity/Base/ItemInBaseModel.cs b/entity/Base/ItemInBaseModel.cs
index 3700d02..dc6418e 100644
--- a/entity/Base/ItemInBaseModel.cs
+++ b/entity/Base/ItemInBaseModel.cs
@@ -1,17 +1,16 @@
-锘縩amespace NewPdaSqlServer.entity.Base;
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity.Base;
//璋冩嫧鍑哄叆搴撳崟閫氱敤绫�
public class ItemInBaseModel
{
//鐗╂枡淇℃伅
public MesItems itemDetail { get; set; }
-
//鏉＄爜鏄庣粏
public List<dynamic>? ItemBarCDetails { get; set; }
-
//鐗╂枡姹囨�绘槑缁�
public List<dynamic>? ItemInDetails { get; set; }
-
//鍑�/鍏ュ簱鍗曚俊鎭�
public List<dynamic>? MesInvItem { get; set; }
diff --git a/entity/Base/RequestInfo.cs b/entity/Base/RequestInfo.cs
index 81c8c9b..08a12ba 100644
--- a/entity/Base/RequestInfo.cs
+++ b/entity/Base/RequestInfo.cs
@@ -1,11 +1,10 @@
-锘縰sing System.Dynamic;
-
-namespace NewPdaSqlServer.entity.Base;
+锘縰sing Microsoft.AspNetCore.Http;
+using System.Dynamic;
public class RequestInfo : DynamicObject
{
- private readonly ExpandoObject _data = new();
private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly ExpandoObject _data = new ExpandoObject();
public RequestInfo(IHttpContextAccessor httpContextAccessor)
{
@@ -24,9 +23,8 @@
public override bool TryGetMember(GetMemberBinder binder, out object result)
{
- var name = binder.Name;
- return ((IDictionary<string, object>)_data).TryGetValue(name,
- out result);
+ string name = binder.Name;
+ return ((IDictionary<string, object>)_data).TryGetValue(name, out result);
}
public override bool TrySetMember(SetMemberBinder binder, object value)
@@ -38,8 +36,10 @@
public string GetHeaderValue(string key)
{
var httpContext = _httpContextAccessor.HttpContext;
- if (httpContext?.Request.Headers.TryGetValue(key, out var value) ==
- true) return value.ToString();
+ if (httpContext?.Request.Headers.TryGetValue(key, out var value) == true)
+ {
+ return value.ToString();
+ }
return null;
}
@@ -52,8 +52,12 @@
public void ValidateRequired(params string[] requiredFields)
{
foreach (var field in requiredFields)
+ {
if (!((IDictionary<string, object>)_data).ContainsKey(field) ||
((IDictionary<string, object>)_data)[field] == null)
+ {
throw new ArgumentException($"璇锋眰澶翠腑缂哄皯蹇呴渶鐨� {field} 鍙傛暟");
+ }
+ }
}
}
\ No newline at end of file
diff --git a/entity/DeliveryNotice.cs b/entity/DeliveryNotice.cs
index bd9ccea..e738109 100644
--- a/entity/DeliveryNotice.cs
+++ b/entity/DeliveryNotice.cs
@@ -1,285 +1,286 @@
锘縰sing SqlSugar;
+using System;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
-/// 閫佽揣閫氱煡鍗曚富琛�
+/// 閫佽揣閫氱煡鍗曚富琛�
/// </summary>
[SugarTable("DELIVERY_NOTICE")]
public class DeliveryNotice
{
/// <summary>
- /// 涓婚敭Guid
+ /// 涓婚敭Guid
/// </summary>
[SugarColumn(ColumnName = "id")]
public Guid Id { get; set; }
/// <summary>
- /// 閫佽揣鍗曞彿
+ /// 閫佽揣鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "delivery_no")]
public string DeliveryNo { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙紪鐮�
+ /// 渚涘簲鍟嗙紪鐮�
/// </summary>
[SugarColumn(ColumnName = "inner_vendor_code")]
public string InnerVendorCode { get; set; }
/// <summary>
- /// 渚涘簲鍟嗗悕绉�
+ /// 渚涘簲鍟嗗悕绉�
/// </summary>
[SugarColumn(ColumnName = "inner_vendor_name")]
public string InnerVendorName { get; set; }
/// <summary>
- /// 閲囪喘绫诲瀷锛�1锛氫竴鑸噰璐紱2锛氬澶栭噰璐紱3锛氬瑙掗噰璐紱4锛氳垂鐢ㄩ噰璐紱5锛氬浐璧勯噰璐紱6锛氬澶栫洿閫侊紱7锛氬澶栭噰璐紱8锛氬钩鍙伴噰璐紱9锛歏MI閲囪喘锛�10锛氭牱鍝侀噰璐紱11锛氭姌璁╄鍗曪紱12:閫�璐ц鍗曪紱13:浠ｉ�佽鍗�
+ /// 閲囪喘绫诲瀷锛�1锛氫竴鑸噰璐紱2锛氬澶栭噰璐紱3锛氬瑙掗噰璐紱4锛氳垂鐢ㄩ噰璐紱5锛氬浐璧勯噰璐紱6锛氬澶栫洿閫侊紱7锛氬澶栭噰璐紱8锛氬钩鍙伴噰璐紱9锛歏MI閲囪喘锛�10锛氭牱鍝侀噰璐紱11锛氭姌璁╄鍗曪紱12:閫�璐ц鍗曪紱13:浠ｉ�佽鍗�
/// </summary>
[SugarColumn(ColumnName = "purchase_type")]
public string PurchaseType { get; set; }
/// <summary>
- /// 閫佽揣绫诲瀷锛�1-鏅�� 2-琛ヨ揣 3-澶囧搧 4-鏍峰搧 5-VMI
+ /// 閫佽揣绫诲瀷锛�1-鏅�� 2-琛ヨ揣 3-澶囧搧 4-鏍峰搧 5-VMI
/// </summary>
[SugarColumn(ColumnName = "delivery_type")]
public string DeliveryType { get; set; }
/// <summary>
- /// 閫佽揣鏃ユ湡锛堟椂闂存埑锛�
+ /// 閫佽揣鏃ユ湡锛堟椂闂存埑锛�
/// </summary>
[SugarColumn(ColumnName = "delivery_date")]
public string DeliveryDate { get; set; }
/// <summary>
- /// 棰勮閫佽揪鏃ユ湡锛堟椂闂存埑锛�
+ /// 棰勮閫佽揪鏃ユ湡锛堟椂闂存埑锛�
/// </summary>
[SugarColumn(ColumnName = "plan_arrived_date")]
public string PlanArrivedDate { get; set; }
/// <summary>
- /// 閫佽揣鑱旂郴浜�
+ /// 閫佽揣鑱旂郴浜�
/// </summary>
[SugarColumn(ColumnName = "contact_persion")]
public string ContactPerson { get; set; }
/// <summary>
- /// 閫佽揣浜鸿仈绯荤數璇�
+ /// 閫佽揣浜鸿仈绯荤數璇�
/// </summary>
[SugarColumn(ColumnName = "contact_mobile")]
public string ContactMobile { get; set; }
/// <summary>
- /// 鍐呴儴鏀惰揣鍦扮偣缂栫爜
+ /// 鍐呴儴鏀惰揣鍦扮偣缂栫爜
/// </summary>
[SugarColumn(ColumnName = "address_code")]
public string AddressCode { get; set; }
/// <summary>
- /// 鏀惰揣鏄庣粏鍦板潃
+ /// 鏀惰揣鏄庣粏鍦板潃
/// </summary>
[SugarColumn(ColumnName = "address_info")]
public string AddressInfo { get; set; }
/// <summary>
- /// 閫佽揣杞︾墝鍙�
+ /// 閫佽揣杞︾墝鍙�
/// </summary>
[SugarColumn(ColumnName = "delivery_car_no")]
public string DeliveryCarNo { get; set; }
/// <summary>
- /// 澶囨敞
+ /// 澶囨敞
/// </summary>
[SugarColumn(ColumnName = "remark")]
public string Remark { get; set; }
/// <summary>
- /// 鐘舵��:1-寰呯鏀� 2-绛炬敹涓� 3-宸插畬鎴� 4-鎾ゅ洖 8-宸蹭綔搴� 5-鐢宠涓� 7-鍚屾剰 9-閮ㄥ垎鍚屾剰 10-宸插喕缁� 11-鐢宠鎾ゅ洖
+ /// 鐘舵��:1-寰呯鏀� 2-绛炬敹涓� 3-宸插畬鎴� 4-鎾ゅ洖 8-宸蹭綔搴� 5-鐢宠涓� 7-鍚屾剰 9-閮ㄥ垎鍚屾剰 10-宸插喕缁� 11-鐢宠鎾ゅ洖
/// </summary>
[SugarColumn(ColumnName = "status")]
public string Status { get; set; }
/// <summary>
- /// 鐩磋繍鏍囪瘑:1-鏄� 0-鍚�
+ /// 鐩磋繍鏍囪瘑:1-鏄� 0-鍚�
/// </summary>
[SugarColumn(ColumnName = "direct_delivery_flag")]
public string DirectDeliveryFlag { get; set; }
/// <summary>
- /// 鐗╂祦鐘舵��:0-鏈彂鍑� 1-宸插彂璐� 2-宸插埌璐�
+ /// 鐗╂祦鐘舵��:0-鏈彂鍑� 1-宸插彂璐� 2-宸插埌璐�
/// </summary>
[SugarColumn(ColumnName = "logistics_status")]
public string LogisticsStatus { get; set; }
/// <summary>
- /// 鏈�鍚庝竴娆″彂甯冩椂闂�
+ /// 鏈�鍚庝竴娆″彂甯冩椂闂�
/// </summary>
[SugarColumn(ColumnName = "publish_time")]
public string PublishTime { get; set; }
/// <summary>
- /// 鏈�鍚庝竴娆℃洿鏂版椂闂�
+ /// 鏈�鍚庝竴娆℃洿鏂版椂闂�
/// </summary>
[SugarColumn(ColumnName = "update_time")]
public string UpdateTime { get; set; }
/// <summary>
- /// 鍒╂鼎涓績缂栫爜
+ /// 鍒╂鼎涓績缂栫爜
/// </summary>
[SugarColumn(ColumnName = "profit_center_code")]
public string ProfitCenterCode { get; set; }
/// <summary>
- /// 鏁村崟姣涢噸
+ /// 鏁村崟姣涢噸
/// </summary>
[SugarColumn(ColumnName = "gross_weight")]
public string GrossWeight { get; set; }
/// <summary>
- /// 鏁村崟鍑�閲�
+ /// 鏁村崟鍑�閲�
/// </summary>
[SugarColumn(ColumnName = "net_weight")]
public string NetWeight { get; set; }
/// <summary>
- /// 閲嶉噺鍗曚綅缂栫爜
+ /// 閲嶉噺鍗曚綅缂栫爜
/// </summary>
[SugarColumn(ColumnName = "unit_weight_code")]
public string UnitWeightCode { get; set; }
/// <summary>
- /// 閲嶉噺鍗曚綅鍚嶇О
+ /// 閲嶉噺鍗曚綅鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "unit_weight_name")]
public string UnitWeightName { get; set; }
/// <summary>
- /// 鎬诲寘瑁呮暟
+ /// 鎬诲寘瑁呮暟
/// </summary>
[SugarColumn(ColumnName = "total_packing_qty")]
public string TotalPackingQty { get; set; }
/// <summary>
- /// 鎵嬪伐濉啓鎬诲寘鏁�
+ /// 鎵嬪伐濉啓鎬诲寘鏁�
/// </summary>
[SugarColumn(ColumnName = "total_package_quantity")]
public string TotalPackageQuantity { get; set; }
/// <summary>
- /// 杩愯緭鏂瑰紡缂栫爜
+ /// 杩愯緭鏂瑰紡缂栫爜
/// </summary>
[SugarColumn(ColumnName = "transport_type_code")]
public string TransportTypeCode { get; set; }
/// <summary>
- /// 杩愯緭鏂瑰紡鍚嶇О
+ /// 杩愯緭鏂瑰紡鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "transport_type_name")]
public string TransportTypeName { get; set; }
/// <summary>
- /// 鍖呰鏂瑰紡缂栫爜
+ /// 鍖呰鏂瑰紡缂栫爜
/// </summary>
[SugarColumn(ColumnName = "packing_way_code")]
public string PackingWayCode { get; set; }
/// <summary>
- /// 鍖呰鏂瑰紡鍚嶇О
+ /// 鍖呰鏂瑰紡鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "packing_way_name")]
public string PackingWayName { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁1
+ /// 鎵╁睍瀛楁1
/// </summary>
[SugarColumn(ColumnName = "extend_n01")]
public string ExtendN01 { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁2
+ /// 鎵╁睍瀛楁2
/// </summary>
[SugarColumn(ColumnName = "extend_n02")]
public string ExtendN02 { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁3
+ /// 鎵╁睍瀛楁3
/// </summary>
[SugarColumn(ColumnName = "extend_n03")]
public string ExtendN03 { get; set; }
/// <summary>
- /// 骞冲彴鎵╁睍瀛楁4
+ /// 骞冲彴鎵╁睍瀛楁4
/// </summary>
[SugarColumn(ColumnName = "platform_extend_n04")]
public string PlatformExtendN04 { get; set; }
/// <summary>
- /// 骞冲彴鎵╁睍瀛楁5
+ /// 骞冲彴鎵╁睍瀛楁5
/// </summary>
[SugarColumn(ColumnName = "platform_extend_n05")]
public string PlatformExtendN05 { get; set; }
/// <summary>
- /// 骞冲彴鎵╁睍瀛楁6
+ /// 骞冲彴鎵╁睍瀛楁6
/// </summary>
[SugarColumn(ColumnName = "platform_extend_n06")]
public string PlatformExtendN06 { get; set; }
/// <summary>
- /// 骞冲彴鎵╁睍瀛楁7
+ /// 骞冲彴鎵╁睍瀛楁7
/// </summary>
[SugarColumn(ColumnName = "platform_extend_n07")]
public string PlatformExtendN07 { get; set; }
/// <summary>
- /// 骞冲彴鎵╁睍瀛楁8
+ /// 骞冲彴鎵╁睍瀛楁8
/// </summary>
[SugarColumn(ColumnName = "platform_extend_n08")]
public string PlatformExtendN08 { get; set; }
/// <summary>
- /// 璐х墿閫佽揪鏃ユ湡锛堟椂闂存埑锛�
+ /// 璐х墿閫佽揪鏃ユ湡锛堟椂闂存埑锛�
/// </summary>
[SugarColumn(ColumnName = "cargo_delivery_time")]
public string CargoDeliveryTime { get; set; }
/// <summary>
- /// 鐗╂祦鏂瑰紡:1-渚涘簲鍟嗛�佽揣 2-蹇�� 3-閲囪喘鏂硅嚜鎻�
+ /// 鐗╂祦鏂瑰紡:1-渚涘簲鍟嗛�佽揣 2-蹇�� 3-閲囪喘鏂硅嚜鎻�
/// </summary>
[SugarColumn(ColumnName = "logistics_type")]
public string LogisticsType { get; set; }
/// <summary>
- /// 鐗╂祦鏂瑰紡涓枃灞曠ず
+ /// 鐗╂祦鏂瑰紡涓枃灞曠ず
/// </summary>
[SugarColumn(ColumnName = "logistics_type_show")]
public string LogisticsTypeShow { get; set; }
/// <summary>
- /// 鐗╂祦鍗曞彿
+ /// 鐗╂祦鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "logistics_number")]
public string LogisticsNumber { get; set; }
/// <summary>
- /// 浼樺厛妫�楠�:0-姝ｅ父 1-浼樺厛 2-绱ф��
+ /// 浼樺厛妫�楠�:0-姝ｅ父 1-浼樺厛 2-绱ф��
/// </summary>
[SugarColumn(ColumnName = "first_check")]
public string FirstCheck { get; set; }
/// <summary>
- /// 鍒涘缓鏃ユ湡
+ /// 鍒涘缓鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "create_date")]
public DateTime CreateDate { get; set; } = DateTime.Now;
/// <summary>
- /// 鏈�鍚庢搷浣滄椂闂达紙鏃堕棿鎴筹級
+ /// 鏈�鍚庢搷浣滄椂闂达紙鏃堕棿鎴筹級
/// </summary>
[SugarColumn(ColumnName = "last_operate_time")]
public string LastOperateTime { get; set; }
/// <summary>
- /// 鏈�鍚庢搷浣滄椂闂达紙鏃堕棿鎴筹級
+ /// 鏈�鍚庢搷浣滄椂闂达紙鏃堕棿鎴筹級
/// </summary>
[SugarColumn(ColumnName = "org_id")]
public string orgId { get; set; }
diff --git a/entity/DeliveryNoticeDetail.cs b/entity/DeliveryNoticeDetail.cs
index 1ec9dd7..28cadfe 100644
--- a/entity/DeliveryNoticeDetail.cs
+++ b/entity/DeliveryNoticeDetail.cs
@@ -1,447 +1,447 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
-/// 閫佽揣閫氱煡鍗曟嵁鏄庣粏琛�
+/// 閫佽揣閫氱煡鍗曟嵁鏄庣粏琛�
/// </summary>
[SugarTable("DELIVERY_NOTICE_DETAIL")]
public class DeliveryNoticeDetail
{
/// <summary>
- /// 涓婚敭Guid锛圫EQ_XKY锛�
+ /// 涓婚敭Guid锛圫EQ_XKY锛�
/// </summary>
[SugarColumn(ColumnName = "id")]
public Guid Id { get; set; }
/// <summary>
- /// 椤规鍙�
+ /// 椤规鍙�
/// </summary>
[SugarColumn(ColumnName = "line_no")]
public string LineNo { get; set; }
/// <summary>
- /// ERP閲囪喘鍗曞彿
+ /// ERP閲囪喘鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "po_erp_no")]
public string PoErpNo { get; set; }
/// <summary>
- /// 閲囪喘鍗曠被鍨� 1锛氫竴鑸噰璐紱2锛氬澶栭噰璐�
+ /// 閲囪喘鍗曠被鍨� 1锛氫竴鑸噰璐紱2锛氬澶栭噰璐�
/// </summary>
[SugarColumn(ColumnName = "purchase_type")]
public string PurchaseType { get; set; }
/// <summary>
- /// 閲囪喘鍗曢」娆�
+ /// 閲囪喘鍗曢」娆�
/// </summary>
[SugarColumn(ColumnName = "po_line_no")]
public string PoLineNo { get; set; }
/// <summary>
- /// 浜у搧缂栫爜
+ /// 浜у搧缂栫爜
/// </summary>
[SugarColumn(ColumnName = "product_code")]
public string ProductCode { get; set; }
/// <summary>
- /// 浜у搧鍚嶇О
+ /// 浜у搧鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "product_name")]
public string ProductName { get; set; }
/// <summary>
- /// 浜у搧瑙勬牸
+ /// 浜у搧瑙勬牸
/// </summary>
[SugarColumn(ColumnName = "product_scale")]
public string ProductScale { get; set; }
/// <summary>
- /// 鍑鸿揣鍗曚綅缂栫爜
+ /// 鍑鸿揣鍗曚綅缂栫爜
/// </summary>
[SugarColumn(ColumnName = "delivery_unit_code")]
public string DeliveryUnitCode { get; set; }
/// <summary>
- /// 鍑鸿揣鍗曚綅鍚嶇О
+ /// 鍑鸿揣鍗曚綅鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "delivery_unit_name")]
public string DeliveryUnitName { get; set; }
/// <summary>
- /// 鍑鸿揣鏁伴噺
+ /// 鍑鸿揣鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "delivery_qty")]
public string DeliveryQty { get; set; }
/// <summary>
- /// 鍑鸿揣璁′环鏁伴噺
+ /// 鍑鸿揣璁′环鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "delivery_valuation_qty")]
public string DeliveryValuationQty { get; set; }
/// <summary>
- /// 鍑鸿揣浜у搧鍗曚环
+ /// 鍑鸿揣浜у搧鍗曚环
/// </summary>
[SugarColumn(ColumnName = "price")]
public string Price { get; set; }
/// <summary>
- /// 鍑鸿揣浜у搧鍚◣鍗曚环
+ /// 鍑鸿揣浜у搧鍚◣鍗曚环
/// </summary>
[SugarColumn(ColumnName = "tax_price")]
public string TaxPrice { get; set; }
/// <summary>
- /// 鎺掔▼鑷畾涔夐」鐨勫��
+ /// 鎺掔▼鑷畾涔夐」鐨勫��
/// </summary>
[SugarColumn(ColumnName = "sch_dynamic_value")]
public string SchDynamicValue { get; set; }
/// <summary>
- /// 鎺掔▼鎵规鍙�
+ /// 鎺掔▼鎵规鍙�
/// </summary>
[SugarColumn(ColumnName = "schedule_batch_no")]
public string ScheduleBatchNo { get; set; }
/// <summary>
- /// 鎺掔▼鍗曞彿
+ /// 鎺掔▼鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "schedule_order_no")]
public string ScheduleOrderNo { get; set; }
/// <summary>
- /// 瀵瑰簲鎺掔▼ItemDetail鐨勪富閿垪
+ /// 瀵瑰簲鎺掔▼ItemDetail鐨勪富閿垪
/// </summary>
[SugarColumn(ColumnName = "schedule_detail_no")]
public string ScheduleDetailNo { get; set; }
/// <summary>
- /// 鏄惁鎬ユ枡 0:鍚� ; 1锛氭槸
+ /// 鏄惁鎬ユ枡 0:鍚� ; 1锛氭槸
/// </summary>
[SugarColumn(ColumnName = "urgent_flag")]
public string UrgentFlag { get; set; }
/// <summary>
- /// 鍘熷鍗曟嵁绫诲瀷 1锛氳鍗曪紱2锛氭帓绋嬶紱3锛氶��璐э紱4锛氬鍝�
+ /// 鍘熷鍗曟嵁绫诲瀷 1锛氳鍗曪紱2锛氭帓绋嬶紱3锛氶��璐э紱4锛氬鍝�
/// </summary>
[SugarColumn(ColumnName = "src_bill_type")]
public string SrcBillType { get; set; }
/// <summary>
- /// 閲囪喘椤规鐨勯噰璐鏄庝俊鎭�
+ /// 閲囪喘椤规鐨勯噰璐鏄庝俊鎭�
/// </summary>
[SugarColumn(ColumnName = "purchase_desc")]
public string PurchaseDesc { get; set; }
/// <summary>
- /// 鍗曟嵁澶囨敞锛宻rcBillType=1 瀵瑰簲閲囪喘璁㈠崟鍗曡韩鐨勫娉紱srcBillType=2 瀵瑰簲鎺掔▼椤规鐨勫娉�
+ /// 鍗曟嵁澶囨敞锛宻rcBillType=1 瀵瑰簲閲囪喘璁㈠崟鍗曡韩鐨勫娉紱srcBillType=2 瀵瑰簲鎺掔▼椤规鐨勫娉�
/// </summary>
[SugarColumn(ColumnName = "src_order_line_remark")]
public string SrcOrderLineRemark { get; set; }
/// <summary>
- /// 鐘舵�侊紙1:寰呯鏀讹紱2:绛炬敹涓紱3:宸插畬鎴愶級
+ /// 鐘舵�侊紙1:寰呯鏀讹紱2:绛炬敹涓紱3:宸插畬鎴愶級
/// </summary>
[SugarColumn(ColumnName = "status")]
public string Status { get; set; }
/// <summary>
- /// 鏀惰揣鐘舵�侊紙0-鏈敹璐э紱1-閮ㄥ垎鏀惰揣锛�2-鍏ㄩ儴鏀惰揣锛�
+ /// 鏀惰揣鐘舵�侊紙0-鏈敹璐э紱1-閮ㄥ垎鏀惰揣锛�2-鍏ㄩ儴鏀惰揣锛�
/// </summary>
[SugarColumn(ColumnName = "receive_status")]
public string ReceiveStatus { get; set; }
/// <summary>
- /// 鏁村崟姣涢噸
+ /// 鏁村崟姣涢噸
/// </summary>
[SugarColumn(ColumnName = "gross_weight")]
public string GrossWeight { get; set; }
/// <summary>
- /// 鏁村崟鍑�閲�
+ /// 鏁村崟鍑�閲�
/// </summary>
[SugarColumn(ColumnName = "net_weight")]
public string NetWeight { get; set; }
/// <summary>
- /// 閲嶉噺鍗曚綅缂栫爜
+ /// 閲嶉噺鍗曚綅缂栫爜
/// </summary>
[SugarColumn(ColumnName = "unit_weight_code")]
public string UnitWeightCode { get; set; }
/// <summary>
- /// 閲嶉噺鍗曚綅鍚嶇О
+ /// 閲嶉噺鍗曚綅鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "unit_weight_name")]
public string UnitWeightName { get; set; }
/// <summary>
- /// 鍖呰鏁�
+ /// 鍖呰鏁�
/// </summary>
[SugarColumn(ColumnName = "packing_qty")]
public string PackingQty { get; set; }
/// <summary>
- /// 鍝佺墝鍚嶇О
+ /// 鍝佺墝鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "brand_name")]
public string BrandName { get; set; }
/// <summary>
- /// 鍏朵粬鎵╁睍瀛楁
+ /// 鍏朵粬鎵╁睍瀛楁
/// </summary>
[SugarColumn(ColumnName = "other_extend")]
public string OtherExtend { get; set; }
/// <summary>
- /// 鍘熶骇鍥界紪鐮�
+ /// 鍘熶骇鍥界紪鐮�
/// </summary>
[SugarColumn(ColumnName = "original_country_code")]
public string OriginalCountryCode { get; set; }
/// <summary>
- /// 鍘熶骇鍥藉悕绉�
+ /// 鍘熶骇鍥藉悕绉�
/// </summary>
[SugarColumn(ColumnName = "original_country_name")]
public string OriginalCountryName { get; set; }
/// <summary>
- /// 澶囨敞
+ /// 澶囨敞
/// </summary>
[SugarColumn(ColumnName = "remark")]
public string Remark { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁1
+ /// 鎵╁睍瀛楁1
/// </summary>
[SugarColumn(ColumnName = "extend_n01")]
public string ExtendN01 { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁2
+ /// 鎵╁睍瀛楁2
/// </summary>
[SugarColumn(ColumnName = "extend_n02")]
public string ExtendN02 { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁3
+ /// 鎵╁睍瀛楁3
/// </summary>
[SugarColumn(ColumnName = "extend_n03")]
public string ExtendN03 { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁4
+ /// 鎵╁睍瀛楁4
/// </summary>
[SugarColumn(ColumnName = "extend_n04")]
public string ExtendN04 { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁5
+ /// 鎵╁睍瀛楁5
/// </summary>
[SugarColumn(ColumnName = "extend_n05")]
public string ExtendN05 { get; set; }
/// <summary>
- /// 鎵╁睍瀛楁6
+ /// 鎵╁睍瀛楁6
/// </summary>
[SugarColumn(ColumnName = "extend_n06")]
public string ExtendN06 { get; set; }
/// <summary>
- /// 搴撳瓨鍦扮偣缂栫爜
+ /// 搴撳瓨鍦扮偣缂栫爜
/// </summary>
[SugarColumn(ColumnName = "store_code")]
public string StoreCode { get; set; }
/// <summary>
- /// 搴撳瓨鍦扮偣鍚嶇О
+ /// 搴撳瓨鍦扮偣鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "store_name")]
public string StoreName { get; set; }
/// <summary>
- /// 宸茬鏀舵暟閲�
+ /// 宸茬鏀舵暟閲�
/// </summary>
[SugarColumn(ColumnName = "verify_qty")]
public string VerifyQty { get; set; }
/// <summary>
- /// 鍙叆搴撴暟閲�
+ /// 鍙叆搴撴暟閲�
/// </summary>
[SugarColumn(ColumnName = "allow_qty")]
public string AllowQty { get; set; }
/// <summary>
- /// 璁╂鎺ユ敹鏁伴噺
+ /// 璁╂鎺ユ敹鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "compromise_qty")]
public string CompromiseQty { get; set; }
/// <summary>
- /// 鎷掓敹鏁伴噺
+ /// 鎷掓敹鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "refused_qty")]
public string RefusedQty { get; set; }
/// <summary>
- /// 閫�璐у崟ERP缂栧彿
+ /// 閫�璐у崟ERP缂栧彿
/// </summary>
[SugarColumn(ColumnName = "rto_erp_no")]
public string RtoErpNo { get; set; }
/// <summary>
- /// 閫�璐у崟椤规
+ /// 閫�璐у崟椤规
/// </summary>
[SugarColumn(ColumnName = "rto_line_no")]
public string RtoLineNo { get; set; }
/// <summary>
- /// 浜у搧闀垮害
+ /// 浜у搧闀垮害
/// </summary>
[SugarColumn(ColumnName = "prod_length")]
public string ProdLength { get; set; }
/// <summary>
- /// 浜у搧瀹藉害
+ /// 浜у搧瀹藉害
/// </summary>
[SugarColumn(ColumnName = "prod_width")]
public string ProdWidth { get; set; }
/// <summary>
- /// 浜у搧楂樺害
+ /// 浜у搧楂樺害
/// </summary>
[SugarColumn(ColumnName = "prod_height")]
public string ProdHeight { get; set; }
/// <summary>
- /// 閲囪喘鍛樺鍚�
+ /// 閲囪喘鍛樺鍚�
/// </summary>
[SugarColumn(ColumnName = "buyer_name")]
public string BuyerName { get; set; }
/// <summary>
- /// 棰勮浜ゆ湡
+ /// 棰勮浜ゆ湡
/// </summary>
[SugarColumn(ColumnName = "expected_date")]
public string ExpectedDate { get; set; }
/// <summary>
- /// 鍥炲浜ゆ湡
+ /// 鍥炲浜ゆ湡
/// </summary>
[SugarColumn(ColumnName = "answer_date")]
public string AnswerDate { get; set; }
/// <summary>
- /// 甯佺缂栫爜
+ /// 甯佺缂栫爜
/// </summary>
[SugarColumn(ColumnName = "currency_code")]
public string CurrencyCode { get; set; }
/// <summary>
- /// 甯佺鍚嶇О
+ /// 甯佺鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "currency_name")]
public string CurrencyName { get; set; }
/// <summary>
- /// 鍙戦�佺鏀剁姸鎬�
+ /// 鍙戦�佺鏀剁姸鎬�
/// </summary>
[SugarColumn(ColumnName = "send_verify_status")]
public string SendVerifyStatus { get; set; }
/// <summary>
- /// 缁撴灉鏍囪瘑
+ /// 缁撴灉鏍囪瘑
/// </summary>
[SugarColumn(ColumnName = "result_flag")]
public string ResultFlag { get; set; }
/// <summary>
- /// 鐢宠鍑鸿揣鏁伴噺
+ /// 鐢宠鍑鸿揣鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "apply_delivery_qty")]
public string ApplyDeliveryQty { get; set; }
/// <summary>
- /// 鐢宠鍑鸿揣璁′环鏁伴噺
+ /// 鐢宠鍑鸿揣璁′环鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "apply_delivery_valuation_qty")]
public string ApplyDeliveryValuationQty { get; set; }
/// <summary>
- /// 鎵瑰彿
+ /// 鎵瑰彿
/// </summary>
[SugarColumn(ColumnName = "batch_number")]
public string BatchNumber { get; set; }
/// <summary>
- /// 宸叉敹璐ф暟閲�
+ /// 宸叉敹璐ф暟閲�
/// </summary>
[SugarColumn(ColumnName = "receive_qty")]
public string ReceiveQty { get; set; }
/// <summary>
- /// 宸插叆搴撴暟閲�
+ /// 宸插叆搴撴暟閲�
/// </summary>
[SugarColumn(ColumnName = "storage_qty")]
public string StorageQty { get; set; }
/// <summary>
- /// 閫�璐ф暟閲�
+ /// 閫�璐ф暟閲�
/// </summary>
[SugarColumn(ColumnName = "return_qty")]
public string ReturnQty { get; set; }
/// <summary>
- /// 浼樺厛妫�楠�:0-姝ｅ父 1-浼樺厛 2-绱ф��
+ /// 浼樺厛妫�楠�:0-姝ｅ父 1-浼樺厛 2-绱ф��
/// </summary>
[SugarColumn(ColumnName = "first_check")]
public string FirstCheck { get; set; }
/// <summary>
- /// 閲囪喘鍗曢」娆℃樉绀虹敤
+ /// 閲囪喘鍗曢」娆℃樉绀虹敤
/// </summary>
[SugarColumn(ColumnName = "po_line_no_show")]
public string PoLineNoShow { get; set; }
/// <summary>
- /// 澶氳瑷�澶囨敞
+ /// 澶氳瑷�澶囨敞
/// </summary>
[SugarColumn(ColumnName = "remarks")]
public string Remarks { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
+ /// 鍒涘缓鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "create_time")]
public string CreateTime { get; set; }
/// <summary>
- /// 鏇存柊鏃堕棿
+ /// 鏇存柊鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "update_time")]
public string UpdateTime { get; set; }
/// <summary>
- /// 鍏宠仈涓昏〃ID
+ /// 鍏宠仈涓昏〃ID
/// </summary>
[SugarColumn(ColumnName = "pid")]
public string Pid { get; set; }
/// <summary>
- /// 鎺掔▼椤规鍙�
+ /// 鎺掔▼椤规鍙�
/// </summary>
[SugarColumn(ColumnName = "plan_line_no")]
public string PlanLineNo { get; set; }
/// <summary>
- /// 閫佽揣鍗曞彿
+ /// 閫佽揣鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "delivery_no")]
public string DeliveryNo { get; set; }
/// <summary>
- /// 鍚屾鏃堕棿
+ /// 鍚屾鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
public DateTime? SynchronousDate { get; set; }
diff --git a/entity/ErpMesKc.cs b/entity/ErpMesKc.cs
index 35c9b96..93af660 100644
--- a/entity/ErpMesKc.cs
+++ b/entity/ErpMesKc.cs
@@ -11,9 +11,11 @@
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public Guid ID { get; set; }
- [SugarColumn(ColumnName = "FNUMBER")] public string? FNumber { get; set; }
+ [SugarColumn(ColumnName = "FNUMBER")]
+ public string? FNumber { get; set; }
- [SugarColumn(ColumnName = "FQTY")] public decimal? FQty { get; set; }
+ [SugarColumn(ColumnName = "FQTY")]
+ public decimal? FQty { get; set; }
[SugarColumn(ColumnName = "FBASEUNIT")]
public string? FBaseUnit { get; set; }
@@ -21,14 +23,17 @@
[SugarColumn(ColumnName = "FSTOCKUNIT")]
public string? FStockUnit { get; set; }
- [SugarColumn(ColumnName = "FSTOCKID")] public string? FStockId { get; set; }
+ [SugarColumn(ColumnName = "FSTOCKID")]
+ public string? FStockId { get; set; }
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
- [SugarColumn(ColumnName = "FBATCHNO")] public string? FBatchno { get; set; }
+ [SugarColumn(ColumnName = "FBATCHNO")]
+ public string? FBatchno { get; set; }
- [SugarColumn(ColumnName = "FMTONO")] public string? FMtono { get; set; }
+ [SugarColumn(ColumnName = "FMTONO")]
+ public string? FMtono { get; set; }
[SugarColumn(ColumnName = "FSTOCKSTATUS")]
public string? FStockStatus { get; set; }
@@ -41,4 +46,5 @@
[SugarColumn(ColumnName = "FSTOCKORGID")]
public decimal? FStockOrgId { get; set; }
-}
\ No newline at end of file
+
+}
diff --git a/entity/Inventory.cs b/entity/Inventory.cs
index b83279c..d818b72 100644
--- a/entity/Inventory.cs
+++ b/entity/Inventory.cs
@@ -1,7 +1,8 @@
-锘縩amespace NewPdaSqlServer.entity;
-
-public class Inventory
+锘縩amespace NewPdaSqlServer.entity
{
- public string? ItemNo { get; set; } // 鏂欏彿
- public string? DepotCode { get; set; } // 浠撳簱
-}
\ No newline at end of file
+ public class Inventory
+ {
+ public string? ItemNo { get; set; } // 鏂欏彿
+ public string? DepotCode { get; set; } // 浠撳簱
+ }
+}
diff --git a/entity/MesDbck.cs b/entity/MesDbck.cs
index 1fccec3..e8ada26 100644
--- a/entity/MesDbck.cs
+++ b/entity/MesDbck.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 璋冩嫧鍑哄簱鐢宠
diff --git a/entity/MesDbckDetail.cs b/entity/MesDbckDetail.cs
index b9b852a..61aa8c0 100644
--- a/entity/MesDbckDetail.cs
+++ b/entity/MesDbckDetail.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 璋冩嫧鍑哄簱鐢宠璇︽儏
diff --git a/entity/MesInvItemIns.cs b/entity/MesInvItemIns.cs
index 5c25b18..8585581 100644
--- a/entity/MesInvItemIns.cs
+++ b/entity/MesInvItemIns.cs
@@ -106,7 +106,7 @@
public DateTime? CheckDate { get; set; }
/// <summary>
- /// 鍏ュ簱鍗曞搴旂殑鐢宠鍗曞彿锛堟病鏈夌敵璇锋祦绋嬬殑灏变负绌猴級
+ /// 鍏ュ簱鍗曞搴旂殑鐢宠鍗曞彿锛堟病鏈夌敵璇锋祦绋嬬殑灏变负绌猴級
/// </summary>
[SugarColumn(ColumnName = "TASK_NO")]
public string? TaskNo { get; set; }
diff --git a/entity/MesInvItemStocks.cs b/entity/MesInvItemStocks.cs
index b7cdd33..ac0078b 100644
--- a/entity/MesInvItemStocks.cs
+++ b/entity/MesInvItemStocks.cs
@@ -226,19 +226,16 @@
/// </summary>
[SugarColumn(ColumnName = "INDEP_USER_CODE")]
public string? IndepUserCode { get; set; }
-
/// <summary>
/// 璐т富id
/// </summary>
[SugarColumn(ColumnName = "Owner_Id")]
public string? OwnerId { get; set; }
-
/// <summary>
/// 璐т富绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "Owner_Type")]
public string? OwnerType { get; set; }
-
/// <summary>
/// 搴撳瓨缁勭粐
/// </summary>
diff --git a/entity/MesItemQt.cs b/entity/MesItemQt.cs
index 466a0c0..5eeab57 100644
--- a/entity/MesItemQt.cs
+++ b/entity/MesItemQt.cs
@@ -1,220 +1,221 @@
锘縰sing SqlSugar;
+using System;
namespace NewPdaSqlServer.entity;
/// <summary>
-/// 鍏朵粬鍑哄簱鐢宠琛� - MES_ITEM_QT
+/// 鍏朵粬鍑哄簱鐢宠琛� - MES_ITEM_QT
/// </summary>
[SugarTable("MES_ITEM_QT")]
public class MesItemQt
{
/// <summary>
- /// 涓婚敭Guid
+ /// 涓婚敭Guid
/// </summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; } = Guid.NewGuid();
/// <summary>
- /// 鐢宠鍗曞彿
+ /// 鐢宠鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "qtck")]
public string Qtck { get; set; }
/// <summary>
- /// 鐢宠鏃ユ湡
+ /// 鐢宠鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "qt001")]
public DateTime Qt001 { get; set; } = DateTime.Now;
/// <summary>
- /// 瀹℃牳鏃ユ湡
+ /// 瀹℃牳鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "qt002")]
public DateTime? Qt002 { get; set; }
/// <summary>
- /// 鍑哄簱绫诲埆
+ /// 鍑哄簱绫诲埆
/// </summary>
[SugarColumn(ColumnName = "qt003")]
public string Qt003 { get; set; }
/// <summary>
- /// 涓氬姟绫诲瀷
+ /// 涓氬姟绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "qt004")]
public string Qt004 { get; set; }
/// <summary>
- /// 鍒跺崟浜�
+ /// 鍒跺崟浜�
/// </summary>
[SugarColumn(ColumnName = "qt005")]
public string Qt005 { get; set; }
/// <summary>
- /// 鐢熶骇宸ュ崟
+ /// 鐢熶骇宸ュ崟
/// </summary>
[SugarColumn(ColumnName = "qt006")]
public string Qt006 { get; set; }
/// <summary>
- /// 鍙戞枡浠撳簱ID
+ /// 鍙戞枡浠撳簱ID
/// </summary>
[SugarColumn(ColumnName = "qt008")]
public string Qt008 { get; set; }
/// <summary>
- /// 棰嗙敤閮ㄩ棬ID
+ /// 棰嗙敤閮ㄩ棬ID
/// </summary>
[SugarColumn(ColumnName = "qt009")]
public string Qt009 { get; set; }
/// <summary>
- /// 鍑哄簱鍘熷洜
+ /// 鍑哄簱鍘熷洜
/// </summary>
[SugarColumn(ColumnName = "qt010")]
public string Qt010 { get; set; }
/// <summary>
- /// 浠撳簱缂栫爜
+ /// 浠撳簱缂栫爜
/// </summary>
[SugarColumn(ColumnName = "qt011")]
public string Qt011 { get; set; }
/// <summary>
- /// 閮ㄩ棬缂栫爜
+ /// 閮ㄩ棬缂栫爜
/// </summary>
[SugarColumn(ColumnName = "qt012")]
public string Qt012 { get; set; }
/// <summary>
- /// 棰嗙敤瀹㈡埛ID
+ /// 棰嗙敤瀹㈡埛ID
/// </summary>
[SugarColumn(ColumnName = "qt013")]
public int Qt013 { get; set; }
/// <summary>
- /// 瀹岀粨鏍囪瘑锛岄粯璁�0
+ /// 瀹岀粨鏍囪瘑锛岄粯璁�0
/// </summary>
[SugarColumn(ColumnName = "qt014")]
public bool Qt014 { get; set; } = false;
/// <summary>
- /// 瀹℃牳鐘舵�侊紝榛樿0
+ /// 瀹℃牳鐘舵�侊紝榛樿0
/// </summary>
[SugarColumn(ColumnName = "qt015")]
public bool Qt015 { get; set; } = false;
/// <summary>
- /// 瀹℃牳浜�
+ /// 瀹℃牳浜�
/// </summary>
[SugarColumn(ColumnName = "qt016")]
public string Qt016 { get; set; }
/// <summary>
- /// 浠诲姟鍗曞彿
+ /// 浠诲姟鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "qt017")]
public string Qt017 { get; set; }
/// <summary>
- /// 璐т富
+ /// 璐т富
/// </summary>
[SugarColumn(ColumnName = "qt018")]
public string Qt018 { get; set; }
/// <summary>
- /// 鍗曟嵁绫诲瀷锛�
- /// 1鐩樹簭 2鍖呮潗棰嗙敤 3鐮斿彂棰嗙敤 4鍔炲叕鐢ㄥ搧棰嗙敤 5妯″叿鏉愭枡棰嗙敤 6浣庡�兼槗鑰楀搧棰嗙敤 7鐢熶骇閰嶄欢 8閲囪喘閫�鏂� 9娉ㄥ浠朵笉鑹��鏂�
+ /// 鍗曟嵁绫诲瀷锛�
+ /// 1鐩樹簭 2鍖呮潗棰嗙敤 3鐮斿彂棰嗙敤 4鍔炲叕鐢ㄥ搧棰嗙敤 5妯″叿鏉愭枡棰嗙敤 6浣庡�兼槗鑰楀搧棰嗙敤 7鐢熶骇閰嶄欢 8閲囪喘閫�鏂� 9娉ㄥ浠朵笉鑹��鏂�
/// </summary>
[SugarColumn(ColumnName = "qt019")]
public string Qt019 { get; set; }
/// <summary>
- /// 搴撳瓨鏂瑰悜锛堟櫘閫氾紝閫�璐э級
+ /// 搴撳瓨鏂瑰悜锛堟櫘閫氾紝閫�璐э級
/// </summary>
[SugarColumn(ColumnName = "qt020")]
public string Qt020 { get; set; }
/// <summary>
- /// 閿�鍞鍗曞彿
+ /// 閿�鍞鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "qt021")]
public string Qt021 { get; set; }
/// <summary>
- /// 棰嗘枡浜�
+ /// 棰嗘枡浜�
/// </summary>
[SugarColumn(ColumnName = "qt022")]
public string Qt022 { get; set; }
/// <summary>
- /// 搴撳瓨缁勭粐
+ /// 搴撳瓨缁勭粐
/// </summary>
[SugarColumn(ColumnName = "qt023")]
public string Qt023 { get; set; }
/// <summary>
- /// 棰嗙敤缁勭粐
+ /// 棰嗙敤缁勭粐
/// </summary>
[SugarColumn(ColumnName = "qt024")]
public string Qt024 { get; set; }
/// <summary>
- /// 璐т富绫诲瀷
+ /// 璐т富绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "qt025")]
public string Qt025 { get; set; }
/// <summary>
- /// 鏄惁鍞悗瀹℃牳
+ /// 鏄惁鍞悗瀹℃牳
/// </summary>
[SugarColumn(ColumnName = "qt026")]
public bool? Qt026 { get; set; }
/// <summary>
- /// 鍞悗瀹℃牳鏃堕棿
+ /// 鍞悗瀹℃牳鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "qt027")]
public DateTime? Qt027 { get; set; }
/// <summary>
- /// 鍞悗瀹℃牳浜�
+ /// 鍞悗瀹℃牳浜�
/// </summary>
[SugarColumn(ColumnName = "qt028")]
public string Qt028 { get; set; }
/// <summary>
- /// 璐㈠姟瀹℃牳
+ /// 璐㈠姟瀹℃牳
/// </summary>
[SugarColumn(ColumnName = "qt029")]
public bool? Qt029 { get; set; }
/// <summary>
- /// 璐㈠姟瀹℃牳鏃堕棿
+ /// 璐㈠姟瀹℃牳鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "qt030")]
public DateTime? Qt030 { get; set; }
/// <summary>
- /// 璐㈠姟瀹℃牳浜�
+ /// 璐㈠姟瀹℃牳浜�
/// </summary>
[SugarColumn(ColumnName = "qt031")]
public string Qt031 { get; set; }
/// <summary>
- /// 閲囪喘瀹℃牳
+ /// 閲囪喘瀹℃牳
/// </summary>
[SugarColumn(ColumnName = "qt032")]
public bool? Qt032 { get; set; }
/// <summary>
- /// 閲囪喘瀹℃牳鏃堕棿
+ /// 閲囪喘瀹℃牳鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "qt033")]
public DateTime? Qt033 { get; set; }
/// <summary>
- /// 閲囪喘瀹℃牳浜�
+ /// 閲囪喘瀹℃牳浜�
/// </summary>
[SugarColumn(ColumnName = "qt034")]
public string Qt034 { get; set; }
diff --git a/entity/MesItemQtrk.cs b/entity/MesItemQtrk.cs
index 110e365..271826e 100644
--- a/entity/MesItemQtrk.cs
+++ b/entity/MesItemQtrk.cs
@@ -161,11 +161,13 @@
public string? Qt024 { get; set; }
/// <summary>
+ ///
/// </summary>
[SugarColumn(ColumnName = "qt025")]
public string? Qt025 { get; set; }
/// <summary>
+ ///
/// </summary>
[SugarColumn(ColumnName = "qt026")]
public string? Qt026 { get; set; }
diff --git a/entity/MesQaItemsDetectDetail13.cs b/entity/MesQaItemsDetectDetail13.cs
index 7e930a3..7391008 100644
--- a/entity/MesQaItemsDetectDetail13.cs
+++ b/entity/MesQaItemsDetectDetail13.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
/// IQC妫�楠屾牱渚嬭〃
diff --git a/entity/MesQaItemsDetectDetail5.cs b/entity/MesQaItemsDetectDetail5.cs
index bbc0ee4..bdeaa8f 100644
--- a/entity/MesQaItemsDetectDetail5.cs
+++ b/entity/MesQaItemsDetectDetail5.cs
@@ -210,46 +210,46 @@
/// <summary>
- /// 璁よ瘉淇℃伅_鐢熶骇鏃ユ湡
+ /// 璁よ瘉淇℃伅_鐢熶骇鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "ipqc_rzxx_date")]
public string? IPQCRZXXDate { get; set; }
/// <summary>
- /// 璁よ瘉淇℃伅鐩稿叧浣跨敤鏁伴噺
+ /// 璁よ瘉淇℃伅鐩稿叧浣跨敤鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "ipqc_rzxx_num")]
public int? IPQCRZXXNum { get; set; }
/// <summary>
- /// 鍝佹按娴嬭瘯_鏄惁鏈夊紓鍛�
+ /// 鍝佹按娴嬭瘯_鏄惁鏈夊紓鍛�
/// </summary>
[SugarColumn(ColumnName = "ipqc_pscs")]
public string? IPQCpscs { get; set; }
/// <summary>
- /// 鐗╂枡椤圭洰鍒嗙粍
+ /// 鐗╂枡椤圭洰鍒嗙粍
/// </summary>
[SugarColumn(ColumnName = "FCHECK_TYPE")]
public string? FcheckType { get; set; }
/// <summary>
- /// 姘存俯閫夋嫨
+ /// 姘存俯閫夋嫨
/// </summary>
[SugarColumn(ColumnName = "ipqc_zrxn_sel1")]
public string? IPQCZrxnSel1 { get; set; }
/// <summary>
- /// 娴侀噺閫夋嫨
+ /// 娴侀噺閫夋嫨
/// </summary>
[SugarColumn(ColumnName = "ipqc_zrxn_sel2")]
public string? IPQCZrxnSel2 { get; set; }
/// <summary>
- /// 鍒剁儹鎬ц兘缁撴灉琛ㄦ牸
+ /// 鍒剁儹鎬ц兘缁撴灉琛ㄦ牸
/// </summary>
[SugarColumn(ColumnName = "ipqc_zrxn_table")]
- public string? IPQCZrxnTable { get; set; }
+ public string? IPQCZrxnTable { get; set; }
/// <summary>
/// 鏍锋湰宸插綍鍏ユ暟
diff --git a/entity/MesScthSq.cs b/entity/MesScthSq.cs
index 4f9af30..a7f39dd 100644
--- a/entity/MesScthSq.cs
+++ b/entity/MesScthSq.cs
@@ -1,93 +1,93 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
-/// 鐢熶骇閫�璐ц〃瀹炰綋绫�
+/// 鐢熶骇閫�璐ц〃瀹炰綋绫�
/// </summary>
[SugarTable("MES_SCTH_SQ")]
public class MesScthSq
{
/// <summary>
- /// 涓婚敭guid
+ /// 涓婚敭guid
/// </summary>
[SugarColumn(ColumnName = "ID")]
public string Id { get; set; } // 浣跨敤string绫诲瀷鏉ュ瓨鍌╱niqueidentifier
/// <summary>
- /// 鍗曞彿
+ /// 鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
/// <summary>
- /// 寤虹珛鑰�
+ /// 寤虹珛鑰�
/// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
/// <summary>
- /// 寤虹珛鏃堕棿
+ /// 寤虹珛鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏇存柊鑰�
+ /// 鏇存柊鑰�
/// </summary>
[SugarColumn(ColumnName = "LAST_UPDATE_USER")]
public string LastUpdateUser { get; set; }
/// <summary>
- /// 鏇存柊鏃堕棿
+ /// 鏇存柊鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "LAST_UPDATE_TIME")]
public DateTime? LastUpdateTime { get; set; }
/// <summary>
- /// 瀹℃牳鑰�
+ /// 瀹℃牳鑰�
/// </summary>
[SugarColumn(ColumnName = "CHECK_USER")]
public string CheckUser { get; set; }
/// <summary>
- /// 瀹℃牳鏃堕棿
+ /// 瀹℃牳鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "CHECK_DATE")]
public DateTime? CheckDate { get; set; }
/// <summary>
- /// 鐘舵��
+ /// 鐘舵��
/// </summary>
[SugarColumn(ColumnName = "STATUS")]
public bool Status { get; set; }
/// <summary>
- /// 瀹屾垚鏍囪瘑
+ /// 瀹屾垚鏍囪瘑
/// </summary>
[SugarColumn(ColumnName = "IS_FINISH")]
public bool IsFinish { get; set; }
/// <summary>
- /// 閫�璐у師鍥�
+ /// 閫�璐у師鍥�
/// </summary>
[SugarColumn(ColumnName = "RETURN_TYPE")]
public string ReturnType { get; set; }
/// <summary>
- /// 浠撳簱
+ /// 浠撳簱
/// </summary>
[SugarColumn(ColumnName = "DEPOT_ID")]
public int DepotId { get; set; }
/// <summary>
- /// 鐢宠澶囨敞
+ /// 鐢宠澶囨敞
/// </summary>
[SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
/// <summary>
- /// 缁勭粐
+ /// 缁勭粐
/// </summary>
[SugarColumn(ColumnName = "TH_ORG_ID")]
public string ThOrgId { get; set; }
diff --git a/entity/MesScthSqDetail.cs b/entity/MesScthSqDetail.cs
index 5830f41..c0d6e0f 100644
--- a/entity/MesScthSqDetail.cs
+++ b/entity/MesScthSqDetail.cs
@@ -1,63 +1,63 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
-/// 鐢熶骇閫�璐ф槑缁嗚〃瀹炰綋绫�
+/// 鐢熶骇閫�璐ф槑缁嗚〃瀹炰綋绫�
/// </summary>
[SugarTable("MES_SCTH_SQ_DETAIL")]
public class MesScthSqDetail
{
/// <summary>
- /// 涓婚敭
+ /// 涓婚敭
/// </summary>
[SugarColumn(ColumnName = "ID")]
public string Id { get; set; } // 浣跨敤string绫诲瀷鏉ュ瓨鍌╱niqueidentifier
/// <summary>
- /// 澶栭敭
+ /// 澶栭敭
/// </summary>
[SugarColumn(ColumnName = "MID")]
public string Mid { get; set; } // 浣跨敤string绫诲瀷鏉ュ瓨鍌╱niqueidentifier
/// <summary>
- /// 鐗╂枡Id
+ /// 鐗╂枡Id
/// </summary>
[SugarColumn(ColumnName = "ITEM_ID")]
public int ItemId { get; set; }
/// <summary>
- /// 鐢宠鏁伴噺
+ /// 鐢宠鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "SQ_NUM")]
public decimal SqNum { get; set; }
/// <summary>
- /// 宸叉壂鏁伴噺
+ /// 宸叉壂鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "YS_NUM")]
public decimal YsNum { get; set; }
/// <summary>
- /// 澶囨敞
+ /// 澶囨敞
/// </summary>
[SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
/// <summary>
- /// 瀹岀粨
+ /// 瀹岀粨
/// </summary>
[SugarColumn(ColumnName = "IS_FINISH")]
public bool IsFinish { get; set; }
/// <summary>
- /// 椤规
+ /// 椤规
/// </summary>
[SugarColumn(ColumnName = "ORDER_NO")]
public int OrderNo { get; set; }
/// <summary>
- /// 鍏ュ簱GUID
+ /// 鍏ュ簱GUID
/// </summary>
[SugarColumn(ColumnName = "RKMX_GUID")]
public string RkmxGuid { get; set; } // 浣跨敤string绫诲瀷鏉ュ瓨鍌╱niqueidentifier
diff --git a/entity/MesShouTui.cs b/entity/MesShouTui.cs
index f1e7241..21c5884 100644
--- a/entity/MesShouTui.cs
+++ b/entity/MesShouTui.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
/// 鍙楅��
diff --git a/entity/MesShouTuiDetail.cs b/entity/MesShouTuiDetail.cs
index 46ef589..4343907 100644
--- a/entity/MesShouTuiDetail.cs
+++ b/entity/MesShouTuiDetail.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
/// 鍙楅��鏄庣粏
diff --git a/entity/MesShouTuo.cs b/entity/MesShouTuo.cs
index 3590acc..cea7f65 100644
--- a/entity/MesShouTuo.cs
+++ b/entity/MesShouTuo.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 鍙楁墭鍏ュ簱鐢宠
diff --git a/entity/MesShouTuoDetail.cs b/entity/MesShouTuoDetail.cs
index d50b4b3..278c717 100644
--- a/entity/MesShouTuoDetail.cs
+++ b/entity/MesShouTuoDetail.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
/// 鍙楁墭鍏ュ簱鐢宠鏄庣粏
diff --git a/entity/MesWorkProd.cs b/entity/MesWorkProd.cs
index e469e39..62f5c43 100644
--- a/entity/MesWorkProd.cs
+++ b/entity/MesWorkProd.cs
@@ -121,7 +121,6 @@
/// </summary>
[SugarColumn(ColumnName = "report_by")]
public string? ReportBy { get; set; }
-
/// <summary>
/// 鎶ュ伐鏃堕棿
/// </summary>
diff --git a/entity/SalesDeliver.cs b/entity/SalesDeliver.cs
index cb3ac2f..b32c46b 100644
--- a/entity/SalesDeliver.cs
+++ b/entity/SalesDeliver.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 鍙戣揣閫氱煡鐢宠鍗�
diff --git a/entity/SalesDeliverDetail.cs b/entity/SalesDeliverDetail.cs
index 3527914..1278cb5 100644
--- a/entity/SalesDeliverDetail.cs
+++ b/entity/SalesDeliverDetail.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 鍙戣揣閫氱煡鍗曟槑缁�
diff --git a/entity/SalesOrder.cs b/entity/SalesOrder.cs
index 71c04bd..2ce2dd9 100644
--- a/entity/SalesOrder.cs
+++ b/entity/SalesOrder.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 閿�鍞鍗曡〃
@@ -65,7 +65,8 @@
[SugarColumn(ColumnName = "SALER_ID")]
public string? SalerId { get; set; } // 閿�鍞憳
- [SugarColumn(ColumnName = "NOTE")] public string? Note { get; set; } // 澶囨敞
+ [SugarColumn(ColumnName = "NOTE")]
+ public string? Note { get; set; } // 澶囨敞
//[SugarColumn(ColumnName = "UNW_REMARKS_KHJHDD")]
//public string? UnWRemarksKhjHdd { get; set; } // 瀹㈡埛浜よ揣鍦扮偣
@@ -131,4 +132,6 @@
[SugarColumn(ColumnName = "ENTRY_NOTE")]
public string? EntryNote { get; set; } // 澶囨敞
+
+
}
\ No newline at end of file
diff --git a/entity/SalesOrderDetail.cs b/entity/SalesOrderDetail.cs
index 55b5007..0cce5a2 100644
--- a/entity/SalesOrderDetail.cs
+++ b/entity/SalesOrderDetail.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 閿�鍞鍗曟槑缁嗚〃
@@ -228,9 +228,8 @@
/// <summary>
/// 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
[SugarColumn(ColumnName = "BASE_RET_NOTICE_QTY")]
- public decimal? BaseRetNoticeQty { get; set; }
+ public decimal? BaseRetNoticeQty { get; set; } /// </summary>
- /// </summary>
/// <summary>
/// 绱閫�璐ф暟閲忥紙閿�鍞熀鏈級
/// </summary>
@@ -248,4 +247,5 @@
/// </summary>
[SugarColumn(ColumnName = "BASEARQTY")]
public decimal? BASEARQTY { get; set; }
+
}
\ No newline at end of file
diff --git a/entity/SalesReturnNotice.cs b/entity/SalesReturnNotice.cs
index b1c1561..4b70e06 100644
--- a/entity/SalesReturnNotice.cs
+++ b/entity/SalesReturnNotice.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 閿�鍞��璐х敵璇峰崟
diff --git a/entity/SalesReturnNoticeDetail.cs b/entity/SalesReturnNoticeDetail.cs
index 7d08dcf..48df0dc 100644
--- a/entity/SalesReturnNoticeDetail.cs
+++ b/entity/SalesReturnNoticeDetail.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Modes;
/// <summary>
/// 閿�鍞��璐ч�氱煡鍗曟槑缁嗚〃
diff --git a/entity/TblBarcodeInformation.cs b/entity/TblBarcodeInformation.cs
index 6aab524..17c57af 100644
--- a/entity/TblBarcodeInformation.cs
+++ b/entity/TblBarcodeInformation.cs
@@ -1,196 +1,198 @@
锘縰sing SqlSugar;
+using System;
-namespace NewPdaSqlServer.entity;
-
-/// <summary>
-/// 鎼哄浜戞潯鐮佷俊鎭〃
-/// </summary>
-[SugarTable("TBL_BARCODE_INFORMATION")]
-public class TblBarcodeInformation
+namespace MES.Service.Models
{
/// <summary>
- /// 涓婚敭Guid锛圫EQ_XKY锛�
+ /// 鎼哄浜戞潯鐮佷俊鎭〃
/// </summary>
- [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
- public Guid Id { get; set; }
+ [SugarTable("TBL_BARCODE_INFORMATION")]
+ public class TblBarcodeInformation
+ {
+ /// <summary>
+ /// 涓婚敭Guid锛圫EQ_XKY锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+ public Guid Id { get; set; }
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "product_code")]
- public string ProductCode { get; set; }
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "product_code")]
+ public string ProductCode { get; set; }
- /// <summary>
- /// 灏忓寘鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "small_barcode")]
- public string SmallBarcode { get; set; }
+ /// <summary>
+ /// 灏忓寘鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "small_barcode")]
+ public string SmallBarcode { get; set; }
- /// <summary>
- /// 澶у寘鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "big_barcode")]
- public string BigBarcode { get; set; }
+ /// <summary>
+ /// 澶у寘鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "big_barcode")]
+ public string BigBarcode { get; set; }
- /// <summary>
- /// 澶栫鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "outer_barcode")]
- public string OuterBarcode { get; set; }
+ /// <summary>
+ /// 澶栫鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "outer_barcode")]
+ public string OuterBarcode { get; set; }
- /// <summary>
- /// 褰撳墠灏忓寘鏉＄爜鍖呭惈鐨勬暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "include_qty")]
- public string IncludeQty { get; set; }
+ /// <summary>
+ /// 褰撳墠灏忓寘鏉＄爜鍖呭惈鐨勬暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "include_qty")]
+ public string IncludeQty { get; set; }
- /// <summary>
- /// 灏忓寘鏉＄爜-闀�
- /// </summary>
- [SugarColumn(ColumnName = "small_package_length")]
- public string SmallPackageLength { get; set; }
+ /// <summary>
+ /// 灏忓寘鏉＄爜-闀�
+ /// </summary>
+ [SugarColumn(ColumnName = "small_package_length")]
+ public string SmallPackageLength { get; set; }
- /// <summary>
- /// 灏忓寘鏉＄爜-瀹�
- /// </summary>
- [SugarColumn(ColumnName = "small_package_width")]
- public string SmallPackageWidth { get; set; }
+ /// <summary>
+ /// 灏忓寘鏉＄爜-瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "small_package_width")]
+ public string SmallPackageWidth { get; set; }
- /// <summary>
- /// 灏忓寘鏉＄爜-楂�
- /// </summary>
- [SugarColumn(ColumnName = "small_package_height")]
- public string SmallPackageHeight { get; set; }
+ /// <summary>
+ /// 灏忓寘鏉＄爜-楂�
+ /// </summary>
+ [SugarColumn(ColumnName = "small_package_height")]
+ public string SmallPackageHeight { get; set; }
- /// <summary>
- /// 澶у寘鏉＄爜-闀�
- /// </summary>
- [SugarColumn(ColumnName = "big_package_length")]
- public string BigPackageLength { get; set; }
+ /// <summary>
+ /// 澶у寘鏉＄爜-闀�
+ /// </summary>
+ [SugarColumn(ColumnName = "big_package_length")]
+ public string BigPackageLength { get; set; }
- /// <summary>
- /// 澶у寘鏉＄爜-瀹�
- /// </summary>
- [SugarColumn(ColumnName = "big_package_width")]
- public string BigPackageWidth { get; set; }
+ /// <summary>
+ /// 澶у寘鏉＄爜-瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "big_package_width")]
+ public string BigPackageWidth { get; set; }
- /// <summary>
- /// 澶у寘鏉＄爜-楂�
- /// </summary>
- [SugarColumn(ColumnName = "big_package_height")]
- public string BigPackageHeight { get; set; }
+ /// <summary>
+ /// 澶у寘鏉＄爜-楂�
+ /// </summary>
+ [SugarColumn(ColumnName = "big_package_height")]
+ public string BigPackageHeight { get; set; }
- /// <summary>
- /// 澶栫鏉＄爜-闀�
- /// </summary>
- [SugarColumn(ColumnName = "outer_package_length")]
- public string OuterPackageLength { get; set; }
+ /// <summary>
+ /// 澶栫鏉＄爜-闀�
+ /// </summary>
+ [SugarColumn(ColumnName = "outer_package_length")]
+ public string OuterPackageLength { get; set; }
- /// <summary>
- /// 澶栫鏉＄爜-瀹�
- /// </summary>
- [SugarColumn(ColumnName = "outer_package_width")]
- public string OuterPackageWidth { get; set; }
+ /// <summary>
+ /// 澶栫鏉＄爜-瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "outer_package_width")]
+ public string OuterPackageWidth { get; set; }
- /// <summary>
- /// 澶栫鏉＄爜-楂�
- /// </summary>
- [SugarColumn(ColumnName = "outer_package_height")]
- public string OuterPackageHeight { get; set; }
+ /// <summary>
+ /// 澶栫鏉＄爜-楂�
+ /// </summary>
+ [SugarColumn(ColumnName = "outer_package_height")]
+ public string OuterPackageHeight { get; set; }
- /// <summary>
- /// 褰撳墠灏忓寘鏉＄爜鐨勬祦姘寸爜
- /// </summary>
- [SugarColumn(ColumnName = "small_package_sn")]
- public string SmallPackageSn { get; set; }
+ /// <summary>
+ /// 褰撳墠灏忓寘鏉＄爜鐨勬祦姘寸爜
+ /// </summary>
+ [SugarColumn(ColumnName = "small_package_sn")]
+ public string SmallPackageSn { get; set; }
- /// <summary>
- /// 褰撳墠澶у寘鏉＄爜鐨勬祦姘寸爜
- /// </summary>
- [SugarColumn(ColumnName = "big_package_sn")]
- public string BigPackageSn { get; set; }
+ /// <summary>
+ /// 褰撳墠澶у寘鏉＄爜鐨勬祦姘寸爜
+ /// </summary>
+ [SugarColumn(ColumnName = "big_package_sn")]
+ public string BigPackageSn { get; set; }
- /// <summary>
- /// 褰撳墠澶栫鏉＄爜鐨勬祦姘寸爜
- /// </summary>
- [SugarColumn(ColumnName = "out_package_sn")]
- public string OutPackageSn { get; set; }
+ /// <summary>
+ /// 褰撳墠澶栫鏉＄爜鐨勬祦姘寸爜
+ /// </summary>
+ [SugarColumn(ColumnName = "out_package_sn")]
+ public string OutPackageSn { get; set; }
- ///// <summary>
- ///// 鏉＄爜瑙勫垯涓搴旂殑鍔ㄦ�佸瓧娈电殑鍊�
- ///// </summary>
- //[SugarColumn(ColumnName = "dynamic_data")]
- //public string DynamicData { get; set; }
+ ///// <summary>
+ ///// 鏉＄爜瑙勫垯涓搴旂殑鍔ㄦ�佸瓧娈电殑鍊�
+ ///// </summary>
+ //[SugarColumn(ColumnName = "dynamic_data")]
+ //public string DynamicData { get; set; }
- /// <summary>
- /// 鍖呰灞傜骇
- /// </summary>
- [SugarColumn(ColumnName = "pack_level")]
- public string PackLevel { get; set; }
+ /// <summary>
+ /// 鍖呰灞傜骇
+ /// </summary>
+ [SugarColumn(ColumnName = "pack_level")]
+ public string PackLevel { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "create_time")]
- public DateTime CreateTime { get; set; } = DateTime.Now;
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "create_time")]
+ public DateTime CreateTime { get; set; } = DateTime.Now;
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "update_time")]
- public DateTime UpdateTime { get; set; } = DateTime.Now;
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "update_time")]
+ public DateTime UpdateTime { get; set; } = DateTime.Now;
- /// <summary>
- /// 閫佽揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "delivery_no")]
- public string DeliveryNo { get; set; }
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "delivery_no")]
+ public string DeliveryNo { get; set; }
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "po_erp_no")]
- public string PoErpNo { get; set; }
+ /// <summary>
+ /// 閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "po_erp_no")]
+ public string PoErpNo { get; set; }
- /// <summary>
- /// 閫佽揣鍗曢」娆�
- /// </summary>
- [SugarColumn(ColumnName = "dnLines")]
- public string DnLines { get; set; }
+ /// <summary>
+ /// 閫佽揣鍗曢」娆�
+ /// </summary>
+ [SugarColumn(ColumnName = "dnLines")]
+ public string DnLines { get; set; }
- /// <summary>
- /// 璁㈠崟椤规(ERP)
- /// </summary>
- [SugarColumn(ColumnName = "po_line_no")]
- public string PoLineNo { get; set; }
+ /// <summary>
+ /// 璁㈠崟椤规(ERP)
+ /// </summary>
+ [SugarColumn(ColumnName = "po_line_no")]
+ public string PoLineNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "inner_vendor_code")]
- public string InnerVendorCode { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "inner_vendor_code")]
+ public string InnerVendorCode { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�1锛圶锛�
- /// </summary>
- [SugarColumn(ColumnName = "customize1")]
- public string Customize1 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�1锛圶锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "customize1")]
+ public string Customize1 { get; set; }
- /// <summary>
- /// 鍚屾鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
- public DateTime? SynchronousDate { get; set; }
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
+ public DateTime? SynchronousDate { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "customize2")]
- public string Customize2 { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "customize2")]
+ public string Customize2 { get; set; }
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- [SugarColumn(ColumnName = "customize3")]
- public string Customize3 { get; set; }
+ /// <summary>
+ /// 鏈夋晥鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "customize3")]
+ public string Customize3 { get; set; }
+ }
}
\ No newline at end of file
diff --git a/entity/VIpqcSj.cs b/entity/VIpqcSj.cs
index 3fcfe64..2ad38a3 100644
--- a/entity/VIpqcSj.cs
+++ b/entity/VIpqcSj.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
/// IPQC棣栨瑙嗗浘瀹炰綋绫�
diff --git a/entity/VIpqcXj.cs b/entity/VIpqcXj.cs
index 78ec838..e22fbd5 100644
--- a/entity/VIpqcXj.cs
+++ b/entity/VIpqcXj.cs
@@ -1,6 +1,6 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity;
+namespace MES.Service.Models;
/// <summary>
/// IPQC宸℃瑙嗗浘瀹炰綋绫�
@@ -165,7 +165,7 @@
public string lineId { get; set; }
/// <summary>
- /// 鏃堕棿娈�
+ /// 鏃堕棿娈�
/// </summary>
[SugarColumn(ColumnName = "check_time_slot")]
public string checkTimeSlot { get; set; }
diff --git a/entity/vDhmx.cs b/entity/vDhmx.cs
index c08302b..cf07c20 100644
--- a/entity/vDhmx.cs
+++ b/entity/vDhmx.cs
@@ -1,82 +1,83 @@
-锘縰sing SqlSugar;
-
-namespace NewPdaSqlServer.entity;
-
-/// <summary>
-/// 鍒拌揣妫�楠屾槑缁嗚鍥惧疄浣�
-/// </summary>
-[SugarTable("v_dhmx")]
-public class vDhmx
+锘縩amespace NewPdaSqlServer.entity
{
- /// <summary>
- /// 鐖剁骇GUID
- /// </summary>
- [SugarColumn(ColumnName = "hGuid")]
- public string ParentGuid { get; set; }
+ using SqlSugar;
/// <summary>
- /// 鏄庣粏GUID
+ /// 鍒拌揣妫�楠屾槑缁嗚鍥惧疄浣�
/// </summary>
- [SugarColumn(ColumnName = "dhmxGuid")]
- public string DetailGuid { get; set; }
+ [SugarTable("v_dhmx")]
+ public class vDhmx
+ {
+ /// <summary>
+ /// 鐖剁骇GUID
+ /// </summary>
+ [SugarColumn(ColumnName = "hGuid")]
+ public string ParentGuid { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "quantity")]
- public decimal Quantity { get; set; }
+ /// <summary>
+ /// 鏄庣粏GUID
+ /// </summary>
+ [SugarColumn(ColumnName = "dhmxGuid")]
+ public string DetailGuid { get; set; }
- /// <summary>
- /// 鍏嶆鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "鍏嶆")]
- public string ExemptInspection { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "quantity")]
+ public decimal Quantity { get; set; }
- /// <summary>
- /// 妫�楠岀姸鎬�
- /// </summary>
- [SugarColumn(ColumnName = "妫�楠岀姸鎬�")]
- public string InspectionStatus { get; set; }
+ /// <summary>
+ /// 鍏嶆鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "鍏嶆")]
+ public string ExemptInspection { get; set; }
- /// <summary>
- /// IQC鎻愪氦鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "iqc鎻愪氦")]
- public int IqcSubmission { get; set; }
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ [SugarColumn(ColumnName = "妫�楠岀姸鎬�")]
+ public string InspectionStatus { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "妫�楠岀粨鏋�")]
- public string InspectionResult { get; set; }
+ /// <summary>
+ /// IQC鎻愪氦鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "iqc鎻愪氦")]
+ public int IqcSubmission { get; set; }
- /// <summary>
- /// 鍒ゅ畾缁撴灉
- /// </summary>
- [SugarColumn(ColumnName = "鍒ゅ畾缁撴灉")]
- public string JudgmentResult { get; set; }
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "妫�楠岀粨鏋�")]
+ public string InspectionResult { get; set; }
- /// <summary>
- /// 澶勭悊鎰忚
- /// </summary>
- [SugarColumn(ColumnName = "澶勭悊鎰忚")]
- public string HandlingSuggestion { get; set; }
+ /// <summary>
+ /// 鍒ゅ畾缁撴灉
+ /// </summary>
+ [SugarColumn(ColumnName = "鍒ゅ畾缁撴灉")]
+ public string JudgmentResult { get; set; }
- /// <summary>
- /// 鎸戦�夋暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "鎸戦�夋暟閲�")]
- public decimal? SelectionQuantity { get; set; }
+ /// <summary>
+ /// 澶勭悊鎰忚
+ /// </summary>
+ [SugarColumn(ColumnName = "澶勭悊鎰忚")]
+ public string HandlingSuggestion { get; set; }
- /// <summary>
- /// 閫夊埆绫诲埆
- /// </summary>
- [SugarColumn(ColumnName = "閫夊埆绫诲埆")]
- public string SelectionType { get; set; }
+ /// <summary>
+ /// 鎸戦�夋暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "鎸戦�夋暟閲�")]
+ public decimal? SelectionQuantity { get; set; }
- /// <summary>
- /// 鏄惁鑳藉叆搴� (1:鑳藉叆搴� 0:涓嶈兘鍏ュ簱)
- /// </summary>
- [SugarColumn(ColumnName = "鏄惁鑳藉叆搴�")]
- public int CanStore { get; set; }
-}
\ No newline at end of file
+ /// <summary>
+ /// 閫夊埆绫诲埆
+ /// </summary>
+ [SugarColumn(ColumnName = "閫夊埆绫诲埆")]
+ public string SelectionType { get; set; }
+
+ /// <summary>
+ /// 鏄惁鑳藉叆搴� (1:鑳藉叆搴� 0:涓嶈兘鍏ュ簱)
+ /// </summary>
+ [SugarColumn(ColumnName = "鏄惁鑳藉叆搴�")]
+ public int CanStore { get; set; }
+ }
+}
diff --git a/service/JJGZ/OaToMesRecordManager.cs b/service/JJGZ/OaToMesRecordManager.cs
index 4aea974..8ddc4fa 100644
--- a/service/JJGZ/OaToMesRecordManager.cs
+++ b/service/JJGZ/OaToMesRecordManager.cs
@@ -1,271 +1,215 @@
-锘縰sing Microsoft.Data.SqlClient;
+锘縰sing Microsoft.AspNetCore.Mvc;
+using Microsoft.Data.SqlClient;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
-using NewPdaSqlServer.util;
+using System.Data;
-namespace NewPdaSqlServer.service.JJGZ;
-
-public class OaToMesRecordManager : Repository<OaToMesRecord>
+namespace NewPdaSqlServer.service.JJGZ
{
- public string ApproveRecord(OaToMesRecord record)
+ public class OaToMesRecordManager : Repository<OaToMesRecord>
{
- var _strMsg = "";
- if (record == null || record.dataJson == null ||
- record.dataJson.Count == 0)
- throw new Exception("dataJson涓嶈兘涓虹┖涓斿繀椤诲寘鍚嚦灏戜竴鏉¤褰�");
-
- var successCount = 0;
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ public string ApproveRecord(OaToMesRecord record)
{
- conn.Open();
- using (var tran = conn.BeginTransaction())
+ var _strMsg = "";
+ if (record == null || record.dataJson == null || record.dataJson.Count == 0)
+ throw new Exception("dataJson涓嶈兘涓虹┖涓斿繀椤诲寘鍚嚦灏戜竴鏉¤褰�");
+
+ int successCount = 0;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- try
+ conn.Open();
+ using (var tran = conn.BeginTransaction())
{
- foreach (var item in record.dataJson)
+ try
{
- // 鍙傛暟鏍￠獙澧炲己
- if (string.IsNullOrEmpty(item.StaffId))
- throw new Exception("鍛樺伐缂栧彿涓嶈兘涓虹┖");
- if (string.IsNullOrEmpty(item.LineNo))
- throw new Exception("浜х嚎涓嶈兘涓虹┖");
- if (string.IsNullOrEmpty(item.Classes))
- throw new Exception("鐝涓嶈兘涓虹┖");
- if (item.CheckTime == null)
- throw new Exception("鎵撳崱鏃ユ湡涓嶈兘涓虹┖");
-
- var sql =
- @"INSERT INTO MES_JJGZ_RECORD (GUID, Staff_Id, Staff_No, Staff_Name, Line_No, Line_Name, CheckTime, ScheNo,RecordDate,OrgId) VALUES (NEWID(), @StaffId, @StaffNo, @StaffName, @LineNo, @LineName, @CheckTime, @Classes, getdate(),@OrgId)";
- using (var cmd = new SqlCommand(sql, conn, tran))
+ foreach (var item in record.dataJson)
{
- cmd.Parameters.AddWithValue("@StaffId",
- item.StaffId ?? (object)DBNull.Value);
- cmd.Parameters.AddWithValue("@StaffNo",
- item.StaffNo ?? (object)DBNull.Value);
- cmd.Parameters.AddWithValue("@StaffName",
- item.StaffName ?? (object)DBNull.Value);
- cmd.Parameters.AddWithValue("@LineNo",
- item.LineNo ?? (object)DBNull.Value);
- cmd.Parameters.AddWithValue("@LineName",
- item.LineName ?? (object)DBNull.Value);
- cmd.Parameters.AddWithValue("@CheckTime",
- item.CheckTime ?? (object)DBNull.Value);
- cmd.Parameters.AddWithValue("@Classes",
- item.Classes ?? (object)DBNull.Value);
- cmd.Parameters.AddWithValue("@OrgId",
- item.OrgId ?? (object)DBNull.Value);
- var rows = cmd.ExecuteNonQuery();
- if (rows > 0) successCount++;
- }
- }
+ // 鍙傛暟鏍￠獙澧炲己
+ if (string.IsNullOrEmpty(item.StaffId)) throw new Exception("鍛樺伐缂栧彿涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(item.LineNo)) throw new Exception("浜х嚎涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(item.Classes)) throw new Exception("鐝涓嶈兘涓虹┖");
+ if (item.CheckTime == null) throw new Exception("鎵撳崱鏃ユ湡涓嶈兘涓虹┖");
- tran.Commit();
- return $"鎵归噺鎻掑叆MES_JJGZ_RECORD鎴愬姛锛佸叡鎻掑叆{successCount}鏉¤褰曘��";
+ var sql = @"INSERT INTO MES_JJGZ_RECORD (GUID, Staff_Id, Staff_No, Staff_Name, Line_No, Line_Name, CheckTime, ScheNo,RecordDate,OrgId) VALUES (NEWID(), @StaffId, @StaffNo, @StaffName, @LineNo, @LineName, @CheckTime, @Classes, getdate(),@OrgId)";
+ using (var cmd = new SqlCommand(sql, conn, tran))
+ {
+ cmd.Parameters.AddWithValue("@StaffId", item.StaffId ?? (object)DBNull.Value);
+ cmd.Parameters.AddWithValue("@StaffNo", item.StaffNo ?? (object)DBNull.Value);
+ cmd.Parameters.AddWithValue("@StaffName", item.StaffName ?? (object)DBNull.Value);
+ cmd.Parameters.AddWithValue("@LineNo", item.LineNo ?? (object)DBNull.Value);
+ cmd.Parameters.AddWithValue("@LineName", item.LineName ?? (object)DBNull.Value);
+ cmd.Parameters.AddWithValue("@CheckTime", item.CheckTime ?? (object)DBNull.Value);
+ cmd.Parameters.AddWithValue("@Classes", item.Classes ?? (object)DBNull.Value);
+ cmd.Parameters.AddWithValue("@OrgId", item.OrgId ?? (object)DBNull.Value);
+ int rows = cmd.ExecuteNonQuery();
+ if (rows > 0) successCount++;
+ }
+ }
+ tran.Commit();
+ return $"鎵归噺鎻掑叆MES_JJGZ_RECORD鎴愬姛锛佸叡鎻掑叆{successCount}鏉¤褰曘��";
+ }
+ catch (Exception ex)
+ {
+ tran.Rollback();
+ _strMsg = $"鎵归噺鎻掑叆MES_JJGZ_RECORD寮傚父锛歿ex.Message}";
+ throw new Exception(_strMsg);
+ }
+ finally
+ {
+ conn.Close();
+ }
}
- catch (Exception ex)
+ }
+ }
+
+ public string ApproveUser(OaToMesUser user)
+ {
+ var _strMsg = "";
+ if (user == null || user.dataJson == null || user.dataJson.Count == 0)
+ throw new Exception("dataJson涓嶈兘涓虹┖涓斿繀椤诲寘鍚嚦灏戜竴鏉¤褰�");
+
+ int insertCount = 0;
+ int updateCount = 0;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ conn.Open();
+ using (var tran = conn.BeginTransaction())
{
- tran.Rollback();
- _strMsg = $"鎵归噺鎻掑叆MES_JJGZ_RECORD寮傚父锛歿ex.Message}";
- throw new Exception(_strMsg);
+ try
+ {
+ foreach (var item in user.dataJson)
+ {
+ // 鍙傛暟鏍￠獙澧炲己
+ if (string.IsNullOrEmpty(item.Id)) throw new Exception("鐢ㄦ埛ID涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(item.Name)) throw new Exception("鐢ㄦ埛濮撳悕涓嶈兘涓虹┖");
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦�
+ var checkSql = @"SELECT COUNT(1) FROM OA_USER WHERE Id = @Id";
+ using (var checkCmd = new SqlCommand(checkSql, conn, tran))
+ {
+ checkCmd.Parameters.AddWithValue("@Id", item.Id);
+ var exists = (int)checkCmd.ExecuteScalar() > 0;
+
+ if (exists)
+ {
+ // 鏇存柊
+ var updateSql = @"UPDATE OA_USER SET NAME = @Name, JOBNUMBER = @Jobnumber, DEPARTMENT = @Department WHERE Id = @Id";
+ using (var updateCmd = new SqlCommand(updateSql, conn, tran))
+ {
+ updateCmd.Parameters.AddWithValue("@Id", item.Id);
+ updateCmd.Parameters.AddWithValue("@Name", item.Name ?? (object)DBNull.Value);
+ updateCmd.Parameters.AddWithValue("@Jobnumber", item.Jobnumber ?? (object)DBNull.Value);
+ updateCmd.Parameters.AddWithValue("@Department", item.Department ?? (object)DBNull.Value);
+ int rows = updateCmd.ExecuteNonQuery();
+ if (rows > 0) updateCount++;
+ }
+ }
+ else
+ {
+ // 鎻掑叆
+ var insertSql = @"INSERT INTO OA_USER (Id, NAME, JOBNUMBER, DEPARTMENT) VALUES (@Id, @Name, @Jobnumber, @Department)";
+ using (var insertCmd = new SqlCommand(insertSql, conn, tran))
+ {
+ insertCmd.Parameters.AddWithValue("@Id", item.Id);
+ insertCmd.Parameters.AddWithValue("@Name", item.Name ?? (object)DBNull.Value);
+ insertCmd.Parameters.AddWithValue("@Jobnumber", item.Jobnumber ?? (object)DBNull.Value);
+ insertCmd.Parameters.AddWithValue("@Department", item.Department ?? (object)DBNull.Value);
+ int rows = insertCmd.ExecuteNonQuery();
+ if (rows > 0) insertCount++;
+ }
+ }
+ }
+ }
+ tran.Commit();
+ return $"鐢ㄦ埛鏁版嵁鍚屾鎴愬姛锛佹彃鍏insertCount}鏉★紝鏇存柊{updateCount}鏉¤褰曘��";
+ }
+ catch (Exception ex)
+ {
+ tran.Rollback();
+ _strMsg = $"鐢ㄦ埛鏁版嵁鍚屾寮傚父锛歿ex.Message}";
+ throw new Exception(_strMsg);
+ }
+ finally
+ {
+ conn.Close();
+ }
}
- finally
+ }
+ }
+
+ public string ApproveDepartment(OaToMesDepartment department)
+ {
+ var _strMsg = "";
+ if (department == null || department.dataJson == null || department.dataJson.Count == 0)
+ throw new Exception("dataJson涓嶈兘涓虹┖涓斿繀椤诲寘鍚嚦灏戜竴鏉¤褰�");
+
+ int insertCount = 0;
+ int updateCount = 0;
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ conn.Open();
+ using (var tran = conn.BeginTransaction())
{
- conn.Close();
+ try
+ {
+ foreach (var item in department.dataJson)
+ {
+ // 鍙傛暟鏍￠獙澧炲己
+ if (string.IsNullOrEmpty(item.Id)) throw new Exception("閮ㄩ棬ID涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(item.Name)) throw new Exception("閮ㄩ棬鍚嶇О涓嶈兘涓虹┖");
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦�
+ var checkSql = @"SELECT COUNT(1) FROM OA_DEPARTMENT WHERE id = @Id";
+ using (var checkCmd = new SqlCommand(checkSql, conn, tran))
+ {
+ checkCmd.Parameters.AddWithValue("@Id", item.Id);
+ var exists = (int)checkCmd.ExecuteScalar() > 0;
+
+ if (exists)
+ {
+ // 鏇存柊
+ var updateSql = @"UPDATE OA_DEPARTMENT SET name = @Name, Parentid = @Parentid, OrgId = @OrgId WHERE Id = @Id";
+ using (var updateCmd = new SqlCommand(updateSql, conn, tran))
+ {
+ updateCmd.Parameters.AddWithValue("@Id", item.Id);
+ updateCmd.Parameters.AddWithValue("@Name", item.Name ?? (object)DBNull.Value);
+ updateCmd.Parameters.AddWithValue("@Parentid", item.Parentid ?? (object)DBNull.Value);
+ updateCmd.Parameters.AddWithValue("@OrgId", item.OrgId ?? (object)DBNull.Value);
+ int rows = updateCmd.ExecuteNonQuery();
+ if (rows > 0) updateCount++;
+ }
+ }
+ else
+ {
+ // 鎻掑叆
+ var insertSql = @"INSERT INTO OA_DEPARTMENT (id, name, Parentid, OrgId) VALUES (@Id, @Name, @Parentid, @OrgId)";
+ using (var insertCmd = new SqlCommand(insertSql, conn, tran))
+ {
+ insertCmd.Parameters.AddWithValue("@Id", item.Id);
+ insertCmd.Parameters.AddWithValue("@Name", item.Name ?? (object)DBNull.Value);
+ insertCmd.Parameters.AddWithValue("@Parentid", item.Parentid ?? (object)DBNull.Value);
+ insertCmd.Parameters.AddWithValue("@OrgId", item.OrgId ?? (object)DBNull.Value);
+ int rows = insertCmd.ExecuteNonQuery();
+ if (rows > 0) insertCount++;
+ }
+ }
+ }
+ }
+ tran.Commit();
+ return $"閮ㄩ棬鏁版嵁鍚屾鎴愬姛锛佹彃鍏insertCount}鏉★紝鏇存柊{updateCount}鏉¤褰曘��";
+ }
+ catch (Exception ex)
+ {
+ tran.Rollback();
+ _strMsg = $"閮ㄩ棬鏁版嵁鍚屾寮傚父锛歿ex.Message}";
+ throw new Exception(_strMsg);
+ }
+ finally
+ {
+ conn.Close();
+ }
}
}
}
}
-
- public string ApproveUser(OaToMesUser user)
- {
- var _strMsg = "";
- if (user == null || user.dataJson == null || user.dataJson.Count == 0)
- throw new Exception("dataJson涓嶈兘涓虹┖涓斿繀椤诲寘鍚嚦灏戜竴鏉¤褰�");
-
- var insertCount = 0;
- var updateCount = 0;
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
- {
- conn.Open();
- using (var tran = conn.BeginTransaction())
- {
- try
- {
- foreach (var item in user.dataJson)
- {
- // 鍙傛暟鏍￠獙澧炲己
- if (string.IsNullOrEmpty(item.Id))
- throw new Exception("鐢ㄦ埛ID涓嶈兘涓虹┖");
- if (string.IsNullOrEmpty(item.Name))
- throw new Exception("鐢ㄦ埛濮撳悕涓嶈兘涓虹┖");
-
- // 妫�鏌ユ槸鍚﹀瓨鍦�
- var checkSql =
- @"SELECT COUNT(1) FROM OA_USER WHERE Id = @Id";
- using (var checkCmd =
- new SqlCommand(checkSql, conn, tran))
- {
- checkCmd.Parameters.AddWithValue("@Id", item.Id);
- var exists = (int)checkCmd.ExecuteScalar() > 0;
-
- if (exists)
- {
- // 鏇存柊
- var updateSql =
- @"UPDATE OA_USER SET NAME = @Name, JOBNUMBER = @Jobnumber, DEPARTMENT = @Department WHERE Id = @Id";
- using (var updateCmd =
- new SqlCommand(updateSql, conn, tran))
- {
- updateCmd.Parameters.AddWithValue("@Id",
- item.Id);
- updateCmd.Parameters.AddWithValue("@Name",
- item.Name ?? (object)DBNull.Value);
- updateCmd.Parameters.AddWithValue(
- "@Jobnumber",
- item.Jobnumber ?? (object)DBNull.Value);
- updateCmd.Parameters.AddWithValue(
- "@Department",
- item.Department ??
- (object)DBNull.Value);
- var rows = updateCmd.ExecuteNonQuery();
- if (rows > 0) updateCount++;
- }
- }
- else
- {
- // 鎻掑叆
- var insertSql =
- @"INSERT INTO OA_USER (Id, NAME, JOBNUMBER, DEPARTMENT) VALUES (@Id, @Name, @Jobnumber, @Department)";
- using (var insertCmd =
- new SqlCommand(insertSql, conn, tran))
- {
- insertCmd.Parameters.AddWithValue("@Id",
- item.Id);
- insertCmd.Parameters.AddWithValue("@Name",
- item.Name ?? (object)DBNull.Value);
- insertCmd.Parameters.AddWithValue(
- "@Jobnumber",
- item.Jobnumber ?? (object)DBNull.Value);
- insertCmd.Parameters.AddWithValue(
- "@Department",
- item.Department ??
- (object)DBNull.Value);
- var rows = insertCmd.ExecuteNonQuery();
- if (rows > 0) insertCount++;
- }
- }
- }
- }
-
- tran.Commit();
- return $"鐢ㄦ埛鏁版嵁鍚屾鎴愬姛锛佹彃鍏insertCount}鏉★紝鏇存柊{updateCount}鏉¤褰曘��";
- }
- catch (Exception ex)
- {
- tran.Rollback();
- _strMsg = $"鐢ㄦ埛鏁版嵁鍚屾寮傚父锛歿ex.Message}";
- throw new Exception(_strMsg);
- }
- finally
- {
- conn.Close();
- }
- }
- }
- }
-
- public string ApproveDepartment(OaToMesDepartment department)
- {
- var _strMsg = "";
- if (department == null || department.dataJson == null ||
- department.dataJson.Count == 0)
- throw new Exception("dataJson涓嶈兘涓虹┖涓斿繀椤诲寘鍚嚦灏戜竴鏉¤褰�");
-
- var insertCount = 0;
- var updateCount = 0;
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
- {
- conn.Open();
- using (var tran = conn.BeginTransaction())
- {
- try
- {
- foreach (var item in department.dataJson)
- {
- // 鍙傛暟鏍￠獙澧炲己
- if (string.IsNullOrEmpty(item.Id))
- throw new Exception("閮ㄩ棬ID涓嶈兘涓虹┖");
- if (string.IsNullOrEmpty(item.Name))
- throw new Exception("閮ㄩ棬鍚嶇О涓嶈兘涓虹┖");
-
- // 妫�鏌ユ槸鍚﹀瓨鍦�
- var checkSql =
- @"SELECT COUNT(1) FROM OA_DEPARTMENT WHERE id = @Id";
- using (var checkCmd =
- new SqlCommand(checkSql, conn, tran))
- {
- checkCmd.Parameters.AddWithValue("@Id", item.Id);
- var exists = (int)checkCmd.ExecuteScalar() > 0;
-
- if (exists)
- {
- // 鏇存柊
- var updateSql =
- @"UPDATE OA_DEPARTMENT SET name = @Name, Parentid = @Parentid, OrgId = @OrgId WHERE Id = @Id";
- using (var updateCmd =
- new SqlCommand(updateSql, conn, tran))
- {
- updateCmd.Parameters.AddWithValue("@Id",
- item.Id);
- updateCmd.Parameters.AddWithValue("@Name",
- item.Name ?? (object)DBNull.Value);
- updateCmd.Parameters.AddWithValue(
- "@Parentid",
- item.Parentid ?? (object)DBNull.Value);
- updateCmd.Parameters.AddWithValue("@OrgId",
- item.OrgId ?? (object)DBNull.Value);
- var rows = updateCmd.ExecuteNonQuery();
- if (rows > 0) updateCount++;
- }
- }
- else
- {
- // 鎻掑叆
- var insertSql =
- @"INSERT INTO OA_DEPARTMENT (id, name, Parentid, OrgId) VALUES (@Id, @Name, @Parentid, @OrgId)";
- using (var insertCmd =
- new SqlCommand(insertSql, conn, tran))
- {
- insertCmd.Parameters.AddWithValue("@Id",
- item.Id);
- insertCmd.Parameters.AddWithValue("@Name",
- item.Name ?? (object)DBNull.Value);
- insertCmd.Parameters.AddWithValue(
- "@Parentid",
- item.Parentid ?? (object)DBNull.Value);
- insertCmd.Parameters.AddWithValue("@OrgId",
- item.OrgId ?? (object)DBNull.Value);
- var rows = insertCmd.ExecuteNonQuery();
- if (rows > 0) insertCount++;
- }
- }
- }
- }
-
- tran.Commit();
- return $"閮ㄩ棬鏁版嵁鍚屾鎴愬姛锛佹彃鍏insertCount}鏉★紝鏇存柊{updateCount}鏉¤褰曘��";
- }
- catch (Exception ex)
- {
- tran.Rollback();
- _strMsg = $"閮ㄩ棬鏁版嵁鍚屾寮傚父锛歿ex.Message}";
- throw new Exception(_strMsg);
- }
- finally
- {
- conn.Close();
- }
- }
- }
- }
-}
\ No newline at end of file
+}
diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs
index b93e5f6..df1c963 100644
--- a/service/QC/IpqcService.cs
+++ b/service/QC/IpqcService.cs
@@ -1,12 +1,13 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Text;
+锘縰sing MES.Service.Models;
using Microsoft.IdentityModel.Tokens;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
-using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Text;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.QC;
@@ -31,11 +32,11 @@
a.ItemName.Contains(queryObj.keyword) ||
a.Daa001.Contains(queryObj.keyword) ||
a.ReleaseNo.Contains(queryObj.keyword) ||
- a.DepartmentName.Contains(queryObj.keyword) ||
- a.XtName.Contains(queryObj.keyword)
+ a.DepartmentName.Contains(queryObj.keyword )||
+ a.XtName.Contains(queryObj.keyword)
)
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
- a => a.Guid == parsedGuid.ToString())
+ a => a.Guid == parsedGuid.ToString() )
.Where(a => (a.FSubmit ?? 0) == 0)
.OrderByDescending(a => a.CreateDate)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -48,8 +49,7 @@
{
var parsedGuid = Guid.Empty;
- var sql = string.Format(
- @"SELECT [a].[guid] AS [Guid],
+ var sql = string.Format(@"SELECT [a].[guid] AS [Guid],
[a].[parent_guid] AS [ParentGuid],
[a].[release_no] AS [ReleaseNo],
[a].[check_qyt] AS [CheckQyt],
@@ -91,6 +91,9 @@
public (List<VIpqcXj> item, int TotalCount) getPageXj(XJPageResult queryObj)
{
+
+
+
var totalCount = 0;
var parsedGuid = Guid.Empty;
if (!queryObj.id.IsNullOrEmpty())
@@ -100,8 +103,7 @@
throw new ApplicationException("GUID杞崲閿欒");
}
- var sql =
- string.Format(@"EXEC prc_pda_ipqc_GetXjList '{0}'", parsedGuid);
+ var sql = string.Format(@"EXEC prc_pda_ipqc_GetXjList '{0}'", parsedGuid);
var pageList = Db.Ado.SqlQuery<VIpqcXj>(sql).ToList();
@@ -112,13 +114,11 @@
//鏇存柊涓嶅悎鏍兼弿杩�
public int updateIpqcRzxx(dynamic dto)
{
- if (dto == null)
- throw new ArgumentNullException(nameof(dto), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (dto == null) throw new ArgumentNullException(nameof(dto), "鍙傛暟瀵硅薄涓嶈兘涓� null");
if (string.IsNullOrEmpty(dto.pid?.ToString()))
throw new ArgumentException("椤圭洰鏄庣粏id瀛樺湪闂锛岃鑱旂郴绠＄悊鍛橈紒", nameof(dto.pid));
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@inRzxxValue", dto.inRzxxValue),
new("@pid", dto.pid)
};
@@ -139,13 +139,12 @@
throw new ArgumentException("鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖", nameof(query.userAccount));
if (string.IsNullOrEmpty(query.inOrderGuid1?.ToString()))
- throw new ArgumentException("妫�楠屽崟GUID涓嶈兘涓虹┖",
- nameof(query.inOrderGuid1));
+ throw new ArgumentException("妫�楠屽崟GUID涓嶈兘涓虹┖", nameof(query.inOrderGuid1));
- if (string.IsNullOrEmpty(query.DAA001?.ToString()))
- throw new ArgumentException("宸ュ崟鍙蜂笉鑳戒负绌�", nameof(query.inOrderGuid1));
+ if (string.IsNullOrEmpty(query.DAA001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍙蜂笉鑳戒负绌�", nameof(query.inOrderGuid1));
- var _strMsg = "";
+ var _strMsg = "";
var _status = -1;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
@@ -156,22 +155,15 @@
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@po_outMsg", SqlDbType.NVarChar, 150)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output },
- new("@pi_user", SqlDbType.NVarChar, 150)
- { Value = query.userAccount },
- new("@pi_OrderGuid1", SqlDbType.UniqueIdentifier)
- { Value = Guid.Parse(query.inOrderGuid1.ToString()) },
- new("@pi_DAA001", SqlDbType.NVarChar, 150)
- { Value = query.DAA001.ToString() },
- new("@pi_inP1", SqlDbType.NVarChar, 20)
- { Value = query.pi_inP1 ?? DBNull.Value },
- new("@pi_inP2", SqlDbType.NVarChar, 20)
- { Value = query.pi_inP2 ?? DBNull.Value }
+ new("@po_outMsg", SqlDbType.NVarChar, 150) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new("@pi_user", SqlDbType.NVarChar, 150) { Value = query.userAccount },
+ new("@pi_OrderGuid1", SqlDbType.UniqueIdentifier) { Value = Guid.Parse(query.inOrderGuid1.ToString()) },
+ new("@pi_DAA001", SqlDbType.NVarChar, 150) { Value = query.DAA001.ToString() },
+ new("@pi_inP1", SqlDbType.NVarChar, 20) { Value = query.pi_inP1 ?? DBNull.Value },
+ new("@pi_inP2", SqlDbType.NVarChar, 20) { Value = query.pi_inP2 ?? DBNull.Value }
};
cmd.Parameters.AddRange(parameters);
@@ -182,7 +174,7 @@
if (_status <= 0) throw new Exception(_strMsg);
- return new
+ return new
{
message = _strMsg,
status = _status
@@ -195,11 +187,9 @@
}
}
- public int UpdateTableConfig(string selectedWater, string selectedFlow,
- string tableData, string mxguid)
+ public int UpdateTableConfig(string selectedWater, string selectedFlow, string tableData, string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@selectedWater", selectedWater),
new("@selectedFlow", selectedFlow),
new("@tableData", tableData),
@@ -217,8 +207,7 @@
public dynamic GetTableConfig(string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@mxguid", mxguid)
};
@@ -227,7 +216,7 @@
WHERE guid = @mxguid";
var result = Db.Ado.SqlQuery<dynamic>(sql, sqlParams).FirstOrDefault();
-
+
if (result == null)
throw new Exception("閰嶇疆淇℃伅鏌ヨ缁撴灉涓虹┖");
@@ -236,8 +225,7 @@
public List<dynamic> GetRzxxList(string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@mxguid", mxguid)
};
@@ -254,7 +242,7 @@
)";
var result = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
-
+
if (result == null || result.Count == 0)
throw new Exception("鏈壘鍒扮浉鍏宠璇佷俊鎭�");
@@ -263,8 +251,7 @@
public int UpdateScDate(string scDateValue, string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@scDateValue", scDateValue),
new("@mxguid", mxguid)
};
@@ -278,8 +265,7 @@
public int UpdateRzxxNum(string ipqcrzxxNum, string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@ipqcrzxxNum", ipqcrzxxNum),
new("@mxguid", mxguid)
};
@@ -293,8 +279,7 @@
public int UpdateCpscs(string ipqCpscs, string mxguid)
{
- var sqlParams = new List<SugarParameter>
- {
+ var sqlParams = new List<SugarParameter> {
new("@ipqCpscs", ipqCpscs),
new("@mxguid", mxguid)
};
@@ -309,7 +294,8 @@
public dynamic GetIpqcXjDaa(dynamic unity)
{
- var sqlParams = new List<SugarParameter>();
+
+ var sqlParams = new List<SugarParameter> { };
sqlParams.Add(new("@xt", unity.xt));
var sql2 = new StringBuilder(@"
@@ -327,7 +313,10 @@
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (XcslItem == null) throw new Exception("璇ユ潯浠朵笅鏃犲搴斿伐鍗曚俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+ if (XcslItem == null)
+ {
+ throw new Exception("璇ユ潯浠朵笅鏃犲搴斿伐鍗曚俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+ }
return XcslItem;
}
@@ -341,8 +330,7 @@
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
if (string.IsNullOrEmpty(query.inOrderGuid1?.ToString()))
- throw new ArgumentException("妫�楠屽崟涓昏〃GUID涓嶅厑璁镐负绌�",
- nameof(query.inOrderGuid1));
+ throw new ArgumentException("妫�楠屽崟涓昏〃GUID涓嶅厑璁镐负绌�", nameof(query.inOrderGuid1));
var _strMsg = "";
var _status = -1;
@@ -355,17 +343,13 @@
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
new("@pi_gw", SqlDbType.NVarChar, 100) { Value = query.gw },
- new("@pi_QaGuid1", SqlDbType.NVarChar, 100)
- { Value = query.inOrderGuid1 },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_QaGuid1", SqlDbType.NVarChar, 100) { Value = query.inOrderGuid1 },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -376,12 +360,12 @@
if (_status <= 0) throw new Exception(_strMsg);
- return new
+ return new
{
message = _strMsg,
status = _status,
qaGuid = query.inOrderGuid1,
- query.gw
+ gw = query.gw
};
}
catch (Exception ex)
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index 55ca00f..5d687f7 100644
--- a/service/QC/LljService.cs
+++ b/service/QC/LljService.cs
@@ -1,9 +1,12 @@
-锘縰sing Microsoft.IdentityModel.Tokens;
+锘縰sing MES.Service.Models;
+using Microsoft.IdentityModel.Tokens;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using static Azure.Core.HttpHeader;
namespace NewPdaSqlServer.service.QC;
@@ -32,15 +35,16 @@
// StringUtil.IsNotNullOrEmpty(queryObj.result) &&
// !"鏈畬鎴�".Equals(queryObj.result),
// a => (a.STATUS ?? "") == "宸叉彁浜�")
+
.WhereIF(!string.IsNullOrWhiteSpace(queryObj.keyword), a =>
a.ItemNo.Contains(queryObj.keyword) ||
a.ItemName.Contains(queryObj.keyword) ||
a.LotNo.Contains(queryObj.keyword) ||
a.ReleaseNo.Contains(queryObj.keyword) ||
- a.SuppName.Contains(queryObj.keyword)
+ a.SuppName.Contains(queryObj.keyword)
)
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
- a => a.guid == parsedGuid)
+ a => a.guid == parsedGuid )
.Where(a => (a.fsubmit ?? 0) == 0)
.OrderByDescending(a => a.CreateDate)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -60,8 +64,8 @@
var mesQaIqcItem = Db
.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemId == itemId && s.FTYPE == "1").Select(b =>
- new MesQaItemsDetectDetail5
+ && s.ItemId == itemId && s.FTYPE == "1").Select(
+ b => new MesQaItemsDetectDetail5
{
ReleaseNo = releaseNo,
FacLevel = b.FacLevel,
@@ -233,6 +237,7 @@
var Ybsl_In = Db.Ado.SqlQuery<MesQaItemsDetectDetail5>(sql).ToList();
return Ybsl_In;
+
}
public int SetQSItemDetail(MesQaItemsDetectDetail12 detail)
@@ -253,8 +258,7 @@
result.Add(item);
}
- return db.Insertable(result).PageSize(1).IgnoreColumnsNull()
- .ExecuteCommand();
+ return db.Insertable(result).PageSize(1).IgnoreColumnsNull().ExecuteCommand();
});
detail.CreateBy = detail.LastupdateBy;
@@ -299,21 +303,19 @@
// result = "涓嶅悎鏍�";
else if (noCount >= QsItemOqcItem.FreQty)
result = "涓嶅悎鏍�";
- var useTransactionWithOracle = UseTransaction(db =>
- {
- var commit = 0;
- commit += db.Updateable<MesQaItemsDetectDetail5>()
- .SetColumns(s => s.FcheckResu == result)
- .SetColumns(s => s.FenterQty == count)
- .SetColumns(s => s.FngRate == (s.CheckQyt == 0
- ? null
- : (decimal?)(Convert.ToDouble(noCount) /
- Convert.ToDouble(count))))
- .Where(s => s.Guid == detail.ParentGuid)
- .ExecuteCommand();
+ var useTransactionWithOracle = UseTransaction(
+ db =>
+ {
+ var commit = 0;
+ commit += db.Updateable<MesQaItemsDetectDetail5>()
+ .SetColumns(s => s.FcheckResu == result)
+ .SetColumns(s => s.FenterQty == count)
+ .SetColumns(s => s.FngRate == (s.CheckQyt == 0 ? (decimal?)null : (decimal?)(Convert.ToDouble(noCount) / Convert.ToDouble(count))))
+ .Where(s => s.Guid == detail.ParentGuid)
+ .ExecuteCommand();
- return commit;
- });
+ return commit;
+ });
var isNull = Db.Queryable<MesQaItemsDetectDetail5>()
.Where(s => s.Guid == detail.ParentGuid && s.FcheckResu == null)
@@ -638,8 +640,8 @@
.ExecuteCommand();
var first = db
- .Queryable<MesInvItemArnDetail, MesInvItemArn>((b, a) =>
- new object[]
+ .Queryable<MesInvItemArnDetail, MesInvItemArn>(
+ (b, a) => new object[]
{
JoinType.Left, b.ParentGuid == a.Guid
})
@@ -668,8 +670,8 @@
executeCommand += db.Updateable<MesInvItemArnDetail>()
.SetColumns(s => s.CheckStates == "涓嶅悎鏍煎緟瀹℃壒")
.SetColumns(s => s.Ischeck == 1)
- .SetColumns(s =>
- s.CheckRes == mesQaItemsDetect01.FcheckResu)
+ .SetColumns(
+ s => s.CheckRes == mesQaItemsDetect01.FcheckResu)
.SetColumns(s => s.CheckDate == DateTime.Now)
.Where(s => s.ParentGuid == mesInvItemArn.Guid
&& s.ItemId == mesQaItemsDetect01.ItemId)
@@ -704,12 +706,13 @@
}
+
//鍒犻櫎鐗瑰緛鍊�
public int deleteDetail13(LLJDto dto)
{
var withOracle = Db.Deleteable<MesQaItemsDetectDetail13>()
- .Where(s => s.Guid.ToString() == dto.id13)
- .ExecuteCommand();
+ .Where(s => s.Guid.ToString() == dto.id13)
+ .ExecuteCommand();
return withOracle;
}
@@ -718,9 +721,9 @@
public int updateRemarks(LLJDto dto)
{
var withOracle = Db.Updateable<MesQaItemsDetect01>()
- .SetColumns(s => s.FngDesc == dto.Remarks)
- .Where(s => s.Guid.ToString() == dto.gid)
- .ExecuteCommand();
+ .SetColumns(s => s.FngDesc == dto.Remarks)
+ .Where(s => s.Guid.ToString() == dto.gid)
+ .ExecuteCommand();
return withOracle;
}
diff --git a/service/QC/OAJyService.cs b/service/QC/OAJyService.cs
index d9fd9e3..c7fb134 100644
--- a/service/QC/OAJyService.cs
+++ b/service/QC/OAJyService.cs
@@ -1,8 +1,21 @@
-锘縰sing System.Net;
+锘縰sing MES.Service.Models;
+using Microsoft.IdentityModel.Tokens;
+using NewPdaSqlServer.Controllers;
+using NewPdaSqlServer.DB;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
+using NewPdaSqlServer.util;
+using Newtonsoft.Json;
+using SqlSugar;
+using System.Net;
using System.Security.Cryptography;
using System.Text;
-using NewPdaSqlServer.DB;
-using Newtonsoft.Json;
+using static Azure.Core.HttpHeader;
+using System.Security.Cryptography;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Security;
@@ -10,30 +23,65 @@
public class OAJyService : RepositoryNoEntity
{
+ private readonly HttpClient _client = new HttpClient();
+
private const string APPID = "303233EF-AC39-40C1-8364-AC989C6258A5";
-
private const string SECRET = "30b41949-bcfb-48f8-9847-feb6e043fe72";
-
// private const string SPK = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
private const string HOST = "http://192.168.1.149:8099";
- private const string SPK =
- @"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
+ private const string SPK = @"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApobID/gwmD9OofMG1gEcE94NCMeTYUq1cam/7ADZmxHCVpF143GaHWhqDdY0TTVbcUElsQ71DzAG2j3itWlIJBK5fVGwCo3sPpAvUDdKMh+Uivcp7yxdy/IDRA/PS4JARuEyM4cVJLhIOU2KnSlbIkheeoDkDgfaxu9kKrWnozJLiYraVTVDz9PdRX7fQdP+Zu/xB9txAGw4kvOm9HwgrzaSRdZEhisTJ5yyoNW/dLXtWKXA0cKhKOOIFu12TOrv/It6hl1ShTUuy79Pa51M9Oc2dEfVs1tluNXPWo1uFXQbBaJxdqZEJJlK7iW2uQFIao2O4XFHYThwy2+6116LtwIDAQAB";
- private readonly HttpClient _client = new();
+
+ public static class RsaHelper
+ {
+ public static string Encrypt(string plainText, string publicKeyPem)
+ {
+ //// 灏哖EM鏍煎紡鐨勫叕閽ヨ浆鎹负XML鏍煎紡
+ //var rsa = RSA.Create();
+ //rsa.ImportFromPem(publicKeyPem); // 浣跨敤.NET 5+ 鍐呯疆PEM瑙ｆ瀽鏂规硶
+
+ //var parameters = rsa.ExportParameters(false);
+ //string publicKeyXml = $"<RSAKeyValue><Modulus>{Convert.ToBase64String(parameters.Modulus)}</Modulus><Exponent>{Convert.ToBase64String(parameters.Exponent)}</Exponent></RSAKeyValue>";
+
+ //using var rsaProvider = new RSACryptoServiceProvider();
+ //rsaProvider.FromXmlString(publicKeyXml); // 浣跨敤杞崲鍚庣殑XML鏍煎紡鍏挜
+
+ //var data = Encoding.UTF8.GetBytes(plainText);
+ //var encrypted = rsaProvider.Encrypt(data, false);
+ //return Convert.ToBase64String(encrypted);
+
+ RsaKeyParameters publicKeyParam = (RsaKeyParameters)PublicKeyFactory.CreateKey(Convert.FromBase64String(publicKeyPem));
+ string XML = string.Format("<RSAKeyValue><Modulus>{0}</Modulus><Exponent>{1}</Exponent></RSAKeyValue>",
+ Convert.ToBase64String(publicKeyParam.Modulus.ToByteArrayUnsigned()),
+ Convert.ToBase64String(publicKeyParam.Exponent.ToByteArrayUnsigned()));
+ string encryptedContent = string.Empty;
+ using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+ {
+ rsa.FromXmlString(XML);
+ byte[] encryptedData = rsa.Encrypt(Encoding.Default.GetBytes(plainText), false);
+ encryptedContent = Convert.ToBase64String(encryptedData);
+ }
+ return encryptedContent;
+ }
+ }
public string PostDataSSL(string url,
- Dictionary<string, string> parameters,
- Dictionary<string, string> headers)
+ Dictionary<string, string> parameters,
+ Dictionary<string, string> headers)
{
var request = new HttpRequestMessage(HttpMethod.Post, url);
foreach (var header in headers)
+ {
request.Headers.Add(header.Key, header.Value);
+ }
// 濡傛灉闇�瑕佽〃鍗曞弬鏁�
if (parameters.Count > 0)
+ {
request.Content = new FormUrlEncodedContent(parameters);
+ }
var response = _client.SendAsync(request).Result;
return response.Content.ReadAsStringAsync().Result;
@@ -41,6 +89,7 @@
public string GetToken()
{
+
var userId = "1268";
var encryptedUserId = RsaHelper.Encrypt(userId, SPK);
;
@@ -59,9 +108,11 @@
if (!string.IsNullOrEmpty(response))
{
var res = JsonConvert.DeserializeObject<dynamic>(response);
- if (res.status == "true") return res.token.ToString();
+ if (res.status == "true")
+ {
+ return res.token.ToString();
+ }
}
-
return "token涓嶅瓨鍦紒";
}
catch (Exception ex)
@@ -141,8 +192,7 @@
try
{
// 鍙傛暟鏍￠獙
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
//if (query.workflowId == null) throw new ArgumentException("workflowId涓嶈兘涓虹┖");
//if (query.mainData == null) throw new ArgumentException("mainData涓嶈兘涓虹┖");
@@ -158,47 +208,46 @@
// detailDataDict = ((IEnumerable<KeyValuePair<string, object>>)query.detailData)
// .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
//}
-
+
// 鍔犲瘑澶勭悊
var userId = "1268";
var encryptedUserId = RsaHelper.Encrypt(userId, SPK);
- var strToken = GetToken();
+ string strToken = GetToken();
// 鏇挎崲鍘熸湁鐨勬祴mainDataDict璇曟暟鎹瀯寤�
mainDataDict = BuildMainDataFromQuery(query);
-
+
// 璋冪敤鏂规硶澧炲姞userid璇锋眰澶�
var result = SubmitWorkflowRequest(
- strToken,
- 379,
- mainDataDict,
+ token: strToken,
+ workflowId: 379,
+ mainData: mainDataDict,
requestName: "MES->OA娴嬭瘯娴佺▼鏍囬",
- otherParams: null,
- remark: "Test",
- requestLevel: "",
- encryptedUserId: encryptedUserId // 鏂板鍙傛暟
+ otherParams:null,
+ remark:"Test",
+ requestLevel:"",
+ encryptedUserId: encryptedUserId // 鏂板鍙傛暟
);
return result;
}
catch (Exception ex)
{
// 鏇磋缁嗙殑閿欒澶勭悊
- return new
- {
+ return new {
status = -1,
- message = $"瀹屾暣閿欒淇℃伅锛歿ex}" // 鏄剧ず瀹屾暣鍫嗘爤
+ message = $"瀹屾暣閿欒淇℃伅锛歿ex.ToString()}" // 鏄剧ず瀹屾暣鍫嗘爤
};
}
}
// 淇敼鏂规硶绛惧悕
public dynamic SubmitWorkflowRequest(
- string token,
+ string token,
int workflowId,
Dictionary<string, object> mainData,
- string encryptedUserId, // 鐢ㄦ埛id
+ string encryptedUserId, // 鐢ㄦ埛id
Dictionary<string, object> detailData = null,
Dictionary<string, object> otherParams = null,
string remark = "",
@@ -207,22 +256,19 @@
{
try
{
- ServicePointManager.ServerCertificateValidationCallback +=
- (s, cert, chain, sslPolicyErrors) => true;
+ ServicePointManager.ServerCertificateValidationCallback += (s, cert, chain, sslPolicyErrors) => true;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
var url = new Uri($"{HOST}/api/workflow/paService/doCreateRequest");
var request = WebRequest.Create(url) as HttpWebRequest;
request.Method = "POST";
request.Timeout = 20000;
- request.ContentType =
- "application/x-www-form-urlencoded"; // 淇敼涓篔SON鏍煎紡
+ request.ContentType = "application/x-www-form-urlencoded"; // 淇敼涓篔SON鏍煎紡
// 鏋勫缓璇锋眰澶�
request.Headers.Set("appid", APPID);
request.Headers.Set("token", token);
- request.Headers.Set("Content-Type",
- "application/x-www-form-urlencoded");
+ request.Headers.Set("Content-Type", "application/x-www-form-urlencoded");
request.Headers.Set("userId", encryptedUserId);
// 鍋囪闇�瑕佸姞瀵嗙殑userid浠庡叾浠栧湴鏂硅幏鍙栵紝杩欓噷闇�瑕佽ˉ鍏呰幏鍙栭�昏緫
@@ -231,11 +277,9 @@
{
//["userId"] = "1268",
["workflowId"] = workflowId,
- ["mainData"] =
- new List<Dictionary<string, object>> { mainData }, // 鍖呰鎴愭暟缁�
+ ["mainData"] = new List<Dictionary<string, object>> { mainData }, // 鍖呰鎴愭暟缁�
["detailData"] = null,
- ["otherParams"] =
- otherParams ?? new Dictionary<string, object>(),
+ ["otherParams"] = otherParams ?? new Dictionary<string, object>(),
["remark"] = remark,
["requestLevel"] = requestLevel,
["requestName"] = requestName
@@ -243,7 +287,7 @@
// 搴忓垪鍖栬姹備綋
var jsonBody = JsonConvert.SerializeObject(requestBody);
- var byteData = Encoding.UTF8.GetBytes(jsonBody);
+ byte[] byteData = Encoding.UTF8.GetBytes(jsonBody);
// 鍙戦�佽姹�
using (var stream = request.GetRequestStream())
@@ -258,19 +302,19 @@
using (var reader = new StreamReader(stream, Encoding.UTF8))
{
var responseJson = reader.ReadToEnd();
- var result =
- JsonConvert.DeserializeObject<dynamic>(responseJson);
-
+ var result = JsonConvert.DeserializeObject<dynamic>(responseJson);
+
// 娣诲姞鐘舵�佺爜妫�鏌�
- if (response.StatusCode != HttpStatusCode.OK ||
- result.code != "SUCCESS")
+ if (response.StatusCode != HttpStatusCode.OK || result.code != "SUCCESS")
+ {
throw new Exception($"娴佺▼鎻愪氦澶辫触锛歿result.errMsg}");
-
+ }
+
return new
{
- result.code,
- result.data,
- result.errMsg
+ code = result.code,
+ data = result.data,
+ errMsg = result.errMsg
};
}
}
@@ -281,8 +325,7 @@
using (var reader = new StreamReader(stream))
{
var errorDetails = reader.ReadToEnd();
- throw new Exception(
- $"璇锋眰澶辫触 [Status: {response.StatusCode}]: {errorDetails}");
+ throw new Exception($"璇锋眰澶辫触 [Status: {response.StatusCode}]: {errorDetails}");
}
}
catch (Exception ex)
@@ -299,93 +342,32 @@
{
// 琛ㄧ粨鏋勫畾涔�
["tableDBName"] = "formtable_main_33",
- ["workflowRequestTableRecords"] =
- new List<Dictionary<string, object>>
+ ["workflowRequestTableRecords"] = new List<Dictionary<string, object>>
+ {
+ new Dictionary<string, object>
{
- new()
+ ["recordOrder"] = 0,
+ ["workflowRequestTableFields"] = new List<Dictionary<string, object>>
{
- ["recordOrder"] = 0,
- ["workflowRequestTableFields"] =
- new List<Dictionary<string, object>>
- {
- new()
- {
- ["fieldName"] = "wlbm",
- ["fieldValue"] = "1.01.01.001"
- },
- new()
- {
- ["fieldName"] = "khgys",
- ["fieldValue"] = "闄堥洩骞�"
- },
- new()
- {
- ["fieldName"] = "jzmcwlmc",
- ["fieldValue"] = "椤剁洊"
- },
- new()
- {
- ["fieldName"] = "bhgpqxms",
- ["fieldValue"] = "澶栬涓嶅悎鏍硷紝灏哄涓嶅悎鏍硷紝棰滆壊涓嶇鍚�"
- },
- new()
- {
- ["fieldName"] = "dhdhmes",
- ["fieldValue"] = "MES001"
- }
- }
+ new Dictionary<string, object> { ["fieldName"] = "wlbm", ["fieldValue"] = "1.01.01.001" },
+ new Dictionary<string, object> { ["fieldName"] = "khgys", ["fieldValue"] = "闄堥洩骞�" },
+ new Dictionary<string, object> { ["fieldName"] = "jzmcwlmc", ["fieldValue"] = "椤剁洊" },
+ new Dictionary<string, object> { ["fieldName"] = "bhgpqxms", ["fieldValue"] = "澶栬涓嶅悎鏍硷紝灏哄涓嶅悎鏍硷紝棰滆壊涓嶇鍚�" },
+ new Dictionary<string, object> { ["fieldName"] = "dhdhmes", ["fieldValue"] = "MES001" }
}
}
+ }
};
return mainData;
}
// 杈呭姪鏂规硶鐢ㄤ簬瀹夊叏娣诲姞灞炴��
- private void TryAddProperty(Dictionary<string, object> dict, string key,
- object value)
+ private void TryAddProperty(Dictionary<string, object> dict, string key, object value)
{
- if (value != null) dict[key] = value;
- }
-
-
- public static class RsaHelper
- {
- public static string Encrypt(string plainText, string publicKeyPem)
+ if (value != null)
{
- //// 灏哖EM鏍煎紡鐨勫叕閽ヨ浆鎹负XML鏍煎紡
- //var rsa = RSA.Create();
- //rsa.ImportFromPem(publicKeyPem); // 浣跨敤.NET 5+ 鍐呯疆PEM瑙ｆ瀽鏂规硶
-
- //var parameters = rsa.ExportParameters(false);
- //string publicKeyXml = $"<RSAKeyValue><Modulus>{Convert.ToBase64String(parameters.Modulus)}</Modulus><Exponent>{Convert.ToBase64String(parameters.Exponent)}</Exponent></RSAKeyValue>";
-
- //using var rsaProvider = new RSACryptoServiceProvider();
- //rsaProvider.FromXmlString(publicKeyXml); // 浣跨敤杞崲鍚庣殑XML鏍煎紡鍏挜
-
- //var data = Encoding.UTF8.GetBytes(plainText);
- //var encrypted = rsaProvider.Encrypt(data, false);
- //return Convert.ToBase64String(encrypted);
-
- var publicKeyParam =
- (RsaKeyParameters)PublicKeyFactory.CreateKey(
- Convert.FromBase64String(publicKeyPem));
- var XML = string.Format(
- "<RSAKeyValue><Modulus>{0}</Modulus><Exponent>{1}</Exponent></RSAKeyValue>",
- Convert.ToBase64String(publicKeyParam.Modulus
- .ToByteArrayUnsigned()),
- Convert.ToBase64String(publicKeyParam.Exponent
- .ToByteArrayUnsigned()));
- var encryptedContent = string.Empty;
- using (var rsa = new RSACryptoServiceProvider())
- {
- rsa.FromXmlString(XML);
- var encryptedData =
- rsa.Encrypt(Encoding.Default.GetBytes(plainText), false);
- encryptedContent = Convert.ToBase64String(encryptedData);
- }
-
- return encryptedContent;
+ dict[key] = value;
}
}
}
\ No newline at end of file
diff --git a/service/QC/OaApi.cs b/service/QC/OaApi.cs
index 1c063ce..632f099 100644
--- a/service/QC/OaApi.cs
+++ b/service/QC/OaApi.cs
@@ -1,33 +1,35 @@
// OaApiService.cs
-
-using System.Data;
-using System.Data.SqlClient;
+using System;
+using System.Collections.Generic;
using System.Dynamic;
-using System.Net.Http.Headers;
+using System.Data.SqlClient;
+using System.Data;
+using System.IO;
+using System.Net.Http;
using System.Security.Cryptography;
using System.Text;
-using NewPdaSqlServer.DB;
-using NewPdaSqlServer.util;
+using System.Threading.Tasks;
+using NewPdaSqlServer.entity.Base;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Security;
-
-namespace NewPdaSqlServer.service.QC;
+using NewPdaSqlServer.DB;
+using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using NewPdaSqlServer.entity;
+using System.Linq;
public class OaApiService : Repository<dynamic>
{
+ private readonly HttpClient _httpClient;
//private const string AppId = "303233EF-AC39-40C1-8364-AC989C6258A5";
//private const string BaseUrl = "http://192.168.1.149:8099/api/ec/dev/auth/";
//private const string WorkflowUrl = "http://192.168.1.149:8099/api/workflow/paService/doCreateRequest";
private const string AppId = "AB7F0461-89C3-4EAD-B5B5-B7D540617921";
private const string BaseUrl = "http://192.168.1.20:80/api/ec/dev/auth/";
-
- private const string WorkflowUrl =
- "http://192.168.1.20:80/api/workflow/paService/doCreateRequest";
-
- private readonly HttpClient _httpClient;
+ private const string WorkflowUrl = "http://192.168.1.20:80/api/workflow/paService/doCreateRequest";
public OaApiService()
{
@@ -35,13 +37,11 @@
_httpClient.Timeout = TimeSpan.FromSeconds(30);
}
- public dynamic SubmitIQCToOA(dynamic queryObj)
+ public dynamic SubmitIQCToOA(dynamic queryObj)
{
// 淇敼鍙傛暟楠岃瘉瀛楁鍚�
- if (string.IsNullOrEmpty(queryObj.userId.ToString()))
- throw new Exception("鐢ㄦ埛id涓嶅厑璁镐负绌�");
- if (string.IsNullOrEmpty(queryObj.qcczdGuid.ToString()))
- throw new Exception("寮傚父澶勭疆鍗昳d涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(queryObj.userId.ToString())) throw new Exception("鐢ㄦ埛id涓嶅厑璁镐负绌�");
+ if (string.IsNullOrEmpty(queryObj.qcczdGuid.ToString())) throw new Exception("寮傚父澶勭疆鍗昳d涓嶈兘涓虹┖");
//if (queryObj.qcczdGuid.IsNullOrEmpty()) throw new Exception("寮傚父澶勭疆鍗昳d涓嶈兘涓虹┖"); // 鍘熷弬鏁板悕涓� qcczdGuid
try
@@ -51,30 +51,31 @@
//var query = JObject.FromObject(queryObj);
// 1. 娉ㄥ唽鑾峰彇鍑瘉
- var registResult = GetRegistAsync();
+ var registResult = GetRegistAsync();
var secret = registResult["secrit"].ToString();
var spk = registResult["spk"].ToString();
// 2. 鑾峰彇璁块棶浠ょ墝
- var tokenResult = ApplyTokenAsync(secret, spk);
+ var tokenResult = ApplyTokenAsync(secret, spk);
var token = tokenResult["token"].ToString();
- var oaUserId = "";
+ string oaUserId = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("select_oa_userid", conn))
{
+
try
{
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- cmd.Parameters.Add(
- new SqlParameter("@guid", SqlDbType.VarChar, 100)
- { Value = queryObj.qcczdGuid.ToString() });
+ cmd.Parameters.Add(new SqlParameter("@guid", SqlDbType.VarChar, 100) { Value = queryObj.qcczdGuid.ToString() });
using (var reader = cmd.ExecuteReader())
{
if (reader.Read())
+ {
oaUserId = reader["result"]?.ToString();
+ }
}
}
catch (Exception logEx)
@@ -92,8 +93,7 @@
_httpClient.DefaultRequestHeaders.Clear();
_httpClient.DefaultRequestHeaders.Add("token", token);
_httpClient.DefaultRequestHeaders.Add("appid", AppId);
- _httpClient.DefaultRequestHeaders.Add("userid",
- RSAEncrypt(oaUserId, spk));
+ _httpClient.DefaultRequestHeaders.Add("userid", RSAEncrypt(oaUserId, spk));
// 4. 鏋勫缓璇锋眰浣�
var requestData = BuildRequestData(queryObj);
@@ -112,34 +112,20 @@
{
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] logParams =
+ SqlParameter[] logParams =
{
- new("@edtUserGuid", SqlDbType.UniqueIdentifier)
- {
- Value = Guid.Parse(queryObj.userId.ToString())
- },
- new("@abtGuid", SqlDbType.UniqueIdentifier)
- {
- Value = Guid.Parse(
- queryObj.qcczdGuid.ToString())
- },
- new("@abtTable", SqlDbType.NVarChar, 40)
- { Value = "Mes_QC_Exceptional" },
- new("@detail", SqlDbType.NVarChar, 2500)
- { Value = "鎻愪氦IQC鍒癘A绯荤粺" },
+ new("@edtUserGuid", SqlDbType.UniqueIdentifier) { Value = Guid.Parse(queryObj.userId.ToString()) },
+ new("@abtGuid", SqlDbType.UniqueIdentifier) { Value = Guid.Parse(queryObj.qcczdGuid.ToString()) },
+ new("@abtTable", SqlDbType.NVarChar, 40) { Value = "Mes_QC_Exceptional" },
+ new("@detail", SqlDbType.NVarChar, 2500) { Value = "鎻愪氦IQC鍒癘A绯荤粺" },
new("@hNo", SqlDbType.NVarChar, 100) { Value = "" },
- new("@SendJson", SqlDbType.NVarChar)
- {
- Value = JObject.FromObject(requestData)
- .ToString()
- },
- new("@RtnJson", SqlDbType.NVarChar)
- { Value = response.Content.ToString() }
+ new("@SendJson", SqlDbType.NVarChar) { Value = JObject.FromObject(requestData).ToString() },
+ new("@RtnJson", SqlDbType.NVarChar) { Value = response.Content.ToString() }
};
-
+
foreach (var param in logParams)
cmd.Parameters.Add(param);
-
+
cmd.ExecuteNonQuery();
}
catch (Exception logEx)
@@ -164,7 +150,7 @@
checkDate = GETDATE(),
checkBy = (select top 1 u.[ACCOUNT] from [dbo].[SYS_USER] u where u.guid = @edtUserCode)
WHERE GUID = @inOrderGuid";
-
+
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand(updateSql, conn))
@@ -173,10 +159,8 @@
{
conn.Open();
//cmd.Parameters.AddWithValue("@dt", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
- cmd.Parameters.AddWithValue("@edtUserCode",
- queryObj.userId?.ToString());
- cmd.Parameters.AddWithValue("@inOrderGuid",
- queryObj.qcczdGuid?.ToString());
+ cmd.Parameters.AddWithValue("@edtUserCode", queryObj.userId?.ToString());
+ cmd.Parameters.AddWithValue("@inOrderGuid", queryObj.qcczdGuid?.ToString());
cmd.ExecuteNonQuery();
}
catch (Exception updateEx)
@@ -191,13 +175,14 @@
}
}
- return result; // 鐩存帴瑙ｆ瀽涓篔Object
+ return result; // 鐩存帴瑙ｆ瀽涓篔Object
+
}
catch (Exception ex)
{
dynamic error = new ExpandoObject();
- error.code = "SYSTEM_INNER_ERROR"; // 鏂板鏍囧噯閿欒鐮�
- error.errMsg = ex.Message; // 淇瀛楁鍚嶅尮閰嶈鑼�
+ error.code = "SYSTEM_INNER_ERROR"; // 鏂板鏍囧噯閿欒鐮�
+ error.errMsg = ex.Message; // 淇瀛楁鍚嶅尮閰嶈鑼�
error.data = new JObject();
error.reqFailMsg = new JObject();
return error;
@@ -209,11 +194,11 @@
// 浠巕uery鍙傛暟涓幏鍙栧疄闄呬笟鍔℃暟鎹�
return new Dictionary<string, object>
{
- { "mainData", BuildMainData(queryObj) },
- { "requestName", $"IQC寮傚父澶勭疆鍗曟祦绋�-{DateTime.Now:yyyyMMddHHmmss}" },
- { "workflowId", "602" }, //娴嬭瘯锛�379 姝ｅ紡锛�600->602
+ {"mainData", BuildMainData(queryObj)},
+ {"requestName", $"IQC寮傚父澶勭疆鍗曟祦绋�-{DateTime.Now:yyyyMMddHHmmss}"},
+ {"workflowId", "602"},//娴嬭瘯锛�379 姝ｅ紡锛�600->602
//{"otherParams", BuildOtherParams()},
- { "detailData", BuildDetailData(queryObj) }
+ {"detailData", BuildDetailData(queryObj)}
};
}
@@ -222,45 +207,45 @@
var attachments = new JArray();
foreach (var file in files ?? Enumerable.Empty<dynamic>())
+ {
attachments.Add(new JObject
{
// 淇瀛楁鍚嶇О鍖归厤鏍囧噯鏍煎紡
["filePath"] = file.url?.ToString() ?? string.Empty,
["fileName"] = file.FileName?.ToString() ?? "鏈懡鍚嶆枃浠�"
});
+ }
return attachments;
}
-
private JArray BuildMainData(dynamic queryObj)
{
// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
const string mainSql = @"EXEC select_oa_BuildMainData @guid";
- var mainData =
- Db.Ado.SqlQuery<dynamic>(mainSql,
- new { guid = queryObj.qcczdGuid });
+ var mainData = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
// 鏇寸簿纭殑鏁版嵁瀛樺湪鎬ф鏌�
if (mainData == null || !mainData.Any())
+ {
throw new Exception($"鏈壘鍒板紓甯稿缃崟[{queryObj.qcczdGuid}]鐩稿叧鏁版嵁");
+ }
var firstRecord = mainData.First();
// 瀛楁鏄犲皠閰嶇疆锛堝瓧娈靛悕 -> 鏁版嵁搴撳垪鍚嶏級
- var fieldMappings =
- new Dictionary<string, (string Field, string Default)>
- {
- ["sqr"] = ("sqr", "0"), // 榛樿鍊兼敼涓烘暟瀛�
- ["sqrq"] = ("sqrq", ""), // 绌哄瓧绗︿覆鐢ㄤ簬鏃ユ湡鏍煎紡鍖�
- ["szbm"] = ("szbm", "0"), // 榛樿鍊兼敼涓烘暟瀛�
- ["szdw"] = ("szdw", "0"), // 榛樿鍊兼敼涓烘暟瀛�
- ["ycczdh"] = ("ycczdh", "N/A"),
- ["lh"] = ("lh", "N/A"),
- ["khgys"] = ("khgys", "N/A"),
- ["jzmcwlmc"] = ("jzmcwlmc", "N/A"),
- ["dhdhtxt"] = ("dhdhtxt", "N/A"),
- ["bhgpqxms"] = ("bhgpqxms", "鏃犵己闄锋弿杩�")
- };
+ var fieldMappings = new Dictionary<string, (string Field, string Default)>
+ {
+ ["sqr"] = ("sqr", "0"), // 榛樿鍊兼敼涓烘暟瀛�
+ ["sqrq"] = ("sqrq", ""), // 绌哄瓧绗︿覆鐢ㄤ簬鏃ユ湡鏍煎紡鍖�
+ ["szbm"] = ("szbm", "0"), // 榛樿鍊兼敼涓烘暟瀛�
+ ["szdw"] = ("szdw", "0"), // 榛樿鍊兼敼涓烘暟瀛�
+ ["ycczdh"] = ("ycczdh", "N/A"),
+ ["lh"] = ("lh", "N/A"),
+ ["khgys"] = ("khgys", "N/A"),
+ ["jzmcwlmc"] = ("jzmcwlmc", "N/A"),
+ ["dhdhtxt"] = ("dhdhtxt", "N/A"),
+ ["bhgpqxms"] = ("bhgpqxms", "鏃犵己闄锋弿杩�")
+ };
// 鍔ㄦ�佺敓鎴愬瓧娈甸泦鍚�
var result = new JArray();
@@ -268,19 +253,13 @@
{
var value = mapping.Key switch
{
- "sqr" or "szbm" or "szdw" =>
- int.TryParse(
- GetDynamicValue(firstRecord, mapping.Value.Field,
- mapping.Value.Default), out int num)
- ? num
- : 0,
- "sqrq" => DateTime.TryParse(
- GetDynamicValue(firstRecord, mapping.Value.Field, ""),
- out DateTime date)
- ? date.ToString("yyyy-MM-dd")
+ "sqr" or "szbm" or "szdw" =>
+ int.TryParse(GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default), out int num)
+ ? num : 0,
+ "sqrq" => DateTime.TryParse(GetDynamicValue(firstRecord, mapping.Value.Field, ""), out DateTime date)
+ ? date.ToString("yyyy-MM-dd")
: DateTime.Now.ToString("yyyy-MM-dd"),
- _ => GetDynamicValue(firstRecord, mapping.Value.Field,
- mapping.Value.Default)
+ _ => GetDynamicValue(firstRecord, mapping.Value.Field, mapping.Value.Default)
};
result.Add(new JObject
{
@@ -299,9 +278,7 @@
RIGHT JOIN MES_FILE C ON C.parent_Guid = B.guid
WHERE pGuid = @guid";
- var fileData =
- Db.Ado.SqlQuery<dynamic>(fileSql,
- new { guid = queryObj.qcczdGuid });
+ var fileData = Db.Ado.SqlQuery<dynamic>(fileSql, new { guid = queryObj.qcczdGuid });
var files = fileData.Count > 0 ? CreateFileData(fileData) : null; // 鏂板
// 娣诲姞鏂囦欢瀛楁
@@ -315,13 +292,11 @@
}
// 杈呭姪鏂规硶锛氬畨鍏ㄨ幏鍙杁ynamic瀵硅薄鍊�
- private static string GetDynamicValue(dynamic record, string field,
- string defaultValue)
+ private static string GetDynamicValue(dynamic record, string field, string defaultValue)
{
try
{
- return ((IDictionary<string, object>)record)[field]?.ToString() ??
- defaultValue;
+ return ((IDictionary<string, object>)record)[field]?.ToString() ?? defaultValue;
}
catch
{
@@ -418,33 +393,33 @@
var array = new JArray();
if (attachments != null)
+ {
foreach (var att in attachments)
+ {
array.Add(new JObject
{
["filePath"] = att["url"]?.ToString(),
["fileName"] = att["fileName"]?.ToString()
});
-
+ }
+ }
return array;
}
private JArray BuildDetailData(dynamic queryObj)
{
// 浣跨敤鍙傛暟鍖栨煡璇㈣幏鍙栨槑缁嗘暟鎹�
- const string mainSql =
- @"select ROW_NUMBER() over (ORDER BY Jy_Date) AS xh,releaseNo AS jydh, Jy_Date AS jydrq, batchQty as sjsl,
+ const string mainSql = @"select ROW_NUMBER() over (ORDER BY Jy_Date) AS xh,releaseNo AS jydh, Jy_Date AS jydrq, batchQty as sjsl,
chouQty AS cys, badQty AS bls, badProb AS bll,C.USER_NAME AS jyr
from Mes_QC_Exceptional_Detail A
LEFT JOIN MES_QA_ITEMS_DETECT_01 B ON A.releaseNo = B.release_no
LEFT JOIN SYS_USER C ON C.ACCOUNT = B.fcheck_by
WHERE pGuid = @guid";
-
- var details =
- Db.Ado.SqlQuery<dynamic>(mainSql,
- new { guid = queryObj.qcczdGuid });
-
+
+ var details = Db.Ado.SqlQuery<dynamic>(mainSql, new { guid = queryObj.qcczdGuid });
+
var tableRecords = new JArray();
-
+
// 閬嶅巻姣忔潯鏄庣粏鏁版嵁
foreach (var record in details ?? Enumerable.Empty<dynamic>())
{
@@ -452,58 +427,35 @@
var fields = new JArray
{
//new JObject { ["fieldName"] = "xh", ["fieldValue"] = record.xh?.ToString() ?? "" },
- new JObject
- {
- ["fieldName"] = "jydh",
- ["fieldValue"] = record.jydh?.ToString() ?? ""
- },
- new JObject
- {
- ["fieldName"] = "jyr",
- ["fieldValue"] = record.jyr?.ToString() ?? ""
- },
- new JObject
- {
- ["fieldName"] = "jydrq",
+ new JObject { ["fieldName"] = "jydh", ["fieldValue"] = record.jydh?.ToString() ?? "" },
+ new JObject { ["fieldName"] = "jyr", ["fieldValue"] = record.jyr?.ToString() ?? "" },
+ new JObject {
+ ["fieldName"] = "jydrq",
// 鏍煎紡鍖栦负"yyyy-MM-dd"瀛楃涓�
- ["fieldValue"] = record.jydrq != null
- ? Convert.ToDateTime(record.jydrq)
- .ToString("yyyy-MM-dd ")
- : DateTime.Now.ToString("yyyy-MM-dd")
+ ["fieldValue"] = (record.jydrq != null
+ ? Convert.ToDateTime(record.jydrq).ToString("yyyy-MM-dd ")
+ : DateTime.Now.ToString("yyyy-MM-dd"))
},
// 鏁板�煎瓧娈典繚鎸佹暟瀛楃被鍨嬭�岄潪瀛楃涓�
// 淇鏁板�肩被鍨嬭浆鎹㈡柟寮�
- new JObject
- {
- ["fieldName"] = "sjsl",
- ["fieldValue"] = (float)(record.sjsl ?? 0m)
- },
- new JObject
- {
- ["fieldName"] = "cys",
- ["fieldValue"] = (float)(record.cys ?? 0)
- },
- new JObject
- {
- ["fieldName"] = "bls",
- ["fieldValue"] = (float)(record.bls ?? 0)
- },
- new JObject { ["fieldName"] = "bll", ["fieldValue"] = 1 }
+ new JObject { ["fieldName"] = "sjsl", ["fieldValue"] = (float)(record.sjsl ?? 0m) },
+ new JObject { ["fieldName"] = "cys", ["fieldValue"] = (float)(record.cys ?? 0) },
+ new JObject { ["fieldName"] = "bls", ["fieldValue"] = (float)(record.bls ?? 0) },
+ new JObject { ["fieldName"] = "bll", ["fieldValue"] = 1, }
};
-
+
tableRecords.Add(new JObject
{
- ["recordOrder"] = 0, // 瀹為檯涓氬姟涓彲鑳介渶瑕佹牴鎹鍙疯缃�
+ ["recordOrder"] = 0, // 瀹為檯涓氬姟涓彲鑳介渶瑕佹牴鎹鍙疯缃�
["workflowRequestTableFields"] = fields
});
}
-
+
return new JArray
{
new JObject
{
- ["tableDBName"] =
- "formtable_main_321_dt1", //娴嬭瘯锛歠ormtable_main_33_dt1
+ ["tableDBName"] = "formtable_main_321_dt1",//娴嬭瘯锛歠ormtable_main_33_dt1
["workflowRequestTableRecords"] = tableRecords
}
};
@@ -518,7 +470,7 @@
};
}
- private JObject GetRegistAsync()
+ private JObject GetRegistAsync()
{
using var rsa = new RSACryptoServiceProvider(2048);
var cpk = Convert.ToBase64String(rsa.ExportRSAPublicKey());
@@ -535,11 +487,9 @@
{
_httpClient.DefaultRequestHeaders.Clear();
_httpClient.DefaultRequestHeaders.Add("appid", AppId);
- _httpClient.DefaultRequestHeaders.Add("secret",
- RSAEncrypt(secret, spk));
+ _httpClient.DefaultRequestHeaders.Add("secret", RSAEncrypt(secret, spk));
- var response =
- _httpClient.PostAsync(BaseUrl + "applytoken", null).Result;
+ var response = _httpClient.PostAsync(BaseUrl + "applytoken", null).Result;
return JObject.Parse(response.Content.ReadAsStringAsync().Result);
}
@@ -551,24 +501,17 @@
//var dataBytes = Encoding.UTF8.GetBytes(data);
//var encrypted = rsa.Encrypt(dataBytes, RSAEncryptionPadding.Pkcs1);
//return Convert.ToBase64String(encrypted);
- var publicKeyParam =
- (RsaKeyParameters)PublicKeyFactory.CreateKey(
- Convert.FromBase64String(publicKey));
- var XML = string.Format(
- "<RSAKeyValue><Modulus>{0}</Modulus><Exponent>{1}</Exponent></RSAKeyValue>",
- Convert.ToBase64String(publicKeyParam.Modulus
- .ToByteArrayUnsigned()),
- Convert.ToBase64String(
- publicKeyParam.Exponent.ToByteArrayUnsigned()));
- var encryptedContent = string.Empty;
- using (var rsa = new RSACryptoServiceProvider())
+ RsaKeyParameters publicKeyParam = (RsaKeyParameters)PublicKeyFactory.CreateKey(Convert.FromBase64String(publicKey));
+ string XML = string.Format("<RSAKeyValue><Modulus>{0}</Modulus><Exponent>{1}</Exponent></RSAKeyValue>",
+ Convert.ToBase64String(publicKeyParam.Modulus.ToByteArrayUnsigned()),
+ Convert.ToBase64String(publicKeyParam.Exponent.ToByteArrayUnsigned()));
+ string encryptedContent = string.Empty;
+ using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
{
rsa.FromXmlString(XML);
- var encryptedData =
- rsa.Encrypt(Encoding.Default.GetBytes(data), false);
+ byte[] encryptedData = rsa.Encrypt(Encoding.Default.GetBytes(data), false);
encryptedContent = Convert.ToBase64String(encryptedData);
}
-
return encryptedContent;
}
@@ -577,13 +520,12 @@
// 鏀圭敤FormUrlEncodedContent骞舵纭缃瓹ontent-Type
var formData = new List<KeyValuePair<string, string>>();
foreach (var item in data)
- formData.Add(
- new KeyValuePair<string, string>(item.Key,
- item.Value.ToString()));
+ {
+ formData.Add(new KeyValuePair<string, string>(item.Key, item.Value.ToString()));
+ }
var content = new FormUrlEncodedContent(formData);
- content.Headers.ContentType =
- new MediaTypeHeaderValue("application/x-www-form-urlencoded");
+ content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/x-www-form-urlencoded");
var response = _httpClient.PostAsync(url, content).Result;
var responseString = response.Content.ReadAsStringAsync().Result;
@@ -598,8 +540,7 @@
};
// 璋冭瘯杈撳嚭瀹屾暣鍝嶅簲淇℃伅
- Console.WriteLine(
- $"瀹屾暣鍝嶅簲锛歕n{responseInfo.ToString(Formatting.Indented)}");
+ Console.WriteLine($"瀹屾暣鍝嶅簲锛歕n{responseInfo.ToString(Formatting.Indented)}");
return responseInfo;
}
@@ -608,4 +549,4 @@
{
_httpClient?.Dispose();
}
-}
\ No newline at end of file
+}
diff --git a/service/Warehouse/InventoryManager.cs b/service/Warehouse/InventoryManager.cs
index 776dcf3..3fe3ff5 100644
--- a/service/Warehouse/InventoryManager.cs
+++ b/service/Warehouse/InventoryManager.cs
@@ -1,12 +1,15 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Text;
-using NewPdaSqlServer.DB;
+锘縰sing NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using System.Dynamic;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -61,10 +64,7 @@
))
.Where((a, b) => a.DepotSectionCode == p_section_code)
.Select((a, b) => new
- {
- a.DepotSectionName, b.DepotCode, b.DepotName, b.DepotId,
- b.FSubsidiary
- })
+ { a.DepotSectionName, b.DepotCode, b.DepotName, b.DepotId,b.FSubsidiary })
.Single();
// 濡傛灉搴撲綅浠ｇ爜涓嶅瓨鍦紝鍒欒繑鍥為敊璇俊鎭�
@@ -102,17 +102,17 @@
var wmsManager = new WmsBaseMangeer();
// 鏂板鍏ュ簱鏍￠獙锛堣皟鐢ㄥ瓨鍌ㄨ繃绋嬶級
var checkResult = wmsManager.pdaInvJY(
- Db,
- query.userName,
- p_item_barcode,
- p_section_code,
- depotSection.DepotId.ToString(),
- depotSection.FSubsidiary,
- "", // 鏍规嵁瀹為檯鍗曟嵁鍙蜂紶鍊�
- "601" // 浜嬪姟绫诲瀷涓庡瓨鍌ㄨ繃绋嬪尮閰�
+ db: Db,
+ edtUserNo: query.userName,
+ barcode: p_item_barcode,
+ sectionCode: p_section_code,
+ stockId: depotSection.DepotId.ToString(),
+ stockOrgId: depotSection.FSubsidiary,
+ billNo: "", // 鏍规嵁瀹為檯鍗曟嵁鍙蜂紶鍊�
+ transactionNo: "601" // 浜嬪姟绫诲瀷涓庡瓨鍌ㄨ繃绋嬪尮閰�
);
-
- if (Convert.ToInt32(checkResult.result) < 1)
+
+ if ( Convert.ToInt32(checkResult.result) < 1)
throw new Exception($"鍏ュ簱鏍￠獙澶辫触锛歿checkResult.strMsg}");
UseTransaction(db =>
@@ -150,14 +150,15 @@
SuppId = c_mes_inv_item_barcodes.SuppId,
SuppNo = c_mes_inv_item_barcodes.SuppNo,
UrgentFlag = c_mes_inv_item_barcodes.UrgentFlag == null
- ? null
+ ?
+ null
: c_mes_inv_item_barcodes.UrgentFlag.Value
? "1"
: "0",
CbillNo = c_mes_inv_item_barcodes.BillNo,
Fstatus = 0,
ReceiveOrgId = depotSection.FSubsidiary,
- InType = "鏈熷垵鍏ュ簱"
+ InType = "鏈熷垵鍏ュ簱",
};
db.Insertable(newMesInvItemIns)
.IgnoreColumns(true)
@@ -198,7 +199,7 @@
BoardStyle = c_mes_inv_item_barcodes.BoardStyle,
TaskNo = c_mes_inv_item_barcodes.TaskNo,
ItemId = c_mes_inv_item_barcodes.ItemId,
- ReceiveOrgId = depotSection.FSubsidiary
+ ReceiveOrgId = depotSection.FSubsidiary,
}).IgnoreColumns(true).ExecuteCommand();
@@ -254,7 +255,7 @@
SuppNo = c_mes_inv_item_barcodes.SuppNo,
ItemId = c_mes_inv_item_barcodes.ItemId,
IndepUserCode = c_user,
- StockOrgId = depotSection.FSubsidiary
+ StockOrgId = depotSection.FSubsidiary,
// Fsubsidiary = c_organize
}).IgnoreColumns(true).ExecuteCommand();
@@ -277,12 +278,11 @@
public dynamic GetDepoptsInfo(dynamic unity)
{
- //// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter>
- { new("@sectionCode", unity.sectionCode) };
- var sql2 =
- @" SELECT TOP 1 B.depot_code + '('+B.depot_name+')' depotsInfo,
+ //// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter> { new("@sectionCode", unity.sectionCode) };
+
+ var sql2 = @" SELECT TOP 1 B.depot_code + '('+B.depot_name+')' depotsInfo,
B.FSubsidiary,
C.FNumber + '('+C.NAME+')' orgInfo
FROM MES_DEPOT_SECTIONS A
@@ -291,16 +291,17 @@
LEFT JOIN SYS_ORGANIZATION C ON C.FID = B.FSubsidiary
WHERE a.depot_section_code = @sectionCode;";
- var XcslItem =
- Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).FirstOrDefault();
+ var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).FirstOrDefault();
// 妫�鏌ョ粨鏋滄湁鏁堟��
if (XcslItem == null)
- throw new Exception(
- $"搴撲綅 [{unity.sectionCode}] 涓嶅瓨鍦紝鎴栨墍灞炰粨搴撶姸鎬佸紓甯革紙鍙兘琚鐢ㄦ垨鍒犻櫎锛夈��");
+ {
+ throw new Exception($"搴撲綅 [{unity.sectionCode}] 涓嶅瓨鍦紝鎴栨墍灞炰粨搴撶姸鎬佸紓甯革紙鍙兘琚鐢ㄦ垨鍒犻櫎锛夈��");
+ }
return XcslItem; // 杩斿洖绗竴琛屾暟鎹紝濡傛灉娌℃湁鍒欒繑鍥� null
}
+
public dynamic GetItemsList(dynamic unity)
@@ -323,7 +324,10 @@
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (XcslItem == null) throw new Exception("璇ユ潯浠朵笅鏃犲搴旂墿鏂欎俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+ if (XcslItem == null)
+ {
+ throw new Exception("璇ユ潯浠朵笅鏃犲搴旂墿鏂欎俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+ }
return XcslItem;
}
@@ -348,15 +352,11 @@
cmd.CommandType = CommandType.StoredProcedure;
cmd.Parameters.AddRange(new[]
{
- new SqlParameter("@inUser", SqlDbType.NVarChar, 50)
- { Value = query.userName },
- new SqlParameter("@inItemId", SqlDbType.NVarChar, 50)
- { Value = query.itemid },
+ new SqlParameter("@inUser", SqlDbType.NVarChar, 50) { Value = query.userName },
+ new SqlParameter("@inItemId", SqlDbType.NVarChar, 50) { Value = query.itemid },
new SqlParameter("@isDesign", SqlDbType.Int) { Value = 0 },
- new SqlParameter("@in4", SqlDbType.NVarChar, 20)
- { Value = query.in4 ?? DBNull.Value },
- new SqlParameter("@in5", SqlDbType.NVarChar, 20)
- { Value = query.num ?? DBNull.Value }
+ new SqlParameter("@in4", SqlDbType.NVarChar, 20) { Value = query.in4 ?? DBNull.Value },
+ new SqlParameter("@in5", SqlDbType.NVarChar, 20) { Value = query.num ?? DBNull.Value }
});
try
@@ -367,30 +367,28 @@
while (reader.Read())
{
var barcode = reader.GetString(0);
-
+
// 鏋勫缓绗﹀悎鏂规硶绛惧悕鐨勫弬鏁板璞�
- var scanQuery = new WarehouseQuery
+ var scanQuery = new WarehouseQuery
{
barcode = barcode,
DepotCode = query.sectionCode, // 浠庡師濮媞uery鑾峰彇搴撲綅缂栫爜
userName = query.userName // 浠庡師濮媞uery鑾峰彇鐢ㄦ埛璐﹀彿
};
-
+
try
{
// 璋冪敤姝ｅ紡绛惧悕鏂规硶
ScanBarcode(scanQuery);
- var printData = GetPrintBar(barcode);
+ var printData = GetPrintBar(barcode);
resultList.Add(printData);
}
catch (Exception ex)
{
- throw new Exception(
- $"鏈熷垵鏉＄爜鎵撳嵃鍏ュ簱瀛樺湪寮傚父{ex.Message}锛岃閲嶆柊鎵撳嵃锛�");
+ throw new Exception($"鏈熷垵鏉＄爜鎵撳嵃鍏ュ簱瀛樺湪寮傚父{ex.Message}锛岃閲嶆柊鎵撳嵃锛�");
}
}
}
-
return resultList;
}
catch (Exception ex)
@@ -404,8 +402,7 @@
{
var sqlParams = new List<SugarParameter> { new("@barcode", barcode) };
- var sql1 =
- @" SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鏈熷垵鏉＄爜' AS BarType,A.ITEM_BARCODE,GETDATE() as print_date
+ var sql1 = @" SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鏈熷垵鏉＄爜' AS BarType,A.ITEM_BARCODE,GETDATE() as print_date
FROM MES_INV_ITEM_STOCKS A
LEFT JOIN MES_INV_ITEM_BARCODES B ON A.ITEM_BARCODE = B.ITEM_BARCODE
LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
diff --git a/service/Warehouse/KwbgManager.cs b/service/Warehouse/KwbgManager.cs
index 5e9dbb8..93f22ef 100644
--- a/service/Warehouse/KwbgManager.cs
+++ b/service/Warehouse/KwbgManager.cs
@@ -1,27 +1,30 @@
锘縰sing System.Data;
using System.Data.SqlClient;
+using Masuit.Tools;
+using Masuit.Tools.Hardware;
using NewPdaSqlServer.DB;
+using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
-using NewPdaSqlServer.util;
using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
/// <summary>
-/// 搴撲綅鍙樻洿绠＄悊绫伙紝缁ф壙鑷�氱敤浠撳偍绫籖epository锛屾搷浣滈噰璐��璐х敵璇疯〃锛圡esCgthSq锛�
+/// 搴撲綅鍙樻洿绠＄悊绫伙紝缁ф壙鑷�氱敤浠撳偍绫籖epository锛屾搷浣滈噰璐��璐х敵璇疯〃锛圡esCgthSq锛�
/// </summary>
public class KwbgManager : Repository<MesCgthSq>
{
/// <summary>
- /// 鏍规嵁浼犲叆鐨刉arehouseQuery瀵硅薄锛堝寘鍚潯鐮佷俊鎭級锛屾煡璇㈢墿鏂欏簱瀛樿〃MES_INV_ITEM_STOCKS锛岃幏鍙栧搴旂殑搴撳瓨淇℃伅
+ /// 鏍规嵁浼犲叆鐨刉arehouseQuery瀵硅薄锛堝寘鍚潯鐮佷俊鎭級锛屾煡璇㈢墿鏂欏簱瀛樿〃MES_INV_ITEM_STOCKS锛岃幏鍙栧搴旂殑搴撳瓨淇℃伅
/// </summary>
/// <param name="unity">WarehouseQuery瀵硅薄锛屽寘鍚潯鐮佺紪鍙风瓑鏌ヨ鏉′欢</param>
/// <returns>
- /// 杩斿洖MES_INV_ITEM_STOCKS琛ㄤ腑涓庢潯鐮佸尮閰嶇殑绗竴鏉″簱瀛樹俊鎭紙MesInvItemStocks绫诲瀷锛夈��
- /// 濡傛灉鏈壘鍒帮紝鍒欐姏鍑哄紓甯告彁绀衡�滆鏉＄爜搴撳瓨涓嶅瓨鍦紒鈥�
- /// resultInfos.tbBillList = m.GetBarInfo(unity);
+ /// 杩斿洖MES_INV_ITEM_STOCKS琛ㄤ腑涓庢潯鐮佸尮閰嶇殑绗竴鏉″簱瀛樹俊鎭紙MesInvItemStocks绫诲瀷锛夈��
+ /// 濡傛灉鏈壘鍒帮紝鍒欐姏鍑哄紓甯告彁绀衡�滆鏉＄爜搴撳瓨涓嶅瓨鍦紒鈥�
+ /// resultInfos.tbBillList = m.GetBarInfo(unity);
/// </returns>
- /// public MesInvItemStocks GetBarInfo(WarehouseQuery unity)
+ ///public MesInvItemStocks GetBarInfo(WarehouseQuery unity)
public dynamic GetBarInfo(dynamic query)
{
if (query == null)
@@ -31,19 +34,18 @@
throw new ArgumentException("鐗╂枡鏉＄爜涓嶈兘涓虹┖", nameof(query.barcode));
var parameters = new[]
- {
- new SugarParameter("@pi_barcode", query.barcode),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
- };
+ {
+ new SugarParameter("@pi_barcode", query.barcode),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
try
{
- var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_kwbg_selKwInfoByBarcode @pi_barcode,@inP1,@inP2,@inP3,@inP4",
- parameters);
+ List<dynamic>? ZsBarInfo = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_kwbg_selKwInfoByBarcode @pi_barcode,@inP1,@inP2,@inP3,@inP4", parameters);
return ZsBarInfo;
}
@@ -55,13 +57,13 @@
}
/// <summary>
- /// 鏍规嵁鐗╂枡ID鏌ヨ鐗╂枡琛∕ES_ITEMS锛岃幏鍙栫墿鏂欒缁嗕俊鎭�
+ /// 鏍规嵁鐗╂枡ID鏌ヨ鐗╂枡琛∕ES_ITEMS锛岃幏鍙栫墿鏂欒缁嗕俊鎭�
/// </summary>
/// <param name="strItemId">鐗╂枡ID锛坉ecimal绫诲瀷锛�</param>
/// <returns>
- /// 杩斿洖MES_ITEMS琛ㄤ腑涓嶪D鍖归厤涓旀湭绂佺敤锛團forbidstatus涓�"A"锛夌殑绗竴鏉＄墿鏂欎俊鎭紙MesItems绫诲瀷锛夈��
- /// 濡傛灉鏈壘鍒帮紝鍒欐姏鍑哄紓甯告彁绀衡�滆鏉＄爜瀵瑰簲鐗╂枡淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒鈥�
- /// resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ItemId);
+ /// 杩斿洖MES_ITEMS琛ㄤ腑涓嶪D鍖归厤涓旀湭绂佺敤锛團forbidstatus涓�"A"锛夌殑绗竴鏉＄墿鏂欎俊鎭紙MesItems绫诲瀷锛夈��
+ /// 濡傛灉鏈壘鍒帮紝鍒欐姏鍑哄紓甯告彁绀衡�滆鏉＄爜瀵瑰簲鐗╂枡淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒鈥�
+ /// resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ItemId);
/// </returns>
public MesItems GetItemNo(decimal strItemId)
{
@@ -77,15 +79,14 @@
// 杩斿洖鏌ヨ鍒扮殑鐗╂枡淇℃伅瀵硅薄
return itemInfo;
}
-
/// <summary>
- /// 浠撳簱淇℃伅琛�
+ /// 浠撳簱淇℃伅琛�
/// </summary>
/// <param name="depot_id"></param>
/// <returns></returns>
public MesDepots GetDepot(decimal depot_id)
{
- var depotInfo = Db.Queryable<MesDepots>()
+ var depotInfo = Db.Queryable< MesDepots >()
.Where(s => s.DepotId == depot_id)
.First(); // 鑾峰彇绗竴鏉″尮閰嶈褰�
// 濡傛灉鏈煡璇㈠埌缁撴灉锛坕temInfo涓簄ull锛夛紝鍒欐姏鍑哄紓甯革紝鎻愮ず鐗╂枡淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢�
@@ -94,8 +95,9 @@
}
+
/// <summary>
- /// 鍙樻洿搴撲綅
+ /// 鍙樻洿搴撲綅
/// </summary>
/// <param name="unity"></param>
/// <returns></returns>
@@ -114,15 +116,13 @@
{
//if (string.IsNullOrEmpty(query.barcode?.ToString()))
//throw new ArgumentException("鐗╂枡鏉＄爜涓嶈兘涓虹┖", nameof(query.barcode));
-
+
if (string.IsNullOrEmpty(unity.userName?.ToString()))
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(unity.userName));
if (string.IsNullOrEmpty(unity.OldDepotSectionCode?.ToString()))
- throw new ArgumentException("鍘熷簱浣嶄笉鍏佽涓虹┖",
- nameof(unity.OldDepotSectionCode));
+ throw new ArgumentException("鍘熷簱浣嶄笉鍏佽涓虹┖", nameof(unity.OldDepotSectionCode));
if (string.IsNullOrEmpty(unity.NewDepotSectionCode?.ToString()))
- throw new ArgumentException("鏂板簱浣嶄笉鍏佽涓虹┖",
- nameof(unity.NewDepotSectionCode));
+ throw new ArgumentException("鏂板簱浣嶄笉鍏佽涓虹┖", nameof(unity.NewDepotSectionCode));
if (string.IsNullOrEmpty(unity.barcode?.ToString()))
throw new ArgumentException("鐗╂枡鏉＄爜涓嶅厑璁镐负绌�", nameof(unity.barcode));
@@ -144,31 +144,25 @@
// 鏋勯�犲瓨鍌ㄨ繃绋嬪弬鏁版暟缁�
SqlParameter[] parameters =
{
- // 杈撳嚭鍙傛暟锛氳繑鍥炰俊鎭�
- new("@outMsg", SqlDbType.NVarChar, 2000),
- // 杈撳嚭鍙傛暟锛氳繑鍥炴暟閲�
- new("@outSum", SqlDbType.Int),
- // 杈撳嚭鍙傛暟锛氳繑鍥炴柊搴撲綅浠ｇ爜
- new("@new_depotSectionsCode", SqlDbType.NVarChar, 300),
- // 杈撳叆鍙傛暟锛氭搷浣滅敤鎴�
- new SqlParameter("@c_user",
- unity.userName?.ToString() ?? ""),
- // 杈撳叆鍙傛暟锛氬師鏉＄爜
- new SqlParameter("@p_barcode",
- unity.barcode?.ToString() ?? ""),
- // 杈撳叆鍙傛暟锛氬師搴撲綅浠ｇ爜
- new("@old_depotSectionsCode",
- unity.OldDepotSectionCode?.ToString() ?? ""),
- // 杈撳叆鍙傛暟锛氭柊搴撲綅浠ｇ爜
- new("@new_depotSectionsCode_input",
- unity.NewDepotSectionCode?.ToString() ?? ""),
- // 杈撳叆鍙傛暟锛氫粨搴撲唬鐮�
- new("@DepotCode", unity.DepotCode)
- { Value = unity.DepotCode ?? "" },
- // 杈撳叆鍙傛暟锛氫粨搴搃d
- new("@DepotId",
- (int?)unity.DepotId ?? (object)DBNull.Value)
- };
+ // 杈撳嚭鍙傛暟锛氳繑鍥炰俊鎭�
+ new("@outMsg", SqlDbType.NVarChar, 2000),
+ // 杈撳嚭鍙傛暟锛氳繑鍥炴暟閲�
+ new("@outSum", SqlDbType.Int),
+ // 杈撳嚭鍙傛暟锛氳繑鍥炴柊搴撲綅浠ｇ爜
+ new("@new_depotSectionsCode", SqlDbType.NVarChar, 300),
+ // 杈撳叆鍙傛暟锛氭搷浣滅敤鎴�
+ new SqlParameter("@c_user", unity.userName?.ToString() ?? ""),
+ // 杈撳叆鍙傛暟锛氬師鏉＄爜
+ new SqlParameter("@p_barcode", unity.barcode?.ToString() ?? ""),
+ // 杈撳叆鍙傛暟锛氬師搴撲綅浠ｇ爜
+ new("@old_depotSectionsCode", unity.OldDepotSectionCode?.ToString() ??""),
+ // 杈撳叆鍙傛暟锛氭柊搴撲綅浠ｇ爜
+ new("@new_depotSectionsCode_input", unity.NewDepotSectionCode?.ToString() ??""),
+ // 杈撳叆鍙傛暟锛氫粨搴撲唬鐮�
+ new("@DepotCode", unity.DepotCode) { Value = unity.DepotCode ?? "" },
+ // 杈撳叆鍙傛暟锛氫粨搴搃d
+ new SqlParameter("@DepotId", (int?)unity.DepotId ?? (object)DBNull.Value)
+ };
// 璁剧疆杈撳嚭鍙傛暟鏂瑰悜
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -182,10 +176,9 @@
cmd.ExecuteNonQuery();
// 鑾峰彇瀛樺偍杩囩▼杈撳嚭鍙傛暟鐨勫��
- _strMsg = parameters[0].Value.ToString(); // 杩斿洖淇℃伅
- _intSum = parameters[1].Value.ToString(); // 杩斿洖鏁伴噺
- _NewDepotSectionCode =
- parameters[2].Value.ToString(); // 鏂板簱浣嶄唬鐮�
+ _strMsg = parameters[0].Value.ToString(); // 杩斿洖淇℃伅
+ _intSum = parameters[1].Value.ToString(); // 杩斿洖鏁伴噺
+ _NewDepotSectionCode = parameters[2].Value.ToString(); // 鏂板簱浣嶄唬鐮�
// 鍒ゆ柇鍙樻洿缁撴灉锛屽鏋滄暟閲忓皬浜庣瓑浜�0锛屽垯琛ㄧず鍙樻洿澶辫触锛屾姏鍑哄紓甯稿苟杩斿洖閿欒淇℃伅
var result = Convert.ToInt32(_intSum);
@@ -194,8 +187,8 @@
// 浣跨敤鍖垮悕瀵硅薄鑰屼笉鏄� dynamic? 鏇村悎閫�
var dto = new
{
- unity.barcode,
- unity.OldDepotSectionCode,
+ barcode = unity.barcode,
+ OldDepotSectionCode = unity.OldDepotSectionCode,
NewDepotSectionCode = _NewDepotSectionCode
};
@@ -221,4 +214,6 @@
ProductionPickDto鏈夎繃娣诲姞
public int? DepotId { get; set; } //浠撳簱id
*/
+
+
}
\ No newline at end of file
diff --git a/service/Warehouse/MesBarCFManager.cs b/service/Warehouse/MesBarCFManager.cs
index 7865083..7a5da90 100644
--- a/service/Warehouse/MesBarCFManager.cs
+++ b/service/Warehouse/MesBarCFManager.cs
@@ -1,11 +1,12 @@
锘縰sing System.Data;
using System.Data.SqlClient;
using Masuit.Tools;
+using Masuit.Tools.Hardware;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
-using NewPdaSqlServer.util;
using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
@@ -13,7 +14,7 @@
{
public MesInvItemStocks GetBarInfo(WarehouseQuery unity)
{
- var barInfo = Db.Queryable<MesInvItemStocks>()
+ var barInfo = Db.Queryable<MesInvItemStocks>()
.Where(s => s.ItemBarcode == unity.barcode)
.First();
if (barInfo is null) throw new Exception("璇ユ潯鐮佸簱瀛樹笉瀛樺湪锛�");
@@ -23,16 +24,15 @@
public dynamic GetBarInfoBefore(WarehouseQuery unity)
{
- // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter>
- { new("@barcode", unity.barcode) };
- var sql1 =
- @"SELECT 1 FROM MES_INV_ITEM_STOCKS WHERE ITEM_BARCODE =@barcode ";
+ // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter> { new("@barcode", unity.barcode) };
+
+ var sql1 = @"SELECT 1 FROM MES_INV_ITEM_STOCKS WHERE ITEM_BARCODE =@barcode ";
var KcInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
- if (KcInfo.Count > 0) throw new Exception("璇ユ潯鐮佸凡鍏ュ簱涓嶈兘杩涜鍏ュ簱鍓嶆媶鍒嗭紒");
+ if(KcInfo.Count > 0) throw new Exception("璇ユ潯鐮佸凡鍏ュ簱涓嶈兘杩涜鍏ュ簱鍓嶆媶鍒嗭紒");
//var sql3 = @"SELECT 1 FROM MES_INV_ITEM_CGYT_C_DETAILS WHERE ITEM_BARCODE =@barcode";
@@ -41,11 +41,9 @@
//if (YtInfo.Count > 0) throw new Exception("璇ユ潯鐮佸凡鎵弿閫�鏂欎笉鑳借繘琛屽叆搴撳墠鎷嗗垎锛�");
- var sql2 =
- @"SELECT ITEM_ID,QUANTITY FROM MES_INV_ITEM_BARCODES WHERE ITEM_BARCODE =@barcode ";
+ var sql2 = @"SELECT ITEM_ID,QUANTITY FROM MES_INV_ITEM_BARCODES WHERE ITEM_BARCODE =@barcode ";
- var barInfo =
- Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).FirstOrDefault();
+ var barInfo = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).FirstOrDefault();
if (barInfo is null) throw new Exception("璇ユ潯鐮佷俊鎭笉瀛樺湪锛�");
@@ -66,7 +64,7 @@
{
var _strMsg = "";
var _intSum = "";
- var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (unity.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
@@ -86,7 +84,8 @@
new("@barcode_new", SqlDbType.NVarChar, 300),
new("@c_user", unity.userName),
new("@p_old_barcode", unity.barcode),
- new("@p_qty", unity.CfNum)
+ new("@p_qty", unity.CfNum),
+
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -105,8 +104,8 @@
var dto = new ProductionPickDto
{
- barcode = unity.barcode, //鍘熸潯鐮�
- cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
+ barcode = unity.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -116,6 +115,7 @@
//return _strMsg;
//return 0;
+
}
catch (Exception ex)
{
@@ -133,7 +133,7 @@
{
var _strMsg = "";
var _intSum = "";
- var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (unity.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
@@ -153,7 +153,8 @@
new("@barcode_new", SqlDbType.NVarChar, 300),
new("@c_user", unity.userName),
new("@p_old_barcode", unity.barcode),
- new("@p_qty", unity.CfNum)
+ new("@p_qty", unity.CfNum),
+
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -172,8 +173,8 @@
var dto = new ProductionPickDto
{
- barcode = unity.barcode, //鍘熸潯鐮�
- cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
+ barcode = unity.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -183,6 +184,7 @@
//return _strMsg;
//return 0;
+
}
catch (Exception ex)
{
diff --git a/service/Warehouse/MesCgthSqManager.cs b/service/Warehouse/MesCgthSqManager.cs
index feadad4..3640c3b 100644
--- a/service/Warehouse/MesCgthSqManager.cs
+++ b/service/Warehouse/MesCgthSqManager.cs
@@ -5,55 +5,86 @@
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
-using NewPdaSqlServer.util;
using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
public class MesCgthSqManager : Repository<MesCgthSq>
{
- public List<MesCgthSq> GetMesCgthSq()
+ public dynamic GetMesCgthSq(dynamic RequestInfo)
{
- return Db.Queryable<MesCgthSq>()
- .Where(s => s.Status == true)
- .OrderByDescending(s => s.CreateDate)
- .ToList();
+ var orgId = RequestInfo.OrgId;
+
+ if (orgId == null)
+ throw new Exception("缁勭粐涓嶅瓨鍦紒");
+
+ // 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
+ var parameters = new[]
+ {
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
+ try
+ {
+ // 杩斿洖鍗曞彿瀛楃涓插垪琛�
+ var blDetails = Db.Ado.SqlQuery<string>(
+ "EXEC prc_pda_cgth_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ return blDetails;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"{ex.Message}");
+ }
}
- public ProductionPickDto GetSumItem(WarehouseQuery query)
+ public dynamic GetSumItem(WarehouseQuery query, dynamic RequestInfo)
{
- if (string.IsNullOrEmpty(query.billNo)) throw new Exception("鐢宠鍗曞彿涓虹┖");
+ if (string.IsNullOrEmpty(query.billNo))
+ throw new Exception("璇烽�夊崟鎹彿锛�");
- var mesInvItemOuts = base.GetSingle(it =>
- it.BillNo == query.billNo && it.Status == true);
- if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦ㄦ垨鏈鏍�");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
- var sql = string.Format(
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.SQ_NUM FQty,A.YS_NUM SQty,A.SQ_NUM - A.YS_NUM DSQty,
- dbo.F_QX_GETRECODEPOTSE(A.ITEM_ID,A.depot_id,'','') as RecoKw
-fROM MES_CGTH_SQ_DETAIL A
- LEFT JOIN MES_CGTH_SQ B ON A.MID = B.ID
- LEFT JOIN MES_ITEMS C ON A.ITEM_ID = C.item_id
-WHERE B.BILL_NO = '{0}'", query.billNo);
+ if (string.IsNullOrEmpty(query.billNo?.ToString()))
+ throw new ArgumentException("鍗曟嵁鍙蜂笉鑳戒负绌�", nameof(query.billNo));
- var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
+ var orgId = RequestInfo.OrgId;
- if (womdabs.Count < 1) throw new Exception("璇ラ噰璐��璐х敵璇峰崟鏄庣粏涓嶅瓨鍦�");
+ if (orgId == null)
+ throw new Exception("缁勭粐涓嶅瓨鍦紒");
-
- var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
-
- var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
-
- var dto = new ProductionPickDto
+ // 鑾峰彇鏈畬鎴愮殑鍙戣揣閫氱煡鍗曟槑缁�
+ var parameters = new[]
+{
+ new SugarParameter("@billNo", query.billNo),
+ new SugarParameter("@pi_orgId",orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
+ try
{
- //daa001 = womdaa.Daa001,
- //PlanNo = womcaa.Caa020,
- items = DS_list,
- Ysitems = YS_list
- };
-
- return dto;
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_cgth_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ return new
+ {
+ items = items,
+ ysitems = ysitems,
+ allList = blDetails
+ };
+ }
+ catch (Exception ex)
+ {
+ // 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫
+ throw new Exception($"{ex.Message}");
+ }
}
public List<MesCgthSqDetail> GetItems(WarehouseQuery query)
@@ -68,11 +99,11 @@
throw new ApplicationException("GUID杞崲閿欒"); // 濡傛灉杞崲澶辫触锛屽垯鎶涘嚭寮傚父
// 浣跨敤SqlSugar妗嗘灦鏌ヨMesInvItemOutItems鍜孧esItems琛紝鏍规嵁ItemId杩涜鍐呰繛鎺�
- var mesInvItemOutItemsList = Db
- .Queryable<MesCgthSqDetail, MesItems>((c, s) => new object[]
- {
- JoinType.Inner, c.ItemId == s.Id // 鍐呰繛鎺ユ潯浠�
- }).Where((c, s) => c.Mid == parsedGuid) // 鏍规嵁ItemOutId杩囨护
+ var mesInvItemOutItemsList = Db.Queryable<MesCgthSqDetail, MesItems>(
+ (c, s) => new object[]
+ {
+ JoinType.Inner, c.ItemId == s.Id // 鍐呰繛鎺ユ潯浠�
+ }).Where((c, s) => c.Mid == parsedGuid) // 鏍规嵁ItemOutId杩囨护
.Select<MesCgthSqDetail>((c, s) =>
new MesCgthSqDetail // 閫夋嫨骞舵槧灏勫埌MesInvItemOutItems瀵硅薄
{
@@ -103,8 +134,7 @@
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
- if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�"); if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
using (var cmd = new SqlCommand("[prc_pda_CGTH]", conn))
{
@@ -172,7 +202,7 @@
var _strMsg = "";
var _intSum = "";
- var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("[prc_pda_CGTH_CF]", conn))
@@ -208,8 +238,8 @@
var dto = new ProductionPickDto
{
daa001 = query.billNo,
- barcode = query.barcode, //鍘熸潯鐮�
- cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -228,7 +258,7 @@
/// <summary>
- /// 閲囪喘鎵爜楠岄��
+ /// 閲囪喘鎵爜楠岄��
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -237,8 +267,7 @@
/// <exception cref="Exception"></exception>
public dynamic ScanCgyt(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 2. 浣跨敤 string.IsNullOrEmpty 鐩存帴鍒ゆ柇瀛楃涓插睘鎬э紙閬垮厤 NullReferenceException锛�
if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -254,16 +283,11 @@
cmd.CommandType = CommandType.StoredProcedure;
var parameters = new SqlParameter[]
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userName },
- new("@pi_barcode", SqlDbType.NVarChar, 100)
- { Value = query.barcode },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outSum", SqlDbType.Int)
- { Direction = ParameterDirection.Output },
- new("@po_ygdh", SqlDbType.NVarChar, 200)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = query.barcode },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outSum", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new("@po_ygdh", SqlDbType.NVarChar, 200) { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -273,7 +297,7 @@
var result = new
{
result = parameters[3].Value.ToString(),
- query.barcode,
+ barcode = query.barcode,
ytdh = parameters[4].Value.ToString(),
msg = parameters[2].Value.ToString()
};
@@ -287,7 +311,7 @@
}
/// <summary>
- /// 鍒犻櫎楠岄��鍗�
+ /// 鍒犻櫎楠岄��鍗�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -296,8 +320,7 @@
/// <exception cref="Exception"></exception>
public dynamic deleteCgyt(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 2. 浣跨敤 string.IsNullOrEmpty 鐩存帴鍒ゆ柇瀛楃涓插睘鎬э紙閬垮厤 NullReferenceException锛�
if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -313,14 +336,10 @@
cmd.CommandType = CommandType.StoredProcedure;
var parameters = new SqlParameter[]
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userName },
- new("@pi_ytdh", SqlDbType.NVarChar, 100)
- { Value = query.ytdh },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outSum", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_ytdh", SqlDbType.NVarChar, 100) { Value = query.ytdh },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -330,7 +349,7 @@
var result = new
{
result = parameters[3].Value.ToString(),
- msg = parameters[2].Value.ToString()
+ msg = parameters[2].Value.ToString(),
};
if (result.result == "-1")
@@ -342,19 +361,18 @@
}
/// <summary>
- /// 鑾峰彇楠岄��鍗曞凡鎵墿鏂欎俊鎭�
+ /// 鑾峰彇楠岄��鍗曞凡鎵墿鏂欎俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public dynamic getYtItem(string ytdh)
{
- if (string.IsNullOrEmpty(ytdh))
+ if (string.IsNullOrEmpty(ytdh?.ToString()))
throw new ArgumentException("楠岄��鍗曞彿涓嶅厑璁镐负绌�", nameof(ytdh));
var sqlParams = new List<SugarParameter> { new("@ytdh", ytdh) };
- var sql1 =
- @"SELECT C.item_id,C.item_no,C.item_name,C.item_model,A.quantity
+ var sql1 = @"SELECT C.item_id,C.item_no,C.item_name,C.item_model,A.quantity
FROM MES_INV_ITEM_CGYT_ITEMS A
LEFT JOIN MES_INV_ITEM_CGYT B ON A.item_cgyt_id = B.GUID
LEFT JOIN MES_ITEMS C ON A.item_id = C.item_id
@@ -371,19 +389,18 @@
}
/// <summary>
- /// 鑾峰彇楠岄��鍗曞凡鎵潯鐮佷俊鎭�
+ /// 鑾峰彇楠岄��鍗曞凡鎵潯鐮佷俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public dynamic getYtBarInfo(string ytdh)
{
- if (string.IsNullOrEmpty(ytdh))
+ if (string.IsNullOrEmpty(ytdh?.ToString()))
throw new ArgumentException("楠岄��鍗曞彿涓嶅厑璁镐负绌�", nameof(ytdh));
var sqlParams = new List<SugarParameter> { new("@ytdh", ytdh) };
- var sql1 =
- @"SELECT C.item_id,C.item_no,C.item_name,C.item_model,A.quantity,A.ITEM_BARCODE
+ var sql1 = @"SELECT C.item_id,C.item_no,C.item_name,C.item_model,A.quantity,A.ITEM_BARCODE
FROM MES_INV_ITEM_CGYT_C_DETAILS A
LEFT JOIN MES_INV_ITEM_CGYT B ON A.item_cgyt_id = B.GUID
LEFT JOIN MES_ITEMS C ON A.item_id = C.item_id
diff --git a/service/Warehouse/MesCprkManager.cs b/service/Warehouse/MesCprkManager.cs
index 731906d..f6b7b34 100644
--- a/service/Warehouse/MesCprkManager.cs
+++ b/service/Warehouse/MesCprkManager.cs
@@ -4,7 +4,8 @@
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
-using NewPdaSqlServer.util;
+using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
@@ -31,8 +32,7 @@
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (unity.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (unity.sectionCode.IsNullOrEmpty())
- throw new Exception("搴撲綅缂栧彿涓嶅厑璁镐负绌�");
+ if (unity.sectionCode.IsNullOrEmpty()) throw new Exception("搴撲綅缂栧彿涓嶅厑璁镐负绌�");
if (unity.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
using (var cmd = new SqlCommand("[prc_pda_inv_cprk]", conn))
@@ -48,7 +48,8 @@
new("@po_womInBarSum", SqlDbType.NVarChar, 300),
new("@pi_user", unity.userName),
new("@pi_barcode", unity.barcode),
- new("@pi_sectionCode", unity.sectionCode)
+ new("@pi_sectionCode", unity.sectionCode),
+
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -66,6 +67,7 @@
return _strMsg;
//return 0;
+
}
catch (Exception ex)
{
diff --git a/service/Warehouse/MesDbckManager.cs b/service/Warehouse/MesDbckManager.cs
index fdd4ca4..d05f336 100644
--- a/service/Warehouse/MesDbckManager.cs
+++ b/service/Warehouse/MesDbckManager.cs
@@ -1,8 +1,7 @@
锘縰sing NewPdaSqlServer.DB;
using NewPdaSqlServer.entity;
-
+using MES.Service.Modes;
namespace NewPdaSqlServer.service.Warehouse;
public class MesDbckManager : Repository<MesDbck>
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/service/Warehouse/MesDepotSectionsManager.cs b/service/Warehouse/MesDepotSectionsManager.cs
index e69057f..33fda90 100644
--- a/service/Warehouse/MesDepotSectionsManager.cs
+++ b/service/Warehouse/MesDepotSectionsManager.cs
@@ -9,15 +9,16 @@
{
public dynamic GetSectionName(WarehouseQuery query)
{
- var sectionName = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
- new JoinQueryInfos(JoinType.Inner,
- a.DepotGuid == b.Guid)) // 纭繚Guid绫诲瀷姝ｇ‘姣旇緝
+ var sectionName = Db.Queryable<MesDepotSections, MesDepots>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Inner,
+ a.DepotGuid == b.Guid)) // 纭繚Guid绫诲瀷姝ｇ‘姣旇緝
.Where((a, b) => a.DepotSectionCode == query.sectionCode)
- .Select((a, b) => new // 鏀圭敤鍖垮悕绫诲瀷鏇夸唬dynamic
+ .Select((a, b) => new // 鏀圭敤鍖垮悕绫诲瀷鏇夸唬dynamic
{
a.DepotSectionName,
- b.DepotName, // 鏄惧紡鎸囧畾瀛楁鍒悕
- b.DepotCode
+ DepotName = b.DepotName, // 鏄惧紡鎸囧畾瀛楁鍒悕
+ DepotCode = b.DepotCode
}).Single();
if (sectionName == null)
@@ -32,10 +33,10 @@
if (string.IsNullOrEmpty(query.sectionCode))
throw new Exception("璇锋壂搴撲綅鏉＄爜!");
- var mesDepotSections = Db
- .Queryable<MesDepotSections, MesDepots>((a, b) =>
- new JoinQueryInfos(JoinType.Inner,
- a.DepotGuid == b.Guid))
+ var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Inner,
+ a.DepotGuid == b.Guid))
.Where((a, b) => a.DepotSectionCode == query.sectionCode)
.Select((a, b) => new MesDepotSections
{
@@ -56,10 +57,10 @@
if (string.IsNullOrEmpty(entity.sectionCode))
throw new Exception("璇锋壂搴撲綅鏉＄爜!");
- var mesDepotSections = Db
- .Queryable<MesDepotSections, MesDepots>((a, b) =>
- new JoinQueryInfos(JoinType.Inner,
- a.Zuid.ToString() == b.Zuid))
+ var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Inner,
+ a.Zuid.ToString() == b.Zuid))
.Where((a, b) => a.DepotSectionCode == entity.sectionCode)
.First();
if (mesDepotSections == null)
diff --git a/service/Warehouse/MesInvItemArnManager.cs b/service/Warehouse/MesInvItemArnManager.cs
index a52da1c..b13f4a9 100644
--- a/service/Warehouse/MesInvItemArnManager.cs
+++ b/service/Warehouse/MesInvItemArnManager.cs
@@ -22,9 +22,8 @@
}
// 鏌ヨ骞跺垎椤�
- var result = Db
- .Queryable<MesInvItemArn, MesDepots, MesSupplier>((a, d, f) =>
- new object[]
+ var result = Db.Queryable<MesInvItemArn, MesDepots, MesSupplier>(
+ (a, d, f) => new object[]
{
JoinType.Left, a.DepotsId == d.DepotId.ToString(),
JoinType.Left, a.SuppId == f.Id.ToString()
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 065d517..8dfc5d4 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -1,4 +1,5 @@
-锘縰sing NewPdaSqlServer.DB;
+锘縰sing Masuit.Tools.Models;
+using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
@@ -6,6 +7,7 @@
using NewPdaSqlServer.util;
using Newtonsoft.Json;
using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
@@ -34,13 +36,11 @@
if (itemBarcodeDetails == null)
throw new Exception("鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
- if (string.IsNullOrEmpty(itemBarcodeDetails.Memo) ||
- itemBarcodeDetails.Memo != "閲囪喘鍏ュ簱")
+ if (string.IsNullOrEmpty(itemBarcodeDetails.Memo) || itemBarcodeDetails.Memo != "閲囪喘鍏ュ簱")
throw new Exception("姝ゆ潯鐮佷笉灞炰簬鍒拌揣鏉＄爜锛屾棤娉曠敤閲囪喘鍏ュ簱锛�");
var inventory = Db.Queryable<MesInvItemArn>()
- .Where(it =>
- it.BillNo == itemBarcodeDetails.BillNo && it.Fstatus == true)
+ .Where(it => it.BillNo == itemBarcodeDetails.BillNo && it.Fstatus == true )
.First();
if (inventory == null)
@@ -68,14 +68,14 @@
throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟槑缁嗭紒");
//鑾峰彇鍒拌揣妫�楠屾槑缁�
- var sqlParams = new List<SugarParameter>
- { new("@dhmxGuid", itemBarcodeDetails.AboutGuid) };
+ var sqlParams = new List<SugarParameter> { new("@dhmxGuid", itemBarcodeDetails.AboutGuid) };
var sql1 = @"SELECT *FROM v_dhmx WHERE dhmxGuid = @dhmxGuid ";
var dhjymx = Db.Ado.SqlQuery<vDhmx>(sql1, sqlParams).First();
//鍒ゅ畾妫�楠岃兘鍚﹀叆搴�
- if (dhjymx.CanStore != 1)
- throw new Exception(
- $"璇ユ潯鐮佸搴旂殑鏀舵枡鍗曟楠岀粨鏋�:銆恵dhjymx.InspectionResult}銆�,鍒ゅ畾缁撴灉锛氥�恵dhjymx.JudgmentResult}銆戯紝澶勭悊鎰忚锛氥�恵dhjymx.HandlingSuggestion}銆�,鏃犳硶鍏ュ簱");
+ if (dhjymx.CanStore!= 1)
+ {
+ throw new Exception($"璇ユ潯鐮佸搴旂殑鏀舵枡鍗曟楠岀粨鏋�:銆恵dhjymx.InspectionResult}銆�,鍒ゅ畾缁撴灉锛氥�恵dhjymx.JudgmentResult}銆戯紝澶勭悊鎰忚锛氥�恵dhjymx.HandlingSuggestion}銆�,鏃犳硶鍏ュ簱");
+ }
var depotCode = Db.Queryable<MesDepotSections>()
.Where(it => it.DepotSectionCode == sectionCode)
@@ -91,12 +91,17 @@
var checkGuid = UtilityHelper.CheckGuid(depotCode);
if (checkGuid && depotCode != null)
+ {
mesDepost = Db.Queryable<MesDepots>()
.Where(s => s.DepotId.ToString() == depotCode).First();
- // if (depotCode != mesDepost.Guid)
- // throw new Exception("鎵弿搴撲綅涓庨噰璐叆搴撳簱浣嶄笉涓�鑷达紒");
+
+ // if (depotCode != mesDepost.Guid)
+ // throw new Exception("鎵弿搴撲綅涓庨噰璐叆搴撳簱浣嶄笉涓�鑷达紒");
+ }
else
+ {
throw new Exception("搴撲綅缂栫爜 " + sectionCode + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+ }
//num = Db.Queryable<MesInvItemInCDetails>()
@@ -116,18 +121,19 @@
var wmsManager = new WmsBaseMangeer();
// 鏂板鍏ュ簱鏍￠獙锛堣皟鐢ㄥ瓨鍌ㄨ繃绋嬶級
var checkResult = wmsManager.pdaInvJY(
- Db,
- entity.userName,
- entity.barcode,
- sectionCode,
- mesDepost.DepotId.ToString(),
- mesDepost.FSubsidiary,
- "", // 鏍规嵁瀹為檯鍗曟嵁鍙蜂紶鍊�
- "101" // 浜嬪姟绫诲瀷涓庡瓨鍌ㄨ繃绋嬪尮閰�
+ db: Db,
+ edtUserNo: entity.userName,
+ barcode: entity.barcode,
+ sectionCode: sectionCode,
+ stockId: mesDepost.DepotId.ToString(),
+ stockOrgId: mesDepost.FSubsidiary,
+ billNo: "", // 鏍规嵁瀹為檯鍗曟嵁鍙蜂紶鍊�
+ transactionNo: "101" // 浜嬪姟绫诲瀷涓庡瓨鍌ㄨ繃绋嬪尮閰�
);
if (Convert.ToInt32(checkResult.result) < 1)
throw new Exception($"鍏ュ簱鏍￠獙澶辫触锛歿checkResult.strMsg}");
+
//num = Db.Queryable<MesInvItemArn>()
@@ -196,15 +202,13 @@
UseTransaction(db =>
{
var existingRecord = db.Queryable<MesInvItemIns>()
- .Where(it =>
- it.InsDate.Value.ToString("yyyy-MM-dd") ==
- DateTime.Now.ToString("yyyy-MM-dd")
- && it.TaskNo == itemBarcodeDetails.BillNo
- && it.Status == 0
- && it.TransctionNo == transactionNo
- && it.CreateBy == entity.userName
- && it.BillTypeId == billTypeId
- && it.DepotsId == mesDepost.DepotId)
+ .Where(it => it.InsDate.Value.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")
+ && it.TaskNo == itemBarcodeDetails.BillNo
+ && it.Status == 0
+ && it.TransctionNo == transactionNo
+ && it.CreateBy == entity.userName
+ && it.BillTypeId == billTypeId
+ && it.DepotsId == mesDepost.DepotId)
.Select(it => new
{
it.Guid,
@@ -244,10 +248,7 @@
CreateDate = DateTime.Now,
LastupdateBy = user,
LastupdateDate = DateTime.Now,
- UrgentFlag =
- itemBarcodeDetails.UrgentFlag.GetValueOrDefault()
- ? "1"
- : "0",
+ UrgentFlag = itemBarcodeDetails.UrgentFlag.GetValueOrDefault() ? "1" : "0",
CbillNo = itemBarcodeDetails.BillNo,
Fstatus = 0,
Status = 0,
@@ -297,10 +298,10 @@
var count = db.Queryable<MesInvItemInCItems>()
.Where(it =>
it.ItemInId == cId &&
- it.ItemId == detail.ItemId &&
- it.DepotId == mesDepost.DepotId.ToString() &&
- it.EbelnK3id == detail.EbelnK3id &&
- it.LineK3id == detail.LineK3id)
+ it.ItemId == detail.ItemId &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
+ it.EbelnK3id == detail.EbelnK3id &&
+ it.LineK3id == detail.LineK3id)
.Count();
cSyQty -= remainingQty.Value;
@@ -328,8 +329,7 @@
EbelnK3id = detail.EbelnK3id,
LineK3id = detail.LineK3id,
DepotId = mesDepost.DepotId.ToString(),
- itemDabid = itemBarcodeDetails.AboutGuid
- .ToString()
+ itemDabid = itemBarcodeDetails.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
db.Updateable<MesInvItemInCItems>()
@@ -338,8 +338,7 @@
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detail.ItemId &&
- it.DepotId ==
- mesDepost.DepotId.ToString() &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
it.EbelnK3id == detail.EbelnK3id &&
it.LineK3id == detail.LineK3id)
.IgnoreColumns(true)
@@ -396,10 +395,10 @@
var count = db.Queryable<MesInvItemInCItems>()
.Where(it =>
it.ItemInId == cId &&
- it.ItemId == detail.ItemId &&
- it.DepotId == mesDepost.DepotId.ToString() &&
- it.EbelnK3id == detail.EbelnK3id &&
- it.LineK3id == detail.LineK3id)
+ it.ItemId == detail.ItemId &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
+ it.EbelnK3id == detail.EbelnK3id &&
+ it.LineK3id == detail.LineK3id)
.Count();
if (count == 0)
@@ -434,8 +433,7 @@
.Where(it =>
it.ItemInId == cId &&
it.ItemId == detail.ItemId &&
- it.DepotId ==
- mesDepost.DepotId.ToString() &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
it.EbelnK3id == detail.EbelnK3id &&
it.LineK3id == detail.LineK3id)
.IgnoreColumns(true)
@@ -522,10 +520,10 @@
// 妫�鏌ユ槸鍚﹀瓨鍦ㄤ簬 MES_INV_ITEM_IN_C_ITEMS 琛�
var existingCount = db.Queryable<MesInvItemInCItems>()
.Where(it =>
- it.ItemInId == cId &&
- it.ItemId == detailone.ItemId &&
- it.DepotId == mesDepost.DepotId.ToString() &&
- it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
+ it.ItemInId == cId &&
+ it.ItemId == detailone.ItemId &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
+ it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
.Count();
if (existingCount == 0)
@@ -560,16 +558,13 @@
db.Updateable<MesInvItemInCItems>()
.SetColumns(it => new MesInvItemInCItems
{
- Quantity = SqlFunc.IsNull(it.Quantity, 0) +
- itemBarcodeDetails
- .Quantity // 纭繚 Quantity 涓嶄负 null
+ Quantity = SqlFunc.IsNull(it.Quantity, 0) + itemBarcodeDetails.Quantity // 纭繚 Quantity 涓嶄负 null
})
.Where(it =>
- it.ItemInId == cId &&
- it.ItemId == detailone.ItemId &&
- it.DepotId == mesDepost.DepotId.ToString() &&
- it.itemDabid ==
- itemBarcodeDetails.AboutGuid.ToString())
+ it.ItemInId == cId &&
+ it.ItemId == detailone.ItemId &&
+ it.DepotId == mesDepost.DepotId.ToString() &&
+ it.itemDabid == itemBarcodeDetails.AboutGuid.ToString())
//.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
.ExecuteCommand();
@@ -649,6 +644,7 @@
// 鎻掑叆 mes_inv_item_stocks 琛�
}
+
db.Insertable(new MesInvItemStocks
@@ -759,45 +755,38 @@
//result.Message =
// $"鏉＄爜鏁伴噺 {itemBarcodeDetails.Quantity},閲囪喘璁㈠崟 {itemBarcodeDetails.WorkNo} 椤规 {itemBarcodeDetails.WorkLine} 鐗╂枡 {mesItems.ItemNo} 鏈鍏ュ簱鎬绘暟锛歿totalCDetailsQuantity} 鎬诲埌 {comeQty} 宸插叆 {invQty} 娆� {diffQty}";
- result.Message =
- $"鐗╂枡{mesItems.ItemNo}鍏ュ簱鎴愬姛鏁伴噺{itemBarcodeDetails.Quantity.ToString()}";
+ result.Message = $"鐗╂枡{mesItems.ItemNo}鍏ュ簱鎴愬姛鏁伴噺{itemBarcodeDetails.Quantity.ToString()}";
result.itemDetail = mesItems;
- result.ItemInDetails = db
- .Queryable<MesInvItemInCItems, MesItems>((a, b) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.ItemId == b.ItemId)
+ result.ItemInDetails = db.Queryable<MesInvItemInCItems,MesItems>(
+ (a, b) => new JoinQueryInfos(
+ JoinType.Left,
+ a.ItemId == b.ItemId)
)
- .Where(a =>
- a.ItemInId == cId &&
- a.ItemId == itemBarcodeDetails.ItemId)
- .Select<dynamic>((a, b) => new
+ .Where(a => a.ItemInId == cId && a.ItemId == itemBarcodeDetails.ItemId)
+ .Select<dynamic>((a, b) => new
{
- b.ItemNo,
- b.ItemName,
- b.ItemModel,
+ ItemNo = b.ItemNo,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
FQty = a.Quantity, // 鐢宠鏁伴噺
FMaterialId = b.ItemId,
Id = b.Guid.ToString()
})
.ToList();
- result.ItemBarCDetails = db
- .Queryable<MesInvItemInCDetails, MesItems>((a, b) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.ItemId == b.ItemId)
+ result.ItemBarCDetails = db.Queryable<MesInvItemInCDetails, MesItems>(
+ (a, b) => new JoinQueryInfos(
+ JoinType.Left,
+ a.ItemId == b.ItemId)
)
- .Where(a =>
- a.ItemInId == cId &&
- a.ItemId == itemBarcodeDetails.ItemId)
+ .Where(a => a.ItemInId == cId && a.ItemId == itemBarcodeDetails.ItemId)
.Select<dynamic>((a, b) => new
{
- b.ItemNo,
- b.ItemName,
- b.ItemModel,
+ ItemNo = b.ItemNo,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
FQty = a.Quantity, // 鐢宠鏁伴噺
FMaterialId = b.ItemId,
Id = a.Guid.ToString(),
@@ -875,17 +864,15 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "銆怭DA銆戦噰璐叆搴撱�傛潯鐮併��" + entity.barcode + "銆� 鍏ュ簱鍗曞彿銆�" +
- cBillNo + "銆�";
- logService.CreateLog(db, entity.userName, inventory.Guid.ToString(),
- "MES_INV_ITEM_ARN", LogMsg, inventory.BillNo);
+ var LogMsg = "銆怭DA銆戦噰璐叆搴撱�傛潯鐮併��" + entity.barcode + "銆� 鍏ュ簱鍗曞彿銆�" + cBillNo + "銆�";
+ logService.CreateLog(db, entity.userName, inventory.Guid.ToString(), "MES_INV_ITEM_ARN", LogMsg, inventory.BillNo);
return 1;
});
var purchaseInventory = getPurchaseInventory(entity);
-
+
//result.ItemInDetails = purchaseInventory.ItemInDetails;
//result.InvItemInCDetails = purchaseInventory.InvItemInCDetails;
@@ -914,11 +901,11 @@
}
var totalCount = 0;
- var result = Db
- .Queryable<MesInvItemIns, MesDepots, MesSupplier>((a, b, c) =>
- new JoinQueryInfos(JoinType.Left,
- a.DepotsId == b.DepotId,
- JoinType.Left, a.SuppId == c.Id.ToString()))
+ var result = Db.Queryable<MesInvItemIns, MesDepots, MesSupplier>(
+ (a, b, c) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.DepotsId == b.DepotId,
+ JoinType.Left, a.SuppId == c.Id.ToString()))
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
(a, b, c) => a.Guid == parsedGuid)
.Select((a, b, c) => new MesInvItemIns
@@ -950,9 +937,8 @@
if (!isValid)
throw new ApplicationException("GUID杞崲閿欒");
- var result = Db
- .Queryable<MesInvItemInCDetails, MesItems, MesUnit>((g, c, d) =>
- new JoinQueryInfos(
+ var result = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit>(
+ (g, c, d) => new JoinQueryInfos(
JoinType.Left, g.ItemId == c.Id,
JoinType.Inner, d.Id == Convert.ToDecimal(g.Unit)
)
@@ -982,9 +968,8 @@
if (!isValid)
throw new ApplicationException("GUID杞崲閿欒");
- var result = Db
- .Queryable<MesInvItemInCDetails, MesItems, MesUnit>((g, c, d) =>
- new JoinQueryInfos(
+ var result = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit>(
+ (g, c, d) => new JoinQueryInfos(
JoinType.Left,
g.ItemId == c.Id, JoinType.Inner,
d.Id.ToString() == c.Fpurchaseunitid
@@ -1101,15 +1086,15 @@
if (invItemIns.Status == 1) throw new Exception("鍏ュ簱鍗曞凡瀹℃牳锛屼笉鑳介噸澶嶆帹閫�");
var materials = Db.Queryable<MesInvItemInCItems, MesItems, MesUnit,
- MesInvItemArnDetail>((g, c, d, a) => new JoinQueryInfos(
- JoinType.Left,
- g.ItemId == c.Id, JoinType.Inner,
- d.Id.ToString() == c.Fpurchaseunitid,
- JoinType.Inner,
- a.Ebeln == g.WorkNo && g.CbillNo == a.CbillNo
- )
- ).Where((g, c, d, a) => g.BillNo == billNo)
- .Select<Material>((g, c, d, a) => new Material
+ MesInvItemArnDetail>(
+ (g, c, d, a) => new JoinQueryInfos(
+ JoinType.Left,
+ g.ItemId == c.Id, JoinType.Inner,
+ d.Id.ToString() == c.Fpurchaseunitid,
+ JoinType.Inner, a.Ebeln == g.WorkNo && g.CbillNo == a.CbillNo
+ )
+ ).Where((g, c, d, a) => g.BillNo == billNo).Select<Material>(
+ (g, c, d, a) => new Material
{
FMaterialId = c.ItemNo,
FRealQty = g.Quantity.ToString(),
diff --git a/service/Warehouse/MesInvItemOutCDetailsManager.cs b/service/Warehouse/MesInvItemOutCDetailsManager.cs
index 72c3cb3..3547138 100644
--- a/service/Warehouse/MesInvItemOutCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemOutCDetailsManager.cs
@@ -28,10 +28,10 @@
var entity = Db
- .Queryable<MesInvItemOutCDetails, MesInvItemOuts, MesItems>((a, b,
- c) =>
- new JoinQueryInfos(JoinType.Left, a.ItemOutId == b.Guid,
- JoinType.Left, a.ItemNo == c.ItemNo))
+ .Queryable<MesInvItemOutCDetails, MesInvItemOuts, MesItems>(
+ (a, b, c) =>
+ new JoinQueryInfos(JoinType.Left, a.ItemOutId == b.Guid,
+ JoinType.Left, a.ItemNo == c.ItemNo))
.Where((a, b, c) => a.ItemBarcode == query.barcode)
.Select((a, b, c) => new MesInvItemOutCDetails
{
diff --git a/service/Warehouse/MesInvItemOutsManager.cs b/service/Warehouse/MesInvItemOutsManager.cs
index 5fd556a..413e251 100644
--- a/service/Warehouse/MesInvItemOutsManager.cs
+++ b/service/Warehouse/MesInvItemOutsManager.cs
@@ -68,11 +68,11 @@
if (!isValid)
throw new ApplicationException("GUID杞崲閿欒");
- var mesInvItemOutItemsList = Db
- .Queryable<MesInvItemOutItems, MesItems>((c, s) => new object[]
- {
- JoinType.Inner, c.ItemId == s.Id
- }).Where((c, s) => c.ItemOutId == parsedGuid)
+ var mesInvItemOutItemsList = Db.Queryable<MesInvItemOutItems, MesItems>(
+ (c, s) => new object[]
+ {
+ JoinType.Inner, c.ItemId == s.Id
+ }).Where((c, s) => c.ItemOutId == parsedGuid)
.Select<MesInvItemOutItems>((c, s) => new MesInvItemOutItems
{
Guid = c.Guid,
@@ -272,8 +272,8 @@
foreach (var j in itemOutItems)
{
// 鏍￠獙瀛愯〃瀵瑰簲閲囪喘璁㈠崟鐨勪緵搴斿晢缂栫爜
- var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>((roh, supp) =>
- new JoinQueryInfos(
+ var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>(
+ (roh, supp) => new JoinQueryInfos(
JoinType.Left,
roh.Supplier == supp.Id.ToString()
))
@@ -392,7 +392,8 @@
it.Status == 1)
.ToPageList(1, 20);
- var ItemOutNos = data5.FindAll(a => a.Nflag == null || a.Nflag == 0);
+ var ItemOutNos = data5.FindAll(a => a.Nflag == null || a.Nflag == 0)
+ .ToList();
return ItemOutNos;
}
@@ -432,12 +433,13 @@
var mesInvItemOutCDetailsList = Db
.Queryable<MesInvItemOutCDetails, MesInvItemBarcodes, MesItems,
- MesDepots>((b, bar, c, d) => new
- JoinQueryInfos(
- JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
- JoinType.Left, b.ItemId == c.Id,
- JoinType.Left, b.DepotId == d.DepotId
- ))
+ MesDepots>(
+ (b, bar, c, d) => new
+ JoinQueryInfos(
+ JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
+ JoinType.Left, b.ItemId == c.Id,
+ JoinType.Left, b.DepotId == d.DepotId
+ ))
.Where((b, bar, c, d) => b.ItemOutId == parsedGuid)
.Select((b, bar, c, d) => new MesInvItemOutCDetails
{
@@ -504,15 +506,15 @@
var materials = Db
.Queryable<MesInvItemOuts, MesInvItemOutItems,
- MesItems, MesUnit, MesInvItemArnDetail, MesDepots>((a, b, c, d,
- e, f) => new JoinQueryInfos(
- JoinType.Left, a.Guid == b.ItemOutId,
- JoinType.Left, b.ItemId == c.Id,
- JoinType.Left, d.Id.ToString() == c.ItemUnit,
- JoinType.Left,
- e.CbillNo == b.WorkNo && e.ItemId == b.ItemId,
- JoinType.Left, f.DepotId == a.DepotId
- )).Where((a, b, c, d, e, f) => b.Guid == guid)
+ MesItems, MesUnit, MesInvItemArnDetail, MesDepots>(
+ (a, b, c, d, e, f) => new JoinQueryInfos(
+ JoinType.Left, a.Guid == b.ItemOutId,
+ JoinType.Left, b.ItemId == c.Id,
+ JoinType.Left, d.Id.ToString() == c.ItemUnit,
+ JoinType.Left,
+ e.CbillNo == b.WorkNo && e.ItemId == b.ItemId,
+ JoinType.Left, f.DepotId == a.DepotId
+ )).Where((a, b, c, d, e, f) => b.Guid == guid)
.Select<Material>((a, b, c, d, e, f) => new Material
{
FMaterialId = c.ItemNo,
@@ -719,9 +721,8 @@
C_STOCKNUM = c_mes_inv_item_stocks.Quantity.Value;
// Calculate the total and completed quantities for the item
- var quantities = db
- .Queryable<MesInvItemOutItems, MesInvItemOuts>((s, d) =>
- new object[]
+ var quantities = db.Queryable<MesInvItemOutItems, MesInvItemOuts>(
+ (s, d) => new object[]
{
JoinType.Left, s.ItemOutId == d.Guid
})
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index 09ed76a..a0ae6af 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -1,13 +1,14 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using System.Text;
+锘縰sing Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
-using DbType = System.Data.DbType;
+using System.Data;
+using System.Text;
+using System.Data.SqlClient;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -28,9 +29,9 @@
new("@type", query.type),
new("@dateTime", query.dateTime == "" ? null : query.dateTime),
new("@lineNo", query.lineNo)
+
};
- var sql2 = new StringBuilder(
- "exec prc_pda_itemBl_billNoList @type,@orgId,@dateTime,@lineNo");
+ var sql2 = new StringBuilder("exec prc_pda_itemBl_billNoList @type,@orgId,@dateTime,@lineNo");
var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
@@ -52,9 +53,7 @@
// 妫�鏌ヨˉ鏂欏崟鏄惁瀛樺湪涓斾负鐢熶骇琛ユ枡绫诲瀷
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a =>
- a.BlNo == query.billNo && a.Bl008 == query.Type &&
- a.Bl018 == true)
+ .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type && a.Bl018 == true)
.First();
if (mesItemBl == null)
@@ -80,8 +79,7 @@
// .ToList();
//return (mesItemBl.Bl001, blDetails);
- var sql = string.Format(
- @"SELECT c.id as ItemId,c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
+ var sql = string.Format(@"SELECT c.id as ItemId,c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
dbo.F_QX_GETRECODEPOTSE(A.bld012,'','','') as RecoKw,D.daa001
fROM MES_ITEM_BL_DETAIL A
LEFT JOIN MES_ITEM_BL B ON A.MID = B.ID
@@ -108,7 +106,7 @@
}
/// <summary>
- /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
+ /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -134,52 +132,42 @@
throw new Exception("鐢宠鍗曞彿涓嶈兘涓虹┖锛�");
// 鍑嗗璋冪敤瀛樺偍杩囩▼鐨勫弬鏁�
- var outMsg = "";
- var outSum = -1;
+ string outMsg = "";
+ int outSum = -1;
decimal barcodeNum = 0;
decimal splitNum = 0;
try
{
// 璋冪敤瀛樺偍杩囩▼
- var parameters = new[]
+ var parameters = new SqlParameter[]
{
- new SqlParameter("@C_USER", SqlDbType.NVarChar, 100)
- { Value = query.userName ?? string.Empty },
- new SqlParameter("@P_BILL_NO", SqlDbType.NVarChar, 50)
- { Value = query.billNo ?? string.Empty },
- new SqlParameter("@P_ITEM_BARCODE", SqlDbType.NVarChar, 100)
- { Value = query.barcode ?? string.Empty },
- new SqlParameter("@P_BL_NO", SqlDbType.NVarChar, 100)
- { Value = query.blNo ?? string.Empty },
- new SqlParameter("@P_TYPE", SqlDbType.NVarChar, 20)
- { Value = query.Type ?? string.Empty },
- new SqlParameter("@OUT_MSG", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new SqlParameter("@OUT_SUM", SqlDbType.Int)
- { Direction = ParameterDirection.Output },
- new SqlParameter("@BARCODE_NUM", SqlDbType.Decimal)
- {
- Direction = ParameterDirection.Output,
- Precision = 18,
- Scale = 10
- },
- new SqlParameter("@SPLIT_NUM", SqlDbType.Decimal)
- {
- Direction = ParameterDirection.Output,
- Precision = 18,
- Scale = 10
- }
+ new SqlParameter("@C_USER", SqlDbType.NVarChar, 100) { Value = query.userName ?? string.Empty },
+ new SqlParameter("@P_BILL_NO", SqlDbType.NVarChar, 50) { Value = query.billNo ?? string.Empty },
+ new SqlParameter("@P_ITEM_BARCODE", SqlDbType.NVarChar, 100) { Value = query.barcode ?? string.Empty },
+ new SqlParameter("@P_BL_NO", SqlDbType.NVarChar, 100) { Value = query.blNo ?? string.Empty },
+ new SqlParameter("@P_TYPE", SqlDbType.NVarChar, 20) { Value = query.Type ?? string.Empty },
+ new SqlParameter("@OUT_MSG", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new SqlParameter("@OUT_SUM", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new SqlParameter("@BARCODE_NUM", SqlDbType.Decimal) {
+ Direction = ParameterDirection.Output,
+ Precision = 18,
+ Scale = 10
+ },
+ new SqlParameter("@SPLIT_NUM", SqlDbType.Decimal) {
+ Direction = ParameterDirection.Output,
+ Precision = 18,
+ Scale = 10
+ }
};
// 鎵ц瀛樺偍杩囩▼
- var procedureName = "PRC_PDA_SCBLCL";
- var res =
- DbHelperSQL.RunProcedure_NonQuery(procedureName, parameters);
+ string procedureName = "PRC_PDA_SCBLCL";
+ int res = DbHelperSQL.RunProcedure_NonQuery(procedureName, parameters);
// 鑾峰彇杈撳嚭鍙傛暟
outMsg = parameters[5].Value?.ToString() ?? "";
- outSum = parameters[6].Value as int? ?? 0; // 榛樿鍊兼牴鎹渶姹傝皟鏁�
+ outSum = parameters[6].Value as int? ?? 0; // 榛樿鍊兼牴鎹渶姹傝皟鏁�
barcodeNum = parameters[7].Value as decimal? ?? 0m;
splitNum = parameters[8].Value as decimal? ?? 0m;
@@ -192,11 +180,10 @@
query.Num = barcodeNum;
// 鑾峰彇寰呭彂鏂欐槑缁嗗垪琛�
- var pendingList = Db
- .Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
+ var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
- && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
+ && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
.Select((a, b) => new MesItemBlDetail
{
Bld012 = b.Bld012,
@@ -210,18 +197,17 @@
return (query, pendingList);
}
-
- if (outSum == -1) // 澶勭悊澶辫触
+ else if (outSum == -1) // 澶勭悊澶辫触
+ {
throw new Exception(outMsg);
-
- if (outSum == 1) // 澶勭悊鎴愬姛
+ }
+ else if (outSum == 1) // 澶勭悊鎴愬姛
{
// 鑾峰彇鏈�缁堢殑寰呭彂鏂欐槑缁嗗垪琛�
- var finalPendingList = Db
- .Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
+ var finalPendingList = Db.Queryable<MesItemBl, MesItemBlDetail>(
+ (a, b) => new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
- && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
+ && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
.Select((a, b) => new MesItemBlDetail
{
Bld012 = b.Bld012,
@@ -237,8 +223,10 @@
query.message = outMsg;
return (query, finalPendingList);
}
-
- throw new Exception("鏈煡鐨勫鐞嗙粨鏋滅姸鎬�");
+ else
+ {
+ throw new Exception("鏈煡鐨勫鐞嗙粨鏋滅姸鎬�");
+ }
}
catch (Exception ex)
{
@@ -262,6 +250,7 @@
public ProductionPickDto SplitBarcode(
WarehouseQuery query)
{
+
// Validate input parameters
if (string.IsNullOrEmpty(query.userName))
throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
@@ -280,34 +269,31 @@
// Prepare parameters for the stored procedure
var parameters = new List<SugarParameter>
- {
- new("@C_USER", query.userName),
- new("@P_BILL_NO", query.billNo),
- new("@P_ITEM_BARCODE", query.barcode),
- new("@P_BL_NO", query.blNo),
- new("@P_TYPE", query.Type),
- new("@NUM", query.Num),
- new("@OUT_MSG", "", DbType.String, ParameterDirection.Output),
- new("@OUT_SUM", 0, DbType.Int32, ParameterDirection.Output),
- new("@OUT_CF_BAR", "", DbType.String, ParameterDirection.Output)
- };
+{
+ new SugarParameter("@C_USER", query.userName),
+ new SugarParameter("@P_BILL_NO", query.billNo),
+ new SugarParameter("@P_ITEM_BARCODE", query.barcode),
+ new SugarParameter("@P_BL_NO", query.blNo),
+ new SugarParameter("@P_TYPE", query.Type),
+ new SugarParameter("@NUM", query.Num),
+ new SugarParameter("@OUT_MSG", "", System.Data.DbType.String, ParameterDirection.Output),
+ new SugarParameter("@OUT_SUM", 0, System.Data.DbType.Int32, ParameterDirection.Output),
+ new SugarParameter("@OUT_CF_BAR", "", System.Data.DbType.String, ParameterDirection.Output)
+};
// Execute the stored procedure
- Db.Ado.UseStoredProcedure()
- .ExecuteCommand("PRC_PDA_SCBLCL_CF", parameters);
+ Db.Ado.UseStoredProcedure().ExecuteCommand("PRC_PDA_SCBLCL_CF", parameters);
// Get output parameters
- var outMsg = parameters
- .FirstOrDefault(p => p.ParameterName == "@OUT_MSG")?.Value
- ?.ToString();
- var outSum = Convert.ToInt32(parameters
- .FirstOrDefault(p => p.ParameterName == "@OUT_SUM")?.Value ?? -1);
- var outCfBar = parameters
- .FirstOrDefault(p => p.ParameterName == "@OUT_CF_BAR")?.Value
- ?.ToString();
+ var outMsg = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_MSG")?.Value?.ToString();
+ var outSum = Convert.ToInt32(parameters.FirstOrDefault(p => p.ParameterName == "@OUT_SUM")?.Value ?? -1);
+ var outCfBar = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_CF_BAR")?.Value?.ToString();
// Handle the result
- if (outSum == -1) throw new Exception(outMsg ?? "鎿嶄綔澶辫触");
+ if (outSum == -1)
+ {
+ throw new Exception(outMsg ?? "鎿嶄綔澶辫触");
+ }
// Get pending list for the supplement order
var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
@@ -328,8 +314,8 @@
var dto = new ProductionPickDto
{
daa001 = query.billNo,
- barcode = query.barcode, //鍘熸潯鐮�
- cfBarcode = outCfBar //鎷嗗垎鍚庢潯鐮�
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = outCfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -350,7 +336,6 @@
return LineInfo;
}
-
#endregion
#region 鐢熶骇瓒呴
@@ -634,7 +619,7 @@
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
- DepotId = stockBarcode.DepotId.ToString()
+ DepotId = stockBarcode.DepotId.ToString(),
// Unit = blDetail.Bld009,
// DepotId = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -674,7 +659,7 @@
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
DepotId = (int)stockBarcode.DepotId,
- Dabid = womdab.Guid
+ Dabid = womdab.Guid,
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆涓氬姟娴佹按
@@ -751,9 +736,9 @@
});
// 鑾峰彇鏈�缁堢殑寰呭鐞嗗垪琛�
- var finalPendingList = Db
- .Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
+ var finalPendingList = Db.Queryable<MesItemBl, MesItemBlDetail>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
.Select((a, b) => new MesItemBlDetail
@@ -1194,9 +1179,7 @@
// 妫�鏌ヨˉ鏂欏崟鏄惁瀛樺湪涓斾负鐢熶骇琛ユ枡绫诲瀷
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a =>
- a.BlNo == query.billNo && a.Bl008 == query.Type &&
- a.Bl018 == true)
+ .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type && a.Bl018 == true)
.First();
if (mesItemBl == null)
@@ -1222,8 +1205,7 @@
// .ToList();
//return (mesItemBl.Bl001, blDetails);
- var sql = string.Format(
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
+ var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
dbo.F_QX_GETRECODEPOTSE(A.bld012,'','','') as RecoKw,D.daa001
fROM MES_ITEM_BL_DETAIL A
LEFT JOIN MES_ITEM_BL B ON A.MID = B.ID
diff --git a/service/Warehouse/MesItemQtManager.cs b/service/Warehouse/MesItemQtManager.cs
index 2ee0c44..e6438e5 100644
--- a/service/Warehouse/MesItemQtManager.cs
+++ b/service/Warehouse/MesItemQtManager.cs
@@ -1,11 +1,14 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -17,7 +20,7 @@
/// </summary>
/// <returns>閫�鏂欏崟鍙峰垪琛�</returns>
public dynamic GetPendingQtList(dynamic RequestInfo)
- {
+ {
var orgId = RequestInfo.OrgId;
if (orgId == null)
@@ -26,18 +29,17 @@
// 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
var parameters = new[]
{
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
};
try
{
// 杩斿洖鍗曞彿瀛楃涓插垪琛�
var blDetails = Db.Ado.SqlQuery<string>(
- "EXEC prc_pda_qtck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
+ "EXEC prc_pda_qtck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
return blDetails;
}
catch (Exception ex)
@@ -59,26 +61,25 @@
throw new Exception("缁勭粐涓嶅瓨鍦紒");
var parameters = new[]
- {
- new SugarParameter("@billNo", query.billNo),
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
+{
+ new SugarParameter("@billNo",query.billNo),
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
};
try
{
- var blDetails = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_qtck_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
- var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
- var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_qtck_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
return new
{
- items,
- ysitems,
- allList = blDetails
+ items = items,
+ ysitems = ysitems,
+ allList = blDetails,
};
}
catch (Exception ex)
@@ -89,7 +90,7 @@
}
/// <summary>
- /// 鎵爜鍑哄簱
+ /// 鎵爜鍑哄簱
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -124,6 +125,8 @@
throw new Exception($"mes涓笉瀛樺湪姝ゆ潯鐮�,璇锋牳瀵癸紒{p_item_barcode}");
+
+
// 鑾峰彇搴撳瓨淇℃伅
var stock = Db.Queryable<MesInvItemStocks>()
.Where(it => it.ItemBarcode == p_item_barcode && it.Quantity > 0)
@@ -151,9 +154,7 @@
// 鑾峰彇鍏朵粬鍑哄簱鍗曚俊鎭�
var mesItemQt = Db.Queryable<MesItemQt>()
- .Where(it =>
- it.Qtck == p_bill_no && it.Qt015 == true && it.Qt026 == true &&
- it.Qt029 == true && it.Qt032 == true)
+ .Where(it => it.Qtck == p_bill_no && it.Qt015 == true && it.Qt026 == true && it.Qt029 == true && it.Qt032 == true)
.First();
if (mesItemQt == null)
@@ -169,14 +170,17 @@
if (qtDetail == null) throw new Exception("鎵爜鐗╂枡闈炴湰娆″嚭搴撶敵璇风墿鏂欙紝璇锋牳瀵癸紒");
- if (mesItemQt.Qt014)
+ if (mesItemQt.Qt014 == true)
throw new Exception($"鍏朵粬鍑哄簱鐢宠鍗� {p_bill_no} 宸插畬缁擄紝璇风‘璁わ紒");
// 妫�鏌ヤ粨搴撴槸鍚︿竴鑷�
- if (qtDetail.DepotId != stock.DepotId)
+ if (qtDetail.DepotId != stock.DepotId)
throw new Exception(
$"鎵爜鍑鸿揣浠撳簱id{qtDetail.DepotId}涓庡叾浠栧嚭搴撶敵璇蜂粨搴搟stock.DepotId}涓嶄竴鑷达紝璇锋牳瀵癸紒");
+
+
+
// 妫�鏌ュ墿浣欐暟閲�
var remainingQty = (qtDetail.Qd007 ?? 0) - (qtDetail.Qd008 ?? 0);
@@ -187,8 +191,8 @@
if (stock.Quantity > remainingQty)
{
var pendingList = Db
- .Queryable<MesItemQt, MesItemQtDatall, MesItems>((a, b, c) =>
- new JoinQueryInfos(
+ .Queryable<MesItemQt, MesItemQtDatall, MesItems>(
+ (a, b, c) => new JoinQueryInfos(
JoinType.Left, a.Guid == b.QtGuid,
JoinType.Left, b.ItemId == c.Id.ToString()))
.Where((a, b, c) => a.Qtck == p_bill_no &&
@@ -207,7 +211,7 @@
var message =
$"璇风‘璁ゅ彂鏂欐暟閲忥紒锛佸凡甯﹀嚭婊¤冻鍏朵粬鍑哄簱鍗曠殑鍙戞枡鏁伴噺 {remainingQty} 纭鍚庤鐐瑰嚮鏉＄爜鎷嗗垎";
- throw new Exception("鏉＄爜鏁伴噺瓒呭嚭鍙戞枡鏁伴噺锛岃鎷嗗垎鍚庡啀鎵弿锛�");
+ throw new Exception($"鏉＄爜鏁伴噺瓒呭嚭鍙戞枡鏁伴噺锛岃鎷嗗垎鍚庡啀鎵弿锛�");
query.itemNo = stock.ItemNo;
query.Num = stock.Quantity;
@@ -295,8 +299,7 @@
// 妫�鏌ユ槸鍚﹀凡瀛樺湪鍑哄簱鐗╂枡璁板綍
var existingOutItem = Db.Queryable<MesInvItemOutItems>()
.Where(it =>
- it.ItemOutId == outId && it.ItemId == barcode.ItemId &&
- it.ItemDabid == qtDetail.Guid)
+ it.ItemOutId == outId && it.ItemId == barcode.ItemId && it.ItemDabid == qtDetail.Guid)
.First();
if (existingOutItem == null)
@@ -338,9 +341,7 @@
commit += db.Updateable<MesInvItemOutItems>()
.SetColumns(it =>
it.TlQty == (it.TlQty ?? 0) + stock.Quantity)
- .Where(it =>
- it.ItemOutId == outId && it.ItemId == barcode.ItemId &&
- it.ItemDabid == qtDetail.Guid)
+ .Where(it => it.ItemOutId == outId && it.ItemId == barcode.ItemId && it.ItemDabid == qtDetail.Guid)
.ExecuteCommand();
}
@@ -431,8 +432,8 @@
.ExecuteCommand();
mesItemQtDatalls = Db
- .Queryable<MesItemQt, MesItemQtDatall, MesItems>((a, b, c) =>
- new JoinQueryInfos(
+ .Queryable<MesItemQt, MesItemQtDatall, MesItems>(
+ (a, b, c) => new JoinQueryInfos(
JoinType.Left, a.Guid == b.QtGuid,
JoinType.Left, b.ItemId == c.Id.ToString()))
.Where((a, b, c) => a.Qtck == p_bill_no &&
@@ -465,10 +466,8 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "銆怭DA銆戝叾浠栧嚭搴撱�傛潯鐮併��" + query.barcode + "銆戞暟閲忋��" +
- stock.Quantity + "銆� 鍑哄簱鍗曞彿銆�" + outNo + "銆�";
- logService.CreateLog(db, query.userName, mesItemQt.Guid.ToString(),
- "MES_ITEM_QT", LogMsg, mesItemQt.Qtck);
+ var LogMsg = "銆怭DA銆戝叾浠栧嚭搴撱�傛潯鐮併��" + query.barcode + "銆戞暟閲忋��"+ stock.Quantity.ToString() + "銆� 鍑哄簱鍗曞彿銆�" + outNo + "銆�";
+ logService.CreateLog(db, query.userName, mesItemQt.Guid.ToString(), "MES_ITEM_QT", LogMsg, mesItemQt.Qtck);
if (commit < 5) throw new Exception("鏇存柊澶辫触");
@@ -479,7 +478,7 @@
}
/// <summary>
- /// 鎷嗗垎鏉＄爜骞跺嚭搴�
+ /// 鎷嗗垎鏉＄爜骞跺嚭搴�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -864,8 +863,8 @@
// 鑾峰彇鍓╀綑寰呭鐞嗘槑缁�
mesItemQtDatalls = db
- .Queryable<MesItemQt, MesItemQtDatall, MesItems>((a, b, c) =>
- new JoinQueryInfos(
+ .Queryable<MesItemQt, MesItemQtDatall, MesItems>(
+ (a, b, c) => new JoinQueryInfos(
JoinType.Left, a.Guid == b.QtGuid,
JoinType.Left, b.ItemId == c.Id.ToString()))
.Where((a, b, c) => a.Qtck == p_bill_no &&
@@ -890,7 +889,7 @@
/// <summary>
- /// 鍏朵粬鍑哄簱锛堟柊锛夊瓨鍌ㄨ繃绋�
+ /// 鍏朵粬鍑哄簱锛堟柊锛夊瓨鍌ㄨ繃绋�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -902,8 +901,7 @@
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
- if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�"); if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
using (var cmd = new SqlCommand("[prc_pda_QTCK]", conn))
{
@@ -971,7 +969,7 @@
var _strMsg = "";
var _intSum = "";
- var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("[prc_pda_QTCK_CF]", conn))
@@ -1007,8 +1005,8 @@
var dto = new ProductionPickDto
{
daa001 = query.billNo,
- barcode = query.barcode, //鍘熸潯鐮�
- cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
diff --git a/service/Warehouse/MesItemQtrkManager.cs b/service/Warehouse/MesItemQtrkManager.cs
index 8c3615a..e56aab2 100644
--- a/service/Warehouse/MesItemQtrkManager.cs
+++ b/service/Warehouse/MesItemQtrkManager.cs
@@ -1,10 +1,10 @@
-锘縰sing System.Text.RegularExpressions;
-using NewPdaSqlServer.DB;
+锘縰sing NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Text.RegularExpressions;
namespace NewPdaSqlServer.service.Warehouse;
@@ -20,18 +20,17 @@
// 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
var parameters = new[]
{
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
};
try
{
// 杩斿洖鍗曞彿瀛楃涓插垪琛�
var blDetails = Db.Ado.SqlQuery<string>(
- "EXEC prc_pda_qtrk_list @pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
+ "EXEC prc_pda_qtrk_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
return blDetails;
}
catch (Exception ex)
@@ -48,24 +47,24 @@
throw new Exception("缁勭粐涓嶅瓨鍦紒");
var parameters = new[]
- {
- new SugarParameter("@billNo", query.billNo),
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
+{
+ new SugarParameter("@billNo",query.billNo),
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
};
try
{
- var blDetails = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_qtrk_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
- var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
- var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_qtrk_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
return new
{
- items, ysitems
+ items = items,
+ ysitems = ysitems
};
}
catch (Exception ex)
@@ -77,14 +76,13 @@
public dynamic ScanInDepotsQT(WarehouseQuery query)
{
- var sectionCode = query.sectionCode;
+ var sectionCode = query.sectionCode;
var billNo = query.billNo;
// 1. 楠岃瘉搴撲綅鏉＄爜鏄惁涓虹┖
if (string.IsNullOrEmpty(sectionCode)) throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
- var sqlParams = new List<SugarParameter>
- { new("@sectionCode", sectionCode) };
+ var sqlParams = new List<SugarParameter> { new("@sectionCode", sectionCode) };
var sql2 = @" SELECT TOP 1 b.depot_code,
b.depot_id,
@@ -97,7 +95,7 @@
var depotInfo = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams).First();
- if (depotInfo is null)
+ if (depotInfo is null)
throw new Exception($"搴撲綅缂栫爜 {sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
// 5. 杩斿洖鎴愬姛淇℃伅
@@ -120,8 +118,9 @@
throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
// 2. 鏌ヨ搴撲綅瀵瑰簲鐨勪粨搴撶紪鐮佸拰浠撳簱ID
- var depotInfo = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.DepotGuid == b.Guid))
+ var depotInfo = Db.Queryable<MesDepotSections, MesDepots>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Inner, a.DepotGuid == b.Guid))
.Where((a, b) => a.DepotSectionCode == p_section_code)
.Select((a, b) => new { b.DepotCode, b.DepotId })
.First();
@@ -132,8 +131,7 @@
var c_depot_code = depotInfo.DepotCode;
var c_depot_id = depotInfo.DepotId;
- var sqlParams = new List<SugarParameter>
- { new("@barcode", p_item_barcode), new("@billNo", p_bill_no) };
+ var sqlParams = new List<SugarParameter> { new("@barcode", p_item_barcode), new("@billNo", p_bill_no) };
// var sql1 = @" SELECT TOP 1 A.rkCkId
//FROM MES_QA_ITEMS_DETECT_01 A
@@ -145,8 +143,13 @@
// var appDepotInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams).First();
+
+
var mesDepost = Db.Queryable<MesDepots>()
- .Where(s => s.DepotId == c_depot_id).First();
+ .Where(s => s.DepotId == c_depot_id).First();
+
+
+
// 3. 楠岃瘉鏉＄爜鏄惁宸插叆搴�
@@ -178,15 +181,13 @@
if (qtrk == null) throw new Exception("鍏朵粬鍏ュ簱鐢宠鍗曚笉瀛樺湪锛�");
- if (p_bill_no != barcode.BillNo)
+ if(p_bill_no != barcode.BillNo)
throw new Exception($"璇ユ潯鐮佸搴旂殑鐢宠鍗曘�恵barcode.BillNo}銆戜笌褰撳墠鐢宠鍗曞彿涓嶅尮閰嶏紒");
if (qtrk.Qt008 != c_depot_id.ToString())
- throw new Exception(
- $"璇� {p_section_code} 瀵瑰簲鐨勪粨搴� 涓� 妫�楠屽垽瀹氱殑鍏ュ簱浠撳簱涓嶄竴鑷达紝璇风‘璁わ紒");
+ throw new Exception($"璇� {p_section_code} 瀵瑰簲鐨勪粨搴� 涓� 妫�楠屽垽瀹氱殑鍏ュ簱浠撳簱涓嶄竴鑷达紝璇风‘璁わ紒");
- var sql =
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,
+ var sql = @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,
ISNULL(A.qd007,0) FQty,ISNULL(A.qd008,0) SQty,ISNULL(A.qd007,0) - ISNULL(A.qd008,0) DSQty
FROM MES_ITEM_QTRR_DETAIL A
LEFT JOIN MES_ITEM_QTRK B ON A.qtrkGuid = B.guid
@@ -194,8 +195,7 @@
WHERE B.qtck = @billNo AND QT015 = 1 AND QT028 = 1 AND QT032 = 1 AND QT014 = 0 ";
//AND QT014 = 0
- var sqlParams1 = new List<SugarParameter>
- {
+ var sqlParams1 = new List<SugarParameter> {
new("@billNo", p_bill_no)
};
@@ -224,15 +224,20 @@
var details = new List<MesItemQtrrDetail>();
- var pattern = @"\(([^)]+)\)";
- var match = Regex.Match(qtrk.Qt023, pattern);
+ string pattern = @"\(([^)]+)\)";
+ Match match = Regex.Match(qtrk.Qt023, pattern);
var owner_type = "";
// 8.鑾峰彇璐т富绫诲瀷
if (match.Success)
+ {
owner_type = match.Groups[1].Value;
+ }
else
+ {
throw new Exception("鍏朵粬鍏ュ簱鐢宠鍗曡揣涓荤被鍨嬫湁璇�,璇锋牳瀵癸紒");
+ }
+
// 10. 鎵ц鍏ュ簱浜嬪姟
@@ -242,15 +247,14 @@
// 鏌ヨ鏄惁瀛樺湪鏈叆搴撶殑鍏ュ簱鍗�
var existingInv = db.Queryable<MesInvItemIns>()
.Where(x => x.Status == 0
- && x.InsDate.Value.ToString("yyyy-MM-dd") ==
- DateTime.Now.ToString("yyyy-MM-dd")
+ && x.InsDate.Value.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")
&& x.TransctionNo == transactionNo.ToString()
&& x.TaskNo == p_bill_no
//&& x.CbillNo == p_bill_no
&& x.BillTypeId == billTypeId
&& x.DepotsId == Convert.ToInt64(c_depot_id))
- // && x.DepotsCode == c_depot_code)
- //&& x.SuppNo == barcode.SuppNo)
+ // && x.DepotsCode == c_depot_code)
+ //&& x.SuppNo == barcode.SuppNo)
.First();
var newId = Guid.Empty;
@@ -282,9 +286,10 @@
Status = 0,
Reason = qtrk.Qt010,
TaskNo = p_bill_no,
- DepotsId = Convert.ToInt64(c_depot_id),
+ DepotsId = Convert.ToInt64(c_depot_id) ,
InType = "鍏朵粬鍏ュ簱",
ReceiveOrgId = qtrk.Qt022
+
}).IgnoreColumns(true).ExecuteCommand();
}
else
@@ -298,7 +303,7 @@
.Where(x => x.ItemInId == newId
&& x.ItemId == barcode.ItemId
&& x.DepotId == c_depot_id.ToString()
- )
+ )
//&& x.DepotCode =
.First();
@@ -329,16 +334,16 @@
LineK3id = barcode.LineK3id,
ItemId = barcode.ItemId,
DepotId = c_depot_id.ToString(),
- itemDabid = barcode.AboutGuid.ToString()
+ itemDabid = barcode.AboutGuid.ToString(),
}).IgnoreColumns(true).ExecuteCommand();
else
// 瀛樺湪鍒欐洿鏂版暟閲�
res += db.Updateable<MesInvItemInCItems>()
- .SetColumns(x =>
- x.Quantity == x.Quantity + barcode.Quantity)
+ .SetColumns(
+ x => x.Quantity == x.Quantity + barcode.Quantity)
.Where(x => x.ItemInId == newId
- && x.ItemId == barcode.ItemId
- && x.DepotId == c_depot_id.ToString())
+ && x.ItemId == barcode.ItemId
+ && x.DepotId == c_depot_id.ToString())
.ExecuteCommand();
@@ -464,7 +469,7 @@
res += db.Updateable<MesItemQtrrDetail>()
.SetColumns(x => x.Qd008 == (x.Qd008 ?? 0) + barcode.Quantity)
.Where(x => x.QtrkGuid == qtrk.Guid &&
- x.ItemId == barcode.ItemId.ToString())
+ x.ItemId == barcode.ItemId.ToString())
.ExecuteCommand();
// 妫�鏌ユ槸鍚﹀畬鍏ㄥ叆搴撳苟鏇存柊鐘舵��
@@ -478,11 +483,10 @@
.Where(x => x.Guid == detail1.Guid)
.ExecuteCommand();
- details = Db
- .Queryable<MesItemQtrk, MesItemQtrrDetail,
- MesItems>((a, b, c) => new JoinQueryInfos(
- JoinType.Left, a.Guid == b.QtrkGuid,
- JoinType.Left, c.Id.ToString() == b.ItemId))
+ details = Db.Queryable<MesItemQtrk, MesItemQtrrDetail, MesItems>(
+ (a, b, c) => new JoinQueryInfos(
+ JoinType.Left, a.Guid == b.QtrkGuid,
+ JoinType.Left, c.Id.ToString() == b.ItemId))
.Where((a, b, c) =>
a.Qtck == p_bill_no &&
(b.Qd007 ?? 0) - (b.Qd008 ?? 0) > 0)
@@ -505,10 +509,8 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "銆怭DA銆戝叾浠栧叆搴撱�傛潯鐮併��" + query.barcode + "銆戞暟閲忋��" +
- barcode.Quantity + "銆� 鍏ュ簱鍗曞彿銆�" + billNo + "銆�";
- logService.CreateLog(db, query.userName, qtrk.Guid.ToString(),
- "MES_ITEM_QTRK", LogMsg, qtrk.Qtck);
+ var LogMsg = "銆怭DA銆戝叾浠栧叆搴撱�傛潯鐮併��" + query.barcode + "銆戞暟閲忋��" + barcode.Quantity.ToString() + "銆� 鍏ュ簱鍗曞彿銆�" + billNo + "銆�";
+ logService.CreateLog(db, query.userName, qtrk.Guid.ToString(), "MES_ITEM_QTRK", LogMsg, qtrk.Qtck);
if (res < 5) throw new Exception("鎻掑叆鎴栨洿鏂板け璐�");
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index 8b0fa5c..6b1ef67 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -1,11 +1,14 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Security.Cryptography;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -28,19 +31,18 @@
// 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
var parameters = new[]
{
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@type", query.Type),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@type", query.Type),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
};
try
{
// 杩斿洖鍗曞彿瀛楃涓插垪琛�
var blDetails = Db.Ado.SqlQuery<string>(
- "EXEC prc_pda_sctl_list @pi_orgId,@type,@inP1,@inP2,@inP3,@inP4",
- parameters);
+ "EXEC prc_pda_sctl_list @pi_orgId,@type,@inP1,@inP2,@inP3,@inP4", parameters);
return blDetails;
}
catch (Exception ex)
@@ -54,8 +56,7 @@
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>鐗╂枡鏄庣粏鍒楄〃</returns>
- public dynamic GetMesItemTblDetailByBillNo(dynamic query,
- dynamic RequestInfo)
+ public dynamic GetMesItemTblDetailByBillNo(dynamic query, dynamic RequestInfo)
{
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
@@ -73,25 +74,24 @@
// 鑾峰彇鏈畬鎴愮殑閿�鍞��璐ф槑缁�
var parameters = new[]
- {
- new SugarParameter("@billNo", query.billNo),
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
- };
+{
+ new SugarParameter("@billNo", query.billNo),
+ new SugarParameter("@pi_orgId",orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
try
{
- var blDetails = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_sctl_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
- var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
- var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_sctl_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
return new
{
- items,
- ysitems,
+ items = items,
+ ysitems = ysitems,
Count = items.Count + ysitems.Count
};
}
@@ -134,7 +134,7 @@
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊缁撴灉</returns>
- public dynamic SctlScanBarcode(WarehouseQuery query, dynamic RequestInfo)
+ public dynamic SctlScanBarcode(WarehouseQuery query,dynamic RequestInfo)
{
// 楠岃瘉鏉＄爜淇℃伅
var barcode = Db.Queryable<MesInvItemBarcodes>()
@@ -184,17 +184,14 @@
new SqlParameter("@pi_orgId", orgId),
new SqlParameter("@PI_INP1", DBNull.Value),
new SqlParameter("@PI_INP2", DBNull.Value),
- new SqlParameter("@PO_OUT_MSG", SqlDbType.NVarChar)
- { Direction = ParameterDirection.Output, Size = 2000 },
- new SqlParameter("@PO_OUT_SUM", SqlDbType.Int)
- { Direction = ParameterDirection.Output },
- new SqlParameter("@PO_ITEM_NO", SqlDbType.NVarChar)
- { Direction = ParameterDirection.Output, Size = 100 },
+ new SqlParameter("@PO_OUT_MSG", SqlDbType.NVarChar) { Direction = ParameterDirection.Output, Size = 2000 },
+ new SqlParameter("@PO_OUT_SUM", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new SqlParameter("@PO_ITEM_NO", SqlDbType.NVarChar) { Direction = ParameterDirection.Output, Size = 100 },
new SqlParameter("@PO_QUANTITY", SqlDbType.Decimal)
{
Direction = ParameterDirection.Output,
- Precision = 18, // 鏍规嵁瀹為檯鏁版嵁搴撶簿搴﹁皟鏁�
- Scale = 10 // 鏍规嵁瀹為檯鏁版嵁搴撳皬鏁颁綅璋冩暣
+ Precision = 18, // 鏍规嵁瀹為檯鏁版嵁搴撶簿搴﹁皟鏁�
+ Scale = 10 // 鏍规嵁瀹為檯鏁版嵁搴撳皬鏁颁綅璋冩暣
}
};
@@ -202,13 +199,9 @@
cmd.ExecuteNonQuery();
var outMsg = parameters[7].Value?.ToString() ?? string.Empty;
- var outSum = parameters[8].Value != DBNull.Value
- ? Convert.ToInt32(parameters[8].Value)
- : -1;
+ var outSum = parameters[8].Value != DBNull.Value ? Convert.ToInt32(parameters[8].Value) : -1;
var itemNo = parameters[9].Value?.ToString() ?? string.Empty;
- var quantity = parameters[10].Value != DBNull.Value
- ? Convert.ToDecimal(parameters[10].Value)
- : 0m;
+ var quantity = parameters[10].Value != DBNull.Value ? Convert.ToDecimal(parameters[10].Value) : 0m;
if (outSum == -1) throw new Exception(outMsg);
@@ -218,13 +211,13 @@
return query;
}
catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- finally
- {
- conn.Close();
- }
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
}
}
}
\ No newline at end of file
diff --git a/service/Warehouse/MesKwcxManager.cs b/service/Warehouse/MesKwcxManager.cs
index f4c72cb..74b7559 100644
--- a/service/Warehouse/MesKwcxManager.cs
+++ b/service/Warehouse/MesKwcxManager.cs
@@ -1,7 +1,12 @@
-锘縰sing System.Text;
+锘縰sing Masuit.Tools;
using NewPdaSqlServer.DB;
+using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Text;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
@@ -10,44 +15,44 @@
public dynamic GetBarInfoList(dynamic unity)
{
var sqlParams = new List<SugarParameter>
- {
- new("@deptSectionCode", unity.deptSectionCode),
- new("@rkDate",
- string.IsNullOrWhiteSpace(unity.rkDate?.ToString())
- ? DBNull.Value
- : unity.rkDate),
- new("@zkChecked",
- unity.zkChecked?.ToString() == "True" ? 1 :
- unity.zkChecked?.ToString() == "False" ? 0 : DBNull.Value)
- };
+ {
+ new("@deptSectionCode", unity.deptSectionCode),
+ new("@rkDate", string.IsNullOrWhiteSpace(unity.rkDate?.ToString()) ? DBNull.Value : unity.rkDate),
+ new("@zkChecked", unity.zkChecked?.ToString() == "True" ? 1 : unity.zkChecked?.ToString() == "False" ? 0 : DBNull.Value)
+ };
- var sql2 = new StringBuilder(
- "exec prc_pda_kwcx_barInfoList @deptSectionCode, @rkDate, @zkChecked");
+ var sql2 = new StringBuilder("exec prc_pda_kwcx_barInfoList @deptSectionCode, @rkDate, @zkChecked");
var list = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (list.Count < 1) throw new Exception("璇ユ潯浠朵笅鏃犲搴斿簱浣嶄俊鎭紒");
+ if (list.Count < 1)
+ {
+ throw new Exception("璇ユ潯浠朵笅鏃犲搴斿簱浣嶄俊鎭紒");
+ }
return list;
}
-
public dynamic GetBarInfo(dynamic unity)
{
- var sqlParams = new List<SugarParameter>();
+ var sqlParams = new List<SugarParameter> { };
var sql2 = new StringBuilder(@"exec prc_pda_kwcx_barInfo @BARCODE");
sqlParams.Add(new("@BARCODE", unity.barcode));
var list = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (list.Count < 1) throw new Exception("璇ユ潯浠朵笅鏃犲搴旀潯鐮佷俊鎭紒");
+ if (list.Count < 1)
+ {
+ throw new Exception("璇ユ潯浠朵笅鏃犲搴旀潯鐮佷俊鎭紒");
+ }
return list[0];
}
public dynamic GetKWList(dynamic unity)
{
- var sqlParams = new List<SugarParameter>();
+
+ var sqlParams = new List<SugarParameter> { };
var sql2 = new StringBuilder(@"
select depot_code as code, depot_name as name from MES_DEPOTS");
@@ -61,9 +66,9 @@
public dynamic GetKWInfo(dynamic unity)
{
var sqlParams = new List<SugarParameter>
- {
- new("@depot_code", unity.code)
- };
+ {
+ new("@depot_code", unity.code)
+ };
var sql2 = new StringBuilder("exec prc_pda_kwcx_kwInfo @depot_code");
@@ -72,21 +77,22 @@
return KWInfo;
}
- public dynamic GetItemInfoList(dynamic unity, dynamic RequestInfo)
+ public dynamic GetItemInfoList(dynamic unity,dynamic RequestInfo)
{
- var sqlParams = new List<SugarParameter>();
+ var sqlParams = new List<SugarParameter> { };
var orgId = RequestInfo.OrgId;
- var sql2 =
- new StringBuilder(
- @"exec prc_pda_kwcx_itemInfo @barCode,@itemNo,@orgId");
+ var sql2 = new StringBuilder(@"exec prc_pda_kwcx_itemInfo @barCode,@itemNo,@orgId");
sqlParams.Add(new("@barCode", unity.barCode));
sqlParams.Add(new("@itemNo", unity.itemNo));
sqlParams.Add(new("@orgId", orgId));
var list = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (list.Count < 1) throw new Exception("璇ユ潯浠朵笅鏃犲搴旀潯鐮佷俊鎭紒");
+ if (list.Count < 1)
+ {
+ throw new Exception("璇ユ潯浠朵笅鏃犲搴旀潯鐮佷俊鎭紒");
+ }
return list;
}
diff --git a/service/Warehouse/MesOaToMesManager.cs b/service/Warehouse/MesOaToMesManager.cs
index f52146e..a9b21c6 100644
--- a/service/Warehouse/MesOaToMesManager.cs
+++ b/service/Warehouse/MesOaToMesManager.cs
@@ -3,7 +3,9 @@
using Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
-using NewPdaSqlServer.util;
+using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
+using SqlSugar;
namespace NewPdaSqlServer.service.Warehouse;
@@ -17,15 +19,14 @@
{
// 鍙傛暟鏍￠獙澧炲己
if (query.iqcExNo.IsNullOrEmpty()) throw new Exception("寮傚父鍗曞彿涓嶅厑璁镐负绌�");
- if (query.dataJson == null || !query.dataJson.Any())
- throw new Exception("妫�楠屾暟鎹笉鑳戒负绌�");
+ if (query.dataJson == null || !query.dataJson.Any()) throw new Exception("妫�楠屾暟鎹笉鑳戒负绌�");
using (var cmd = new SqlCommand("[iqc_ycd_oa_mes]", conn))
{
try
{
conn.Open();
-
+
//// 鏍￠獙MES妫�楠屽崟
//var checkSql = @"SELECT B.releaseNo AS jydNo
// FROM Mes_QC_Exceptional_Detail B
@@ -57,28 +58,27 @@
{
cmd.Parameters.Clear();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 150)
- { Direction = ParameterDirection.Output },
- new("@outSum", SqlDbType.Int)
- { Direction = ParameterDirection.Output },
- new("@ycdNo", query.iqcExNo),
- new("@jydNo", item.jyd),
- new("@xblb", item.xblb),
- new("@clyj", item.clyj),
- new("@jssl", item.jssl),
- new("@inFieldValue", 1)
+ new SqlParameter("@outMsg", SqlDbType.NVarChar, 150) { Direction = ParameterDirection.Output },
+ new SqlParameter("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new SqlParameter("@ycdNo", query.iqcExNo),
+ new SqlParameter("@jydNo", item.jyd),
+ new SqlParameter("@xblb", item.xblb),
+ new SqlParameter("@clyj", item.clyj),
+ new SqlParameter("@jssl", item.jssl),
+ new SqlParameter("@inFieldValue", 1)
};
cmd.Parameters.AddRange(parameters);
cmd.ExecuteNonQuery();
_intSum += (int)parameters[1].Value;
if ((int)parameters[1].Value <= 0)
+ {
throw new Exception(parameters[0].Value.ToString());
+ }
}
-
- var rtnMsg = $"{query.iqcExNo}瀹℃壒鎺ㄩ�丮ES鎴愬姛锛�";
+ string rtnMsg = $"{query.iqcExNo}瀹℃壒鎺ㄩ�丮ES鎴愬姛锛�";
return rtnMsg;
}
@@ -110,29 +110,29 @@
try
{
conn.Open();
- var inFieldValue = 0;
+ int inFieldValue = 0;
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@outMsg", SqlDbType.NVarChar, 150)
- { Direction = ParameterDirection.Output },
- new("@outSum", SqlDbType.Int)
- { Direction = ParameterDirection.Output },
- new("@ycdNo", query.iqcExNo),
- new("@jydNo", DBNull.Value),
- new("@xblb", DBNull.Value),
- new("@clyj", DBNull.Value),
- new("@jssl", DBNull.Value),
- new("@inFieldValue", inFieldValue)
+ new SqlParameter("@outMsg", SqlDbType.NVarChar, 150) { Direction = ParameterDirection.Output },
+ new SqlParameter("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new SqlParameter("@ycdNo", query.iqcExNo),
+ new SqlParameter("@jydNo", DBNull.Value),
+ new SqlParameter("@xblb", DBNull.Value),
+ new SqlParameter("@clyj", DBNull.Value),
+ new SqlParameter("@jssl", DBNull.Value),
+ new SqlParameter("@inFieldValue", inFieldValue)
};
cmd.Parameters.AddRange(parameters);
cmd.ExecuteNonQuery();
_intSum = (int)parameters[1].Value;
if (_intSum <= 0)
+ {
throw new Exception(parameters[0].Value.ToString());
-
+ }
+
return $"{query.iqcExNo}閫�鍥炴搷浣滄垚鍔燂紒褰卞搷璁板綍鏁帮細{_intSum}";
}
catch (Exception ex)
diff --git a/service/Warehouse/MesSctkManager.cs b/service/Warehouse/MesSctkManager.cs
index befa0c8..7a1d9bf 100644
--- a/service/Warehouse/MesSctkManager.cs
+++ b/service/Warehouse/MesSctkManager.cs
@@ -1,11 +1,12 @@
锘縰sing System.Data;
using System.Data.SqlClient;
using Masuit.Tools;
+using MES.Service.Models;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
-using NewPdaSqlServer.util;
+using SqlSugar;
namespace NewPdaSqlServer.service.Warehouse;
@@ -26,8 +27,7 @@
var mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo);
if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦�");
- var sql = string.Format(
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.SQ_NUM FQty,A.YS_NUM SQty,A.SQ_NUM - A.YS_NUM DSQty,
+ var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.SQ_NUM FQty,A.YS_NUM SQty,A.SQ_NUM - A.YS_NUM DSQty,
dbo.F_QX_GETRECODEPOTSE(A.ITEM_ID,'','','') as RecoKw
fROM MES_SCTH_SQ_DETAIL A
LEFT JOIN MES_SCTH_SQ B ON A.MID = B.ID
diff --git a/service/Warehouse/MesStrkManager.cs b/service/Warehouse/MesStrkManager.cs
index c5f74be..4152ae9 100644
--- a/service/Warehouse/MesStrkManager.cs
+++ b/service/Warehouse/MesStrkManager.cs
@@ -1,12 +1,17 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
+using MES.Service.Models;
+using MES.Service.Modes;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
+using OracleInternal.Sharding;
using SqlSugar;
+using SqlSugar.Extensions;
+using System.Data;
+using System.Data.SqlClient;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -35,8 +40,8 @@
{
// 鍏宠仈鏌ヨ鐗╂枡琛ㄣ�佺墿鏂欐槑缁嗚〃鍜岀墿鏂欏熀纭�淇℃伅琛�
var mesItemTblDetails = Db
- .Queryable<MesShouTuo, MesShouTuoDetail, MesItems>((a, b, c) =>
- new JoinQueryInfos(
+ .Queryable<MesShouTuo, MesShouTuoDetail, MesItems>(
+ (a, b, c) => new JoinQueryInfos(
JoinType.Left,
a.Guid == b.PGuid,
JoinType.Left,
@@ -62,7 +67,7 @@
}
/// <summary>
- /// 鍙楁墭鍏ュ簱鍏ュ簱
+ /// 鍙楁墭鍏ュ簱鍏ュ簱
/// </summary>
/// <param name="unity"></param>
/// <returns></returns>
@@ -74,8 +79,7 @@
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (unity.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (unity.sectionCode.IsNullOrEmpty())
- throw new Exception("搴撲綅缂栧彿涓嶅厑璁镐负绌�");
+ if (unity.sectionCode.IsNullOrEmpty()) throw new Exception("搴撲綅缂栧彿涓嶅厑璁镐负绌�");
if (unity.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
if (unity.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
@@ -93,11 +97,12 @@
new("@pi_user", unity.userName),
new("@pi_barcode", unity.barcode),
new("@pi_sectionCode", unity.sectionCode),
- new("@pi_billno", unity.billNo)
+ new("@pi_billno", unity.billNo),
+
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
- // parameters[2].Direction = ParameterDirection.Output;
+ // parameters[2].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
@@ -111,6 +116,7 @@
return _strMsg;
//return 0;
+
}
catch (Exception ex)
{
diff --git a/service/Warehouse/MesSttlManager.cs b/service/Warehouse/MesSttlManager.cs
index c0e86a2..39515ec 100644
--- a/service/Warehouse/MesSttlManager.cs
+++ b/service/Warehouse/MesSttlManager.cs
@@ -1,12 +1,17 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
+using MES.Service.Models;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
+using OracleInternal.Sharding;
using SqlSugar;
+using SqlSugar.Extensions;
+using System.Data;
+using System.Data.SqlClient;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -35,8 +40,8 @@
{
// 鍏宠仈鏌ヨ鐗╂枡琛ㄣ�佺墿鏂欐槑缁嗚〃鍜岀墿鏂欏熀纭�淇℃伅琛�
var mesItemTblDetails = Db
- .Queryable<MesShouTui, MesShouTuiDetail, MesItems>((a, b, c) =>
- new JoinQueryInfos(
+ .Queryable<MesShouTui, MesShouTuiDetail, MesItems>(
+ (a, b, c) => new JoinQueryInfos(
JoinType.Left,
a.Guid == b.PGuid,
JoinType.Left,
@@ -62,7 +67,7 @@
}
/// <summary>
- /// 鍙楁墭閫�鏂欏叆搴�
+ /// 鍙楁墭閫�鏂欏叆搴�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
diff --git a/service/Warehouse/MesXkyService.cs b/service/Warehouse/MesXkyService.cs
index 7377302..b68574a 100644
--- a/service/Warehouse/MesXkyService.cs
+++ b/service/Warehouse/MesXkyService.cs
@@ -1,37 +1,37 @@
-锘縰sing System.Collections;
-using System.Dynamic;
-using System.Net;
-using System.Net.Http.Headers;
-using System.Text;
+锘縰sing MES.Service.Models;
using NewPdaSqlServer.DB;
-using NewPdaSqlServer.Dto.Xky;
-using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System.Collections;
+using System.Data;
+using System.Net;
+using System.Net.Http.Headers;
+using System.Text;
+using NewPdaSqlServer.Dto.Xky;
using static NewPdaSqlServer.Controllers.Warehouse.MesXkyController;
-namespace NewPdaSqlServer.service.Warehouse;
+namespace NewPdaSqlServer.service.QC;
public class MesXkyService : RepositoryNoEntity
{
/// <summary>
- /// 閫佽揣鍗曟棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
+ /// 閫佽揣鍗曟棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
/// </summary>
private string _logMessageDHD = "";
/// <summary>
- /// 閫佽揣鍗曟潯鐮佹棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
- /// </summary>
- private string _logMessageDhdBar = "";
-
- /// <summary>
- /// 閫佽揣鍗曟槑缁嗘棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
+ /// 閫佽揣鍗曟槑缁嗘棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
/// </summary>
private string _logMessageDhdDetail = "";
/// <summary>
- /// 閫佽揣鍗曡揣鐗╅�佽揪鏃ュ織妯℃澘锛堢敤浜庢惡瀹簯鎺ュ彛璋冪敤璁板綍锛�
+ /// 閫佽揣鍗曟潯鐮佹棩蹇楁ā鏉匡紙鐢ㄤ簬鎼哄浜戞帴鍙ｈ皟鐢ㄨ褰曪級
+ /// </summary>
+ private string _logMessageDhdBar = "";
+
+ /// <summary>
+ /// 閫佽揣鍗曡揣鐗╅�佽揪鏃ュ織妯℃澘锛堢敤浜庢惡瀹簯鎺ュ彛璋冪敤璁板綍锛�
/// </summary>
private string _logMessageDhdHwsd = "";
@@ -42,62 +42,58 @@
/// <summary>
/// 璇锋眰鎶ユ枃缂撳瓨锛堝瓨鍌ㄥ簭鍒楀寲鍚庣殑JSON璇锋眰鍐呭锛�
/// </summary>
- var _requestJson = string.Empty;
+ string _requestJson = string.Empty;
/// <summary>
/// 鍔ㄦ�佸搷搴斿璞★紙瀛樺偍鍙嶅簭鍒楀寲鐨勬惡瀹簯鎺ュ彛鍝嶅簲锛�
/// </summary>
- dynamic _responseData = new ExpandoObject();
+ dynamic _responseData = new System.Dynamic.ExpandoObject();
/// <summary>
/// 鎺ュ彛鎵ц鏃堕棿鎴筹紙鏍煎紡锛歽yyy-MM-dd HH:mm:ss锛�
/// </summary>
- var _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
/// <summary>
/// 鎺ュ彛璋冪敤鐘舵�侊紙0-澶辫触 1-鎴愬姛锛�
/// </summary>
- var sendStatus = 0;
+ int sendStatus = 0;
try
{
- var ErrorMsg = "";
- var Apiparam = ApiCommonParam.NewApiCommon();
+ string ErrorMsg = "";
+ ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
_executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//string data_inserted = "{\r\n \"startDate\": 1746759300000,\r\n \"endDate\": 1746762300000,\r\n \"erpCode\": \"GXF001\"\r\n}";
- var sendJson = JsonConvert.SerializeObject(entity);
- var SQLStringList = new ArrayList();
+ string sendJson = JsonConvert.SerializeObject(entity);
+ ArrayList SQLStringList = new ArrayList();
// var client = new HttpClient();
var url = "https://openapi.xiekeyun.com/delivery/getNoList.json";
- var httpClient = new HttpClient();
- httpClient.DefaultRequestHeaders.Accept.Add(
- new MediaTypeWithQualityHeaderValue("application/json"));
+ HttpClient httpClient = new HttpClient();
+ httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
- _requestJson = "{\"commonParam\":" +
- JsonConvert.SerializeObject(Apiparam) +
- ",\"body\":" + sendJson + "}";
- var postData = Encoding.UTF8.GetBytes(_requestJson);
+ _requestJson = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
+ byte[] postData = Encoding.UTF8.GetBytes(_requestJson);
// 鍒涘缓璇锋眰瀵硅薄
- var request = (HttpWebRequest)WebRequest.Create(
- "https://openapi.xiekeyun.com/delivery/getNoList.json");
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create("https://openapi.xiekeyun.com/delivery/getNoList.json");
request.Method = "POST";
request.ContentType = "application/json";
request.ContentLength = postData.Length;
// 鍙戦�佽姹傛暟鎹�
- using (var stream = request.GetRequestStream())
+ using (Stream stream = request.GetRequestStream())
{
stream.Write(postData, 0, postData.Length);
}
// 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
- var response = (HttpWebResponse)request.GetResponse();
- using (var stream = response.GetResponseStream())
- using (var reader = new StreamReader(stream))
+ HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+ using (Stream stream = response.GetResponseStream())
+ using (StreamReader reader = new StreamReader(stream))
{
- var result2 = reader.ReadToEnd();
+ string result2 = reader.ReadToEnd();
_responseData = JsonConvert.DeserializeObject(result2);
}
@@ -138,8 +134,7 @@
edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
abtGuid: null,
abtTable: "DELIVERY_NOTICE",
- detail: _logMessageDHD +
- $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
+ detail: _logMessageDHD+ $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
orderNo: "",
sendJson: _requestJson,
rtnJson: JsonConvert.SerializeObject(_responseData),
@@ -150,20 +145,19 @@
);
throw new Exception(e.Message);
}
+
}
//瀵硅幏鍙栧埌鐨勬惡瀹簯閫佽揣鍗曞仛澶勭悊
private int SaveDeliveryNotice(dynamic responseJson)
{
var result = 1;
- List<DeliveryNotice> noticeList =
- JsonConvert.DeserializeObject<List<DeliveryNotice>>(
- responseJson.dataList.ToString());
+ List<DeliveryNotice> noticeList = JsonConvert.DeserializeObject<List<DeliveryNotice>>(responseJson.dataList.ToString());
// 鏂板鍒楄〃绌哄�兼鏌�
if (noticeList == null || !noticeList.Any() || noticeList.Count < 1)
{
- _logMessageDHD += "鏈鑾峰彇鏀惰揣鍗曟暟鎹负绌�";
+ _logMessageDHD += $"鏈鑾峰彇鏀惰揣鍗曟暟鎹负绌�";
return result;
}
@@ -171,42 +165,39 @@
noticeList.ForEach(n => n.Id = Guid.NewGuid());
noticeList.ForEach(n => n.orgId = "104554");
- var deliveryNos =
- noticeList.Select(n => n.DeliveryNo).Distinct().ToList();
+ var deliveryNos = noticeList.Select(n => n.DeliveryNo).Distinct().ToList();
//var noticeIds = noticeList.Select(n => n.Id).ToList(); // 淇濇寔GUID绫诲瀷
Db.Ado.UseTran(() =>
+ {
+ // 娣诲姞绌哄�兼鏌�
+ if (deliveryNos.Any())
{
- // 娣诲姞绌哄�兼鏌�
- if (deliveryNos.Any())
- {
- // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
- Db.Deleteable<DeliveryNoticeDetail>()
- .Where(d => deliveryNos.Contains(d.DeliveryNo))
- .ExecuteCommand();
+ // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
+ Db.Deleteable<DeliveryNoticeDetail>()
+ .Where(d => deliveryNos.Contains(d.DeliveryNo))
+ .ExecuteCommand();
- //鍒犻櫎鍏宠仈閫佽揣鏉＄爜鏄庣粏
- Db.Deleteable<TblBarcodeInformation>()
- .Where(b => deliveryNos.Contains(b.DeliveryNo))
- .ExecuteCommand();
+ //鍒犻櫎鍏宠仈閫佽揣鏉＄爜鏄庣粏
+ Db.Deleteable<TblBarcodeInformation>()
+ .Where(b => deliveryNos.Contains(b.DeliveryNo))
+ .ExecuteCommand();
- //鍒犻櫎閫佽揣鍗�
- Db.Deleteable<DeliveryNotice>()
- .Where(n => deliveryNos.Contains(n.DeliveryNo))
- .ExecuteCommand();
- }
+ //鍒犻櫎閫佽揣鍗�
+ Db.Deleteable<DeliveryNotice>()
+ .Where(n => deliveryNos.Contains(n.DeliveryNo))
+ .ExecuteCommand();
+ }
- // 鎵归噺鎻掑叆浼樺寲
- result = Db.Fastest<DeliveryNotice>().BulkCopy(noticeList);
- },
- ex =>
- {
- // 澧炲己寮傚父淇℃伅
- //_logMessageDHD = _logMessageDHD + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
- throw new Exception(
- $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
- });
+ // 鎵归噺鎻掑叆浼樺寲
+ result = Db.Fastest<DeliveryNotice>().BulkCopy(noticeList);
+ },
+ ex => {
+ // 澧炲己寮傚父淇℃伅
+ //_logMessageDHD = _logMessageDHD + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
+ throw new Exception($"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
+ });
return result;
}
@@ -218,59 +209,56 @@
/// <summary>
/// 璇锋眰鎶ユ枃缂撳瓨锛堝瓨鍌ㄥ簭鍒楀寲鍚庣殑JSON璇锋眰鍐呭锛�
/// </summary>
- var _requestJson = string.Empty;
+ string _requestJson = string.Empty;
/// <summary>
/// 鍔ㄦ�佸搷搴斿璞★紙瀛樺偍鍙嶅簭鍒楀寲鐨勬惡瀹簯鎺ュ彛鍝嶅簲锛�
/// </summary>
- dynamic _responseData = new ExpandoObject();
+ dynamic _responseData = new System.Dynamic.ExpandoObject();
/// <summary>
/// 鎺ュ彛鎵ц鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
/// </summary>
- var _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
/// <summary>
/// 鎺ュ彛璋冪敤鐘舵�侊紙0-澶辫触 1-鎴愬姛锛�
/// </summary>
- var sendStatus = 0;
+ int sendStatus = 0;
try
{
- var ErrorMsg = "";
- var Apiparam = ApiCommonParam.NewApiCommon();
+ string ErrorMsg = "";
+ ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
_executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- var sendJson = JsonConvert.SerializeObject(entity);
- var SQLStringList = new ArrayList();
+ string sendJson = JsonConvert.SerializeObject(entity);
+ ArrayList SQLStringList = new ArrayList();
var url = "https://openapi.xiekeyun.com/delivery/getDetail.json";
- var httpClient = new HttpClient();
- httpClient.DefaultRequestHeaders.Accept.Add(
- new MediaTypeWithQualityHeaderValue("application/json"));
+ HttpClient httpClient = new HttpClient();
+ httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
- _requestJson = "{\"commonParam\":" +
- JsonConvert.SerializeObject(Apiparam) +
- ",\"body\":" + sendJson + "}";
- var postData = Encoding.UTF8.GetBytes(_requestJson);
+ _requestJson = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
+ byte[] postData = Encoding.UTF8.GetBytes(_requestJson);
// 鍒涘缓璇锋眰瀵硅薄
- var request = (HttpWebRequest)WebRequest.Create(url);
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.Method = "POST";
request.ContentType = "application/json";
request.ContentLength = postData.Length;
// 鍙戦�佽姹傛暟鎹�
- using (var stream = request.GetRequestStream())
+ using (Stream stream = request.GetRequestStream())
{
stream.Write(postData, 0, postData.Length);
}
// 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
- var response = (HttpWebResponse)request.GetResponse();
- using (var stream = response.GetResponseStream())
- using (var reader = new StreamReader(stream))
+ HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+ using (Stream stream = response.GetResponseStream())
+ using (StreamReader reader = new StreamReader(stream))
{
- var result2 = reader.ReadToEnd();
+ string result2 = reader.ReadToEnd();
_responseData = JsonConvert.DeserializeObject(result2);
}
@@ -311,8 +299,7 @@
edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
abtGuid: null,
abtTable: "DELIVERY_NOTICE_DETAIL",
- detail: _logMessageDhdDetail +
- $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
+ detail: _logMessageDhdDetail + $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
orderNo: "",
sendJson: _requestJson,
rtnJson: JsonConvert.SerializeObject(_responseData),
@@ -323,21 +310,21 @@
);
throw new Exception(e.Message);
}
+
}
//瀵硅幏鍙栧埌鐨勬惡瀹簯閫佽揣鍗曞仛澶勭悊
- private int SaveDeliveryNoticeDetail(dynamic responseJson,
- string deliveryNo)
+ private int SaveDeliveryNoticeDetail(dynamic responseJson,string deliveryNo)
{
var result = 1;
// 杞崲purchaseDesc瀵硅薄涓哄瓧绗︿覆
var jsonData = JArray.Parse(responseJson.data.lineList.ToString());
foreach (var item in jsonData)
- item["purchaseDesc"] =
- item["purchaseDesc"]?.ToString(Formatting.None);
-
- List<DeliveryNoticeDetail> noticeList =
- jsonData.ToObject<List<DeliveryNoticeDetail>>();
+ {
+ item["purchaseDesc"] = item["purchaseDesc"]?.ToString(Formatting.None);
+ }
+
+ List<DeliveryNoticeDetail> noticeList = jsonData.ToObject<List<DeliveryNoticeDetail>>();
// 鏂板鍒楄〃绌哄�兼鏌�
if (noticeList == null || !noticeList.Any() || noticeList.Count < 1)
@@ -349,9 +336,10 @@
// 鑾峰彇閫佽揣鍗曞彿骞舵牎楠�
var deliveryNoObj = responseJson.data.deliveryNo;
- if (deliveryNoObj == null ||
- string.IsNullOrEmpty(deliveryNoObj.ToString()))
+ if (deliveryNoObj == null || string.IsNullOrEmpty(deliveryNoObj.ToString()))
+ {
throw new Exception($"銆愬紓甯搞�戣幏鍙栭�佽揣鍗曞け璐ワ細{responseJson}");
+ }
deliveryNo = deliveryNoObj.ToString();
//璧嬪�糶uid鍜屽埌璐у崟鍙�
@@ -361,23 +349,20 @@
Db.Ado.UseTran(() =>
- {
- // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
- Db.Deleteable<DeliveryNoticeDetail>()
- .Where(d => d.DeliveryNo == deliveryNo)
- .ExecuteCommand();
+ {
+ // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
+ Db.Deleteable<DeliveryNoticeDetail>()
+ .Where(d => d.DeliveryNo == deliveryNo)
+ .ExecuteCommand();
- // 鎵归噺鎻掑叆浼樺寲
- result = Db.Fastest<DeliveryNoticeDetail>()
- .BulkCopy(noticeList);
- },
- ex =>
- {
- // 澧炲己寮傚父淇℃伅
- //_logMessageDhdDetail = _logMessageDhdDetail + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
- throw new Exception(
- $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
- });
+ // 鎵归噺鎻掑叆浼樺寲
+ result = Db.Fastest<DeliveryNoticeDetail>().BulkCopy(noticeList);
+ },
+ ex => {
+ // 澧炲己寮傚父淇℃伅
+ //_logMessageDhdDetail = _logMessageDhdDetail + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
+ throw new Exception($"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
+ });
return result;
}
@@ -389,59 +374,56 @@
/// <summary>
/// 璇锋眰鎶ユ枃缂撳瓨锛堝瓨鍌ㄥ簭鍒楀寲鍚庣殑JSON璇锋眰鍐呭锛�
/// </summary>
- var _requestJson = string.Empty;
+ string _requestJson = string.Empty;
/// <summary>
/// 鍔ㄦ�佸搷搴斿璞★紙瀛樺偍鍙嶅簭鍒楀寲鐨勬惡瀹簯鎺ュ彛鍝嶅簲锛�
/// </summary>
- dynamic _responseData = new ExpandoObject();
+ dynamic _responseData = new System.Dynamic.ExpandoObject();
/// <summary>
/// 鎺ュ彛鎵ц鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
/// </summary>
- var _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
/// <summary>
/// 鎺ュ彛璋冪敤鐘舵�侊紙0-澶辫触 1-鎴愬姛锛�
/// </summary>
- var sendStatus = 0;
+ int sendStatus = 0;
try
{
- var ErrorMsg = "";
- var Apiparam = ApiCommonParam.NewApiCommon();
+ string ErrorMsg = "";
+ ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
_executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- var sendJson = JsonConvert.SerializeObject(entity);
- var SQLStringList = new ArrayList();
+ string sendJson = JsonConvert.SerializeObject(entity);
+ ArrayList SQLStringList = new ArrayList();
var url = "https://openapi.xiekeyun.com/barcode/byDeliveryNo.json";
- var httpClient = new HttpClient();
- httpClient.DefaultRequestHeaders.Accept.Add(
- new MediaTypeWithQualityHeaderValue("application/json"));
+ HttpClient httpClient = new HttpClient();
+ httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
- _requestJson = "{\"commonParam\":" +
- JsonConvert.SerializeObject(Apiparam) +
- ",\"body\":" + sendJson + "}";
- var postData = Encoding.UTF8.GetBytes(_requestJson);
+ _requestJson = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
+ byte[] postData = Encoding.UTF8.GetBytes(_requestJson);
// 鍒涘缓璇锋眰瀵硅薄
- var request = (HttpWebRequest)WebRequest.Create(url);
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.Method = "POST";
request.ContentType = "application/json";
request.ContentLength = postData.Length;
// 鍙戦�佽姹傛暟鎹�
- using (var stream = request.GetRequestStream())
+ using (Stream stream = request.GetRequestStream())
{
stream.Write(postData, 0, postData.Length);
}
// 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
- var response = (HttpWebResponse)request.GetResponse();
- using (var stream = response.GetResponseStream())
- using (var reader = new StreamReader(stream))
+ HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+ using (Stream stream = response.GetResponseStream())
+ using (StreamReader reader = new StreamReader(stream))
{
- var result2 = reader.ReadToEnd();
+ string result2 = reader.ReadToEnd();
_responseData = JsonConvert.DeserializeObject(result2);
}
@@ -482,8 +464,7 @@
edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
abtGuid: null,
abtTable: "TBL_BARCODE_INFORMATION",
- detail: _logMessageDhdBar +
- $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
+ detail: _logMessageDhdBar + $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
orderNo: "",
sendJson: _requestJson,
rtnJson: JsonConvert.SerializeObject(_responseData),
@@ -494,15 +475,14 @@
);
throw new Exception(e.Message);
}
+
}
//瀵硅幏鍙栧埌鐨勬惡瀹簯閫佽揣鍗曟潯鐮佸仛澶勭悊
- private int SaveDeliveryNoticeBar(dynamic responseJson, string deliveryNo)
+ private int SaveDeliveryNoticeBar(dynamic responseJson,string deliveryNo)
{
var result = 1;
- List<XkyBarcodeDataDto> noticeList =
- JsonConvert.DeserializeObject<List<XkyBarcodeDataDto>>(
- responseJson.dataList.ToString());
+ List<XkyBarcodeDataDto> noticeList = JsonConvert.DeserializeObject<List<XkyBarcodeDataDto>>(responseJson.dataList.ToString());
if (noticeList == null || !noticeList.Any())
{
@@ -547,31 +527,28 @@
Customize3 = n.DynamicData?.Customize3,
// 鍏朵粬瀛楁
- DnLines =
- n.DnLines // 鏍规嵁鏁版嵁搴撴敞閲婏紝ExtendN01瀵瑰簲椤圭洰(鍗曡韩extendN01)锛岃繖閲屾槧灏刣nLines
+ DnLines = n.DnLines // 鏍规嵁鏁版嵁搴撴敞閲婏紝ExtendN01瀵瑰簲椤圭洰(鍗曡韩extendN01)锛岃繖閲屾槧灏刣nLines
}).ToList();
- Db.Ado.UseTran(() =>
- {
- // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
- Db.Deleteable<TblBarcodeInformation>()
- .Where(d => d.DeliveryNo == deliveryNo)
- .ExecuteCommand();
+ Db.Ado.UseTran(() =>
+ {
+ // 鍒犻櫎鍏宠仈閫佽揣鏄庣粏鏁版嵁
+ Db.Deleteable<TblBarcodeInformation>()
+ .Where(d => d.DeliveryNo == deliveryNo)
+ .ExecuteCommand();
- // 鎵归噺鎻掑叆浼樺寲锛堜娇鐢ㄦ纭殑barcodeList锛�
- result = Db.Fastest<TblBarcodeInformation>()
- .BulkCopy(barcodeList);
- },
- ex =>
- {
- // 澧炲己寮傚父淇℃伅
- //_logMessageDhdBar = _logMessageDhdBar + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
- throw new Exception(
- $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
- });
+ // 鎵归噺鎻掑叆浼樺寲锛堜娇鐢ㄦ纭殑barcodeList锛�
+ result = Db.Fastest<TblBarcodeInformation>().BulkCopy(barcodeList);
+ },
+ ex => {
+ // 澧炲己寮傚父淇℃伅
+ //_logMessageDhdBar = _logMessageDhdBar + $"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}";
+ throw new Exception($"鏁版嵁搴撴搷浣滃け璐ワ細{ex.Message}\n璺熻釜锛歿ex.StackTrace}");
+ });
return result;
}
+
public dynamic GetXkyHwsd(XKYGetDhdHwsdRequest entity)
@@ -580,60 +557,56 @@
/// <summary>
/// 璇锋眰鎶ユ枃缂撳瓨锛堝瓨鍌ㄥ簭鍒楀寲鍚庣殑JSON璇锋眰鍐呭锛�
/// </summary>
- var _requestJson = string.Empty;
+ string _requestJson = string.Empty;
/// <summary>
/// 鍔ㄦ�佸搷搴斿璞★紙瀛樺偍鍙嶅簭鍒楀寲鐨勬惡瀹簯鎺ュ彛鍝嶅簲锛�
/// </summary>
- dynamic _responseData = new ExpandoObject();
+ dynamic _responseData = new System.Dynamic.ExpandoObject();
/// <summary>
/// 鎺ュ彛鎵ц鏃堕棿锛堟牸寮忥細yyyy-MM-dd HH:mm:ss锛�
/// </summary>
- var _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ string _executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
/// <summary>
/// 鎺ュ彛璋冪敤鐘舵�侊紙0-澶辫触 1-鎴愬姛锛�
/// </summary>
- var sendStatus = 0;
+ int sendStatus = 0;
try
{
- var ErrorMsg = "";
- var Apiparam = ApiCommonParam.NewApiCommon();
+ string ErrorMsg = "";
+ ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
_executeTimestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- var sendJson = JsonConvert.SerializeObject(entity);
- var SQLStringList = new ArrayList();
- var url =
- "https://openapi.xiekeyun.com/delivery/updateDeliveryStatus.json";
- var httpClient = new HttpClient();
- httpClient.DefaultRequestHeaders.Accept.Add(
- new MediaTypeWithQualityHeaderValue("application/json"));
+ string sendJson = JsonConvert.SerializeObject(entity);
+ ArrayList SQLStringList = new ArrayList();
+ var url = "https://openapi.xiekeyun.com/delivery/updateDeliveryStatus.json";
+ HttpClient httpClient = new HttpClient();
+ httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
- _requestJson = "{\"commonParam\":" +
- JsonConvert.SerializeObject(Apiparam) +
- ",\"body\":" + sendJson + "}";
- var postData = Encoding.UTF8.GetBytes(_requestJson);
+ _requestJson = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
+ byte[] postData = Encoding.UTF8.GetBytes(_requestJson);
// 鍒涘缓璇锋眰瀵硅薄
- var request = (HttpWebRequest)WebRequest.Create(url);
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.Method = "POST";
request.ContentType = "application/json";
request.ContentLength = postData.Length;
// 鍙戦�佽姹傛暟鎹�
- using (var stream = request.GetRequestStream())
+ using (Stream stream = request.GetRequestStream())
{
stream.Write(postData, 0, postData.Length);
}
// 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
- var response = (HttpWebResponse)request.GetResponse();
- using (var stream = response.GetResponseStream())
- using (var reader = new StreamReader(stream))
+ HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+ using (Stream stream = response.GetResponseStream())
+ using (StreamReader reader = new StreamReader(stream))
{
- var result2 = reader.ReadToEnd();
+ string result2 = reader.ReadToEnd();
_responseData = JsonConvert.DeserializeObject(result2);
}
@@ -669,8 +642,7 @@
edtUserGuid: Guid.Parse("11111111-1111-1111-1111-111111111111"),
abtGuid: null,
abtTable: "MES_INV_ITEM_ARN",
- detail: _logMessageDhdBar +
- $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
+ detail: _logMessageDhdBar + $"绯荤粺寮傚父閿欒锛歿e.Message}\n璺熻釜锛歿e.StackTrace}",
orderNo: "",
sendJson: _requestJson,
rtnJson: JsonConvert.SerializeObject(_responseData),
@@ -681,5 +653,6 @@
);
throw new Exception(e.Message);
}
+
}
-}
\ No newline at end of file
+}
diff --git a/service/Warehouse/MesXkyShdManager.cs b/service/Warehouse/MesXkyShdManager.cs
index 5b50dd9..cdb3113 100644
--- a/service/Warehouse/MesXkyShdManager.cs
+++ b/service/Warehouse/MesXkyShdManager.cs
@@ -1,15 +1,17 @@
锘縰sing System.Data;
using System.Data.SqlClient;
+using Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
-using NewPdaSqlServer.util;
using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.Warehouse;
public class MesXkyShdManager : Repository<MesCgthSq>
{
+
public dynamic GetShdhItems(dynamic unity)
{
//// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
@@ -21,13 +23,13 @@
if (shdh.Count < 1)
throw new Exception($"閫佽揣鍗曞彿銆恵unity.shdh}銆戜笉瀛樺湪鎴栨湭鍚屾!");
- // var sql3 = @"SELECT ISNULL((SELECT SUM(delivery_qty) FROM DELIVERY_NOTICE_DETAIL WHERE delivery_no = @shdh), 0) -
- //ISNULL((SELECT SUM(include_qty) FROM TBL_BARCODE_INFORMATION WHERE delivery_no = @shdh), 0) AS Diffnum ";
+ // var sql3 = @"SELECT ISNULL((SELECT SUM(delivery_qty) FROM DELIVERY_NOTICE_DETAIL WHERE delivery_no = @shdh), 0) -
+ //ISNULL((SELECT SUM(include_qty) FROM TBL_BARCODE_INFORMATION WHERE delivery_no = @shdh), 0) AS Diffnum ";
- // var diffNum = Db.Ado.SqlQuery<dynamic>(sql3, sqlParams).First();
+ // var diffNum = Db.Ado.SqlQuery<dynamic>(sql3, sqlParams).First();
- // if (diffNum.Diffnum != 0)
- // throw new Exception($"閫佽揣鍗曞彿銆恵unity.shdh}銆戞潯鐮佹湭鍏ㄩ儴鎵撳嵃鎴栨湭鍚屾锛屾棤娉曟敹璐э紒");
+ // if (diffNum.Diffnum != 0)
+ // throw new Exception($"閫佽揣鍗曞彿銆恵unity.shdh}銆戞潯鐮佹湭鍏ㄩ儴鎵撳嵃鎴栨湭鍚屾锛屾棤娉曟敹璐э紒");
var sql2 = @"WITH dhmx AS(
SELECT E.line_k3id,B.paper_bill_no,B.guid,E.quantity FROM dbo.MES_INV_ITEM_ARN B LEFT JOIN MES_INV_ITEM_ARN_DETAIL E ON B.guid = E.parent_Guid
@@ -56,6 +58,7 @@
public dynamic GetShdhBar(dynamic unity)
{
+
//// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
var sqlParams = new List<SugarParameter> { new("@shdh", unity.shdh) };
@@ -102,14 +105,12 @@
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
// 鏂板绌哄璞℃牎楠�
- if (unity == null)
- throw new ArgumentNullException(nameof(unity), "鍙傛暟瀵硅薄涓嶈兘涓� null");
-
+ if (unity == null) throw new ArgumentNullException(nameof(unity), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+
// 鍙傛暟鏍￠獙澧炲己
if (string.IsNullOrEmpty(unity.userName?.ToString()))
- throw new ArgumentException("鐢ㄦ埛璐︽埛涓嶅厑璁镐负绌�",
- nameof(unity.userName));
-
+ throw new ArgumentException("鐢ㄦ埛璐︽埛涓嶅厑璁镐负绌�", nameof(unity.userName));
+
if (string.IsNullOrEmpty(unity.shdh?.ToString()))
throw new ArgumentException("閫佽揣鍗曞彿涓嶅厑璁镐负绌�", nameof(unity.shdh));
@@ -124,16 +125,11 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@po_outMsg", SqlDbType.NVarChar, 300)
- { Direction = ParameterDirection.Output },
- new("@po_outSum", SqlDbType.NVarChar, 300)
- { Direction = ParameterDirection.Output },
- new("@pi_user", SqlDbType.NVarChar)
- { Value = unity.userName.ToString() }, // 鏄惧紡绫诲瀷杞崲
- new("@pi_barcode", SqlDbType.NVarChar)
- { Value = unity.barcode.ToString() },
- new("@pi_shdh", SqlDbType.NVarChar)
- { Value = unity.shdh.ToString() }
+ new("@po_outMsg", SqlDbType.NVarChar, 300) { Direction = ParameterDirection.Output },
+ new("@po_outSum", SqlDbType.NVarChar, 300) { Direction = ParameterDirection.Output },
+ new("@pi_user", SqlDbType.NVarChar) { Value = unity.userName.ToString() }, // 鏄惧紡绫诲瀷杞崲
+ new("@pi_barcode", SqlDbType.NVarChar) { Value = unity.barcode.ToString() },
+ new("@pi_shdh", SqlDbType.NVarChar) { Value = unity.shdh.ToString() }
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -150,6 +146,7 @@
return _strMsg;
//return 0;
+
}
catch (Exception ex)
{
@@ -162,4 +159,6 @@
}
}
}
-}
\ No newline at end of file
+}
+
+
diff --git a/service/Warehouse/MesXsckManager.cs b/service/Warehouse/MesXsckManager.cs
index fd12c0e..7c98c1b 100644
--- a/service/Warehouse/MesXsckManager.cs
+++ b/service/Warehouse/MesXsckManager.cs
@@ -1,11 +1,15 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
+using MES.Service.Modes;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using SqlSugar.Extensions;
+using System.Data;
+using System.Data.SqlClient;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -27,18 +31,17 @@
// 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
var parameters = new[]
{
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
};
try
{
// 杩斿洖鍗曞彿瀛楃涓插垪琛℅et_Qt_ck_List
var blDetails = Db.Ado.SqlQuery<string>(
- "EXEC prc_pda_xsck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
+ "EXEC prc_pda_xsck_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
return blDetails;
}
catch (Exception ex)
@@ -51,8 +54,7 @@
/// 鏍规嵁鍙戣揣閫氱煡鍗曡幏鍙栧搴斾唬鍙戣揣鏄庣粏 prc_rf_pda_scan_zout_showbl
/// </summary>
/// <returns>鍙戣揣閫氱煡鍗曟槑缁嗗垪琛�</returns>
- public dynamic GetMesItemFHTZetailByBillNo(dynamic query,
- dynamic RequestInfo)
+ public dynamic GetMesItemFHTZetailByBillNo(dynamic query, dynamic RequestInfo)
{
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
@@ -70,24 +72,25 @@
// 鑾峰彇鏈畬鎴愮殑鍙戣揣閫氱煡鍗曟槑缁�
var parameters = new[]
- {
- new SugarParameter("@billNo", query.billNo),
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
- };
+{
+ new SugarParameter("@billNo", query.billNo),
+ new SugarParameter("@pi_orgId",orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
try
{
- var blDetails = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_xsck_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
- var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
- var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_xsck_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
return new
{
- items, ysitems
+ items = items,
+ ysitems = ysitems,
+ allList = blDetails
};
}
catch (Exception ex)
@@ -98,7 +101,7 @@
}
/// <summary>
- /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
+ /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -110,15 +113,14 @@
/// - userName: 鐢ㄦ埛鍚�
/// - blNo: 鍙戣揣閫氱煡鍗曞彿(蹇呭～)
/// </remarks>
- public ProductionPickDto XSCKScanBarcode(WarehouseQuery query)
+ public ProductionPickDto XSCKScanBarcode( WarehouseQuery query)
{
var _strMsg = "";
var _intSum = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (query.daa001.IsNullOrEmpty())
- throw new Exception("鍙戣揣閫氱煡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鍙戣揣閫氱煡鍗曞彿涓嶅厑璁镐负绌�");
if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
using (var cmd = new SqlCommand("[prc_pda_XSCK]", conn))
@@ -134,7 +136,7 @@
new("@barcode_num", SqlDbType.NVarChar, 300),
new("@split_num", SqlDbType.NVarChar, 300),
new("@c_User", query.userName),
- new("@p_biLL_no", query.daa001),
+ new("@p_biLL_no", query.billNo),
new("@p_item_barcode", query.barcode)
};
parameters[0].Direction = ParameterDirection.Output;
@@ -190,495 +192,68 @@
/// - Num: 鍙戞枡鏁伴噺(蹇呭～,蹇呴』澶т簬0)
/// - blNo: 鍙戣揣閫氱煡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<MesItemBlDetail> pendingList) SplitBarcode(
- WarehouseQuery query)
+ public ProductionPickDto SplitBarcode(WarehouseQuery query)
{
- if (string.IsNullOrEmpty(query.userName))
- throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
- if (string.IsNullOrEmpty(query.billNo))
- throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒");
+ if (query.Num is null or 0) throw new Exception("鏉＄爜鎷嗗垎鏁颁笉鍏佽涓虹┖鎴栬�呬负0");
- if (string.IsNullOrEmpty(query.barcode))
- throw new Exception("璇锋壂鎻忔潯鐮侊紒");
-
- if ((query.Num ?? 0) <= 0)
- throw new Exception("璇疯緭鍏ユ纭殑鍙戞枡鏁伴噺锛�");
-
- if (string.IsNullOrEmpty(query.blNo))
- throw new Exception("鍙戣揣閫氱煡鍗曞彿涓嶈兘涓虹┖锛�");
-
-
- // 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
- var exists = Db.Queryable<MesInvItemOutCDetails>()
- .Where(b => b.ItemBarcode == query.barcode)
- .Any();
-
- if (exists)
- throw new Exception("姝ゆ潯鐮佸凡鎵弿,鍕块噸澶嶆壂鐮侊紒");
-
- // 鏌ヨ鏉＄爜搴撳瓨淇℃伅
- var stockBarcode = Db.Queryable<MesInvItemStocks>()
- .Where(t => t.ItemBarcode == query.barcode && t.Quantity > 0)
- .First();
-
- if (stockBarcode == null)
- throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮�,璇锋牳瀵癸紒{query.barcode}");
-
- var totalQty = stockBarcode.Quantity;
- string newBarcode = null;
-
- var outNoType = "";
- if (query.Type == "鐢熶骇琛ユ枡")
- outNoType = "SCBL(鐢熶骇琛ユ枡)";
- else
- outNoType = "SCCL(鐢熶骇瓒呴)";
-
- // 寮�鍚簨鍔″鐞�
- var success = UseTransaction(db =>
+ var _strMsg = "";
+ var _intSum = "";
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- var executeCommand = 0;
-
- // 鎷嗗垎鏉＄爜
- if (totalQty > query.Num)
+ using (var cmd = new SqlCommand("[prc_pda_XSCK_CF_new]", conn))
{
- var mesItems = db.Queryable<MesItems>()
- .Where(s => s.Id == stockBarcode.ItemId).First();
-
- // 鐢熸垚鏂版潯鐮佸彿
- newBarcode = BillNo.GetBillNo("TM(鏉＄爜)", mesItems.ItemNo);
-
- // 鍐欏叆鏂版潯鐮�
- executeCommand += db.Insertable(new MesInvItemBarcodes
+ try
{
- Guid = Guid.NewGuid(),
- ItemBarcode = newBarcode,
- CustNo = stockBarcode.CustomerNo,
- // ProductCode = stockBarcode.ProductCode,
- // ItemBarcode2 = stockBarcode.ItemBarcode2,
- // ItemCode = stockBarcode.ItemCode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- Quantity = query.Num,
- EpFlag = true,
- TaskNo = stockBarcode.TaskNo,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- OldItemBarcode = query.barcode,
- // Mblnr = stockBarcode.Mblnr,
- // Zeile = stockBarcode.Zeile,
- // RohInId = stockBarcode.RohInId,
- Barcodestatus = false,
- Oldqty = query.Num as long?,
- // Unit = stockBarcode.Unit,
- // WeightUnit = stockBarcode.WeightUnit,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- BillNo = stockBarcode.BillNo,
- BoardStyle = stockBarcode.BoardStyle,
- // ColorName = stockBarcode.ColorName,
- WorkNo = stockBarcode.WorkNo,
- WorkLine = stockBarcode.WorkLine,
- // MemoBad = stockBarcode.MemoBad,
- ComeFlg = 5,
- // Memo = stockBarcode.Memo,
- SuppId = stockBarcode.SuppId,
- SuppNo = stockBarcode.SuppNo,
- InsDate = stockBarcode.IndepDate, // Added InsDate
- ItemId = stockBarcode.ItemId
- // ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
- }).IgnoreColumns(true).ExecuteCommand();
-
- // 鏇存柊鍘熸潯鐮佹暟閲�
- executeCommand += db.Updateable<MesInvItemBarcodes>()
- .SetColumns(it => it.Quantity == it.Quantity - query.Num)
- .Where(it => it.ItemBarcode == query.barcode)
- .ExecuteCommand();
-
- // 鏇存柊鍘熸潯鐮佹暟閲�
- executeCommand += db.Updateable<MesInvItemStocks>()
- .SetColumns(it => it.Quantity == it.Quantity - query.Num)
- .Where(it => it.ItemBarcode == query.barcode)
- .ExecuteCommand();
-
- //// 鍒犻櫎鍘熸潯鐮佸簱瀛樿褰�
- //executeCommand += db.Deleteable<MesInvItemStocks>()
- // .Where(it => it.ItemBarcode == query.barcode)
- // .ExecuteCommand();
-
- // 鎻掑叆鍓╀綑鏉＄爜鏁伴噺鐨勬柊搴撳瓨璁板綍
- executeCommand += db.Insertable(new MesInvItemStocks
- {
- Guid = Guid.NewGuid(),
- TaskNo = stockBarcode.TaskNo,
- ItemBarcode = newBarcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- Quantity = query.Num,
- EpFlag = stockBarcode.EpFlag,
- CustomerNo = stockBarcode.CustomerNo,
- ItemWt = stockBarcode.ItemWt,
- DepotsCode = stockBarcode.DepotsCode,
- DepotsId = stockBarcode.DepotsId,
- DepotSectionsCode = stockBarcode.DepotSectionsCode,
- CheckDate = stockBarcode.CheckDate,
- ItemType = stockBarcode.ItemType,
- IndepDate = stockBarcode.IndepDate,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- IqcStatus = stockBarcode.IqcStatus,
- BoardStyle = stockBarcode.BoardStyle,
- WorkNo = stockBarcode.WorkNo,
- WorkLine = stockBarcode.WorkLine,
- SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId
- // UnitId = stockBarcode.ItemUnit
- }).IgnoreColumns(true).ExecuteCommand();
-
- // 鍐欏叆鏂版潯鐮佺殑浜ゆ槗璁板綍
- executeCommand += db.Insertable(new MesInvBusiness2
- {
- Guid = Guid.NewGuid(),
- Status = 1,
- BillTypeId = 200, // p_bill_type_id
- TransactionCode = "209", // p_transaction_no
- BusinessType = 0,
- ItemBarcode = newBarcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- EpFlag = true,
- Quantity = query.Num,
- FromInvDepotsCode = null,
- FromInvDepotSectionsCode = null,
- ToInvDepotsCode = stockBarcode.DepotsCode,
- ToInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
- Description = query.Type + "鎷嗗垎鐢熸垚",
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- TaskNo = stockBarcode.TaskNo,
- BillNo = stockBarcode.BillNo,
- WorkNo = stockBarcode.WorkNo,
- WorkLine = stockBarcode.WorkLine,
- SuppNo = stockBarcode.SuppNo,
- SuppId = stockBarcode.SuppId,
- ItemId = stockBarcode.ItemId
- // CkDepot = stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
- }
- else if (totalQty < query.Num)
- {
- throw new Exception("鍙戞枡鏁伴噺澶т簬鏉＄爜鏁�,璇锋牳瀵癸紒");
- }
-
- //if (string.IsNullOrEmpty(newBarcode)) newBarcode = query.barcode;
-
- // 妫�鏌ュ彂璐ч�氱煡鍗曠姸鎬�
- var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == true)
- .First();
-
- if (mesItemBl == null)
- throw new Exception($"鐢宠鍗� {query.blNo} 宸叉挙鍥烇紒");
-
- if (mesItemBl.Bl018 != true)
- throw new Exception($"鐢宠鍗� {query.blNo} 鏈鏍革紒");
-
- if (mesItemBl.Bl019 == true)
- throw new Exception($"鐢宠鍗� {query.blNo} 宸插畬缁擄紒");
-
- // 鑾峰彇鍙戣揣閫氱煡鍗曟槑缁嗗苟鏍￠獙
- var blDetail = Db.Queryable<MesItemBlDetail>()
- .Where(b =>
- b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId)
- .First();
-
- if (blDetail == null)
- throw new Exception($"鐢宠鍗曚笉瀛樺湪姝ょ墿鏂� {stockBarcode.ItemNo} 璇风‘璁わ紒");
-
- var remainingQty = (blDetail.Bld007 ?? 0) - (blDetail.Bld008 ?? 0);
- if (remainingQty == 0)
- throw new Exception("鐗╂枡宸叉壂鐮佸畬鎴愶紝璇锋牳瀵癸紒");
-
- if (query.Num > remainingQty)
- throw new Exception(
- $"鎷嗗垎鏁伴噺锛歿query.Num} 澶т簬寰呭彂鏂欐暟閲忥細{remainingQty}锛岃鏍稿锛�");
-
- // 妫�鏌ュ伐鍗曚俊鎭�
- var womdaa = Db.Queryable<Womdaa>()
- .Where(a => a.Daa001 == query.billNo)
- .First();
-
- if (womdaa == null)
- throw new Exception($"宸ュ崟 {query.billNo} 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- var womdab = Db.Queryable<Womdab>()
- .Where(b =>
- b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
- .First();
-
- if (womdab == null)
- throw new Exception($"澶囨枡鏄庣粏涓嶅瓨鍦ㄦ鐗╂枡 {stockBarcode.ItemNo} 璇风‘璁わ紒");
-
- // 妫�鏌ュ凡鍙戞枡鏁伴噺鏄惁瓒呰繃寰呭彂鏂欐暟閲�
- var sumQty = db.Queryable<MesInvItemOutCDetails>()
- .Where(it =>
- it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
- .Sum(it => it.Quantity);
-
- //if (sumQty > remainingQty)
- // throw new Exception(
- // $"鎷嗗垎鏁伴噺锛歿sumQty} 澶т簬寰呭彂鏂欐暟閲忥細{remainingQty}锛岃鏍稿锛�");
-
-
- var depots = Db.Queryable<MesDepots>()
- .Where(t => t.DepotId == stockBarcode.DepotId)
- .First();
-
- // 鑾峰彇鎴栧垱寤哄嚭搴撳崟
- var itemOut = db.Queryable<MesInvItemOuts>()
- .Where(a => a.TaskNo == query.blNo
- && a.DepotId == stockBarcode.DepotId
- && a.OutDate.Value.Date.ToString("yyyy-MM-dd") ==
- DateTime.Now.Date.ToString("yyyy-MM-dd")
- && a.BillTypeId == 200
- && a.TransactionNo == 209
- && a.Status == 0)
- .First();
-
- var outId = new Guid();
- var outNo = "";
- if (itemOut == null)
- {
- // 鍒涘缓鏂扮殑鍑哄簱鍗�
- outId = Guid.NewGuid();
- outNo = BillNo.GetBillNo(outNoType);
-
- // 鎻掑叆鍑哄簱鍗曚富琛�
- executeCommand += db.Insertable(new MesInvItemOuts
- {
- Guid = outId,
- ItemOutNo = outNo,
- TaskNo = query.blNo,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- BillTypeId = 200,
- TransactionNo = 209,
- Remark = mesItemBl.Bl007,
- DepotCode = depots.DepotCode,
- OutPart = womdaa.Daa013,
- FType = 0,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- WorkNo = womdaa.Daa021,
- BoardItem = womdaa.Daa002,
- PbillNo = womdaa.Daa001,
- OutDate = DateTime.Now,
- Status = 0,
- DepotId = stockBarcode.DepotId,
- THORGID = stockBarcode.StockOrgId,
- OutType = query.Type
- //BbillNo = query.blNo
- }).IgnoreColumns(true).ExecuteCommand();
- }
- else
- {
- outId = itemOut.Guid;
- outNo = itemOut.ItemOutNo;
- }
-
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪鍑哄簱鍗曟槑缁�
- var itemOutItemCount = db.Queryable<MesInvItemOutItems>()
- .Where(it =>
- it.ItemOutId == outId &&
- it.ItemId == stockBarcode.ItemId &&
- it.DepotId == stockBarcode.DepotId.ToString())
- .Count();
-
- if (itemOutItemCount == 0)
- // 鎻掑叆鏂扮殑鍑哄簱鍗曟槑缁�
- executeCommand += db.Insertable(new MesInvItemOutItems
- {
- Guid = Guid.NewGuid(),
- ItemOutId = outId,
- ItemNo = blDetail.Bld002,
- Quantity = query.Num,
- TlQty = query.Num,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- DepotCode = depots.DepotCode,
- TaskNo = query.blNo,
- WorkNo = womdaa.Daa021,
- WorkLine = blDetail.Bld013,
- ErpItemNo = womdab.Dab003,
- ErpId = womdab.Eid,
- ErpAutoid = womdab.Erpid,
- PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
- DepotId = stockBarcode.DepotId.ToString(),
- ItemDabid = womdab.Guid
- // Unit = blDetail.Bld009,
- // DepotId = (int)stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
- else
- // 鏇存柊宸叉湁鍑哄簱鍗曟槑缁嗘暟閲�
- executeCommand += db.Updateable<MesInvItemOutItems>()
- .SetColumns(it => it.TlQty == (it.TlQty ?? 0) + query.Num)
- .Where(it =>
- it.ItemOutId == outId &&
- it.ItemId == stockBarcode.ItemId &&
- it.DepotId == stockBarcode.DepotId.ToString())
- .ExecuteCommand();
-
- // 鎻掑叆鍑哄簱鏉＄爜鏄庣粏
- executeCommand += db.Insertable(new MesInvItemOutCDetails
- {
- Guid = Guid.NewGuid(),
- ItemOutId = outId,
- ItemBarcode = newBarcode ?? query.barcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- Quantity = query.Num,
- ForceOutFlag = 0,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- DepotCode = depots.DepotCode,
- DepotSectionCode = stockBarcode.DepotSectionsCode,
- Remark = blDetail.Bld010,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- TaskNoy = mesItemBl.Bl013,
- BoardStyle = mesItemBl.Bl002,
- TaskNo = query.blNo,
- WorkNo = blDetail.Bld001,
- WorkLine = blDetail.Bld013,
- SuppNo = stockBarcode.SuppNo,
- PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
- Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId,
- Dabid = womdab.Guid
- }).IgnoreColumns(true).ExecuteCommand();
-
- // 鎻掑叆涓氬姟娴佹按
- executeCommand += db.Insertable(new MesInvBusiness2
- {
- Guid = Guid.NewGuid(),
- Status = 1,
- BillTypeId = 200, // p_bill_type_id
- TransactionCode = "209", // p_transaction_no
- BusinessType = 1,
- ItemBarcode = newBarcode ?? query.barcode,
- ItemNo = stockBarcode.ItemNo,
- LotNo = stockBarcode.LotNo,
- EpFlag = true,
- Quantity = query.Num,
- FromInvDepotsCode = stockBarcode.DepotsCode,
- FromInvDepotSectionsCode = stockBarcode.DepotSectionsCode,
- Description = query.Type,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = stockBarcode.Factory,
- Company = stockBarcode.Company,
- TaskNo = mesItemBl.Bl012,
- BillNo = query.blNo,
- WorkNo = blDetail.Bld001,
- WorkLine = blDetail.Bld013,
- SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId
- // CkDepot = stockBarcode.DepotsId
- }).IgnoreColumns(true).ExecuteCommand();
-
- // 鏇存柊宸ュ崟琛ㄦ暟閲�
- executeCommand += db.Updateable<Womdab>()
- .SetColumns(it => new Womdab
- {
- Dab007 = (it.Dab007 ?? 0) + query.Num, // 宸ュ崟鏁伴噺
- Dab020 = (it.Dab020 ?? 0) + query.Num, // 宸插彂鏂欐暟閲�
- Dab021 = (it.Dab021 ?? 0) + query.Num // 宸插彂鏂欐暟閲�
- })
- .Where(it =>
- it.Guid == womdab.Guid && it.Dab003 == womdab.Dab003)
- .ExecuteCommand();
-
- // 鏇存柊鍙戣揣閫氱煡鍗曟槑缁嗗凡琛ユ暟閲�
- executeCommand += db.Updateable<MesItemBlDetail>()
- .SetColumns(it => new MesItemBlDetail
- {
- Bld008 = (it.Bld008 ?? 0) + (int)query.Num
- })
- .Where(it => it.Id == blDetail.Id)
- .ExecuteCommand();
-
- // 鑾峰彇鏇存柊鍚庣殑鍙戣揣閫氱煡鍗曟槑缁嗘暟閲�
- var updatedDetail = db.Queryable<MesItemBlDetail>()
- .Where(it => it.Id == blDetail.Id)
- .Select(it => new { it.Bld007, it.Bld008 })
- .First();
-
- if ((updatedDetail.Bld007 ?? 0) <= (updatedDetail.Bld008 ?? 0))
- // 鏇存柊鏄庣粏瀹屾垚鐘舵��
- executeCommand += db.Updateable<MesItemBlDetail>()
- .SetColumns(it => new MesItemBlDetail { Bld011 = 1 })
- .Where(it => it.Id == blDetail.Id)
- .ExecuteCommand();
-
- // 妫�鏌ユ槸鍚﹁繕鏈夋湭瀹屾垚鐨勬槑缁�
-
- var unfinishedDetail = db.Queryable<MesItemBlDetail>()
- .Where(it => it.Mid == mesItemBl.Id && (it.Bld011 ?? 0) == 0)
- .First();
-
- if (unfinishedDetail == null)
- // 濡傛灉娌℃湁鎵惧埌鏈畬鎴愭槑缁嗭紝鍒欐洿鏂板彂璐ч�氱煡鍗曠姸鎬佷负宸插畬鎴�
- executeCommand += db.Updateable<MesItemBl>()
- .SetColumns(it => new MesItemBl
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
{
- Bl019 = true,
- WcUser = query.userName,
- WcTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
- })
- .Where(it => it.Id == mesItemBl.Id)
- .ExecuteCommand();
+ new("@outMsg", SqlDbType.NVarChar, 2000),
+ new("@outSum", SqlDbType.NVarChar, 300),
+ new("@outCfBar", SqlDbType.NVarChar, 300),
+ new("@c_user", query.userName),
+ new("@p_biLL_no", query.billNo),
+ new("@p_item_barcode", query.barcode),
+ new("@NUM", query.Num)
+ };
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _strMsg = parameters[0].Value.ToString();
+ _intSum = parameters[1].Value.ToString();
+ _cfBar = parameters[2].Value.ToString();
- if (executeCommand <= 1) throw new Exception("鏇存柊澶辫触");
- return executeCommand;
- }) > 0;
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
- // 鑾峰彇鏈�缁堢殑寰呭彂鏂欐槑缁嗗垪琛�
- var pendingList = Db.Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
- .Where((a, b) => a.BlNo == query.blNo
- && (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new MesItemBlDetail
- {
- Bld012 = b.Bld012,
- Bld002 = b.Bld002,
- Bld003 = b.Bld003,
- Bld004 = b.Bld004,
- Bld007 = b.Bld007,
- Bld008 = b.Bld008
- })
- .ToList();
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.billNo,
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
+ };
- return (success, pendingList);
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
}
-
- #endregion
+ #endregion
}
\ No newline at end of file
diff --git a/service/Warehouse/MesXsthManager.cs b/service/Warehouse/MesXsthManager.cs
index effe333..baf36be 100644
--- a/service/Warehouse/MesXsthManager.cs
+++ b/service/Warehouse/MesXsthManager.cs
@@ -1,11 +1,16 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
+using MES.Service.Modes;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
+using OracleInternal.Sharding;
using SqlSugar;
+using SqlSugar.Extensions;
+using System.Data;
+using System.Data.SqlClient;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Warehouse;
@@ -15,7 +20,7 @@
/// 鑾峰彇閿�鍞��璐х敵璇峰垪琛�
/// </summary>
/// <returns>閿�鍞��璐х敵璇峰垪琛�</returns>
- public dynamic GetXsthBillNo(WarehouseQuery query, dynamic RequestInfo)
+ public dynamic GetXsthBillNo(WarehouseQuery query,dynamic RequestInfo)
{
var orgId = RequestInfo.OrgId;
@@ -25,18 +30,17 @@
// 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
var parameters = new[]
{
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
};
try
{
// 杩斿洖鍗曞彿瀛楃涓插垪琛�
var blDetails = Db.Ado.SqlQuery<string>(
- "EXEC prc_pda_xsth_list @pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
+ "EXEC prc_pda_xsth_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
return blDetails;
}
catch (Exception ex)
@@ -68,25 +72,24 @@
// 鑾峰彇鏈畬鎴愮殑閿�鍞��璐ф槑缁�
var parameters = new[]
- {
- new SugarParameter("@billNo", query.billNo),
- new SugarParameter("@pi_orgId", orgId),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
- };
+{
+ new SugarParameter("@billNo", query.billNo),
+ new SugarParameter("@pi_orgId",orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
try
{
- var blDetails = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_xsth_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4",
- parameters);
- var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
- var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_xsth_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
return new
{
- items,
- ysitems,
+ items = items,
+ ysitems = ysitems,
Count = items.Count + ysitems.Count
};
}
@@ -98,7 +101,7 @@
}
/// <summary>
- /// 閿�鍞��璐у叆搴�
+ /// 閿�鍞��璐у叆搴�
/// </summary>
/// <param name="unity"></param>
/// <returns></returns>
@@ -110,8 +113,7 @@
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
if (unity.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- if (unity.sectionCode.IsNullOrEmpty())
- throw new Exception("搴撲綅缂栧彿涓嶅厑璁镐负绌�");
+ if (unity.sectionCode.IsNullOrEmpty()) throw new Exception("搴撲綅缂栧彿涓嶅厑璁镐负绌�");
if (unity.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
if (unity.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
@@ -129,11 +131,12 @@
new("@pi_user", unity.userName),
new("@pi_barcode", unity.barcode),
new("@pi_sectionCode", unity.sectionCode),
- new("@pi_billno", unity.billNo)
+ new("@pi_billno", unity.billNo),
+
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
- // parameters[2].Direction = ParameterDirection.Output;
+ // parameters[2].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
@@ -147,6 +150,7 @@
return _strMsg;
//return 0;
+
}
catch (Exception ex)
{
diff --git a/service/Warehouse/TransferOutManager.cs b/service/Warehouse/TransferOutManager.cs
index 35f852c..34119aa 100644
--- a/service/Warehouse/TransferOutManager.cs
+++ b/service/Warehouse/TransferOutManager.cs
@@ -1,10 +1,10 @@
锘縰sing System.Data;
using System.Data.SqlClient;
+using MES.Service.Modes;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
-using NewPdaSqlServer.util;
using SqlSugar;
namespace NewPdaSqlServer.service.Warehouse;
@@ -33,10 +33,9 @@
pid = g.Key,
sq = g.Sum(x => x.FQty), // 鐢宠鏁伴噺鍚堣
ys = g.Sum(x => x.SQty), // 璋冨嚭宸叉壂鏁伴噺鍚堣
- rs = g.Sum(x => x.RQty) // 璋冨叆宸叉壂鏁伴噺鍚堣
+ rs = g.Sum(x => x.RQty), // 璋冨叆宸叉壂鏁伴噺鍚堣
})
- .Where(x =>
- !((x.sq ?? 0) == (x.ys ?? 0) && (x.sq ?? 0) == (x.rs ?? 0)))
+ .Where(x => !((x.sq ?? 0) == (x.ys ?? 0) && (x.sq ?? 0) == (x.rs ?? 0)))
.Select(x => x.pid)
.ToList();
@@ -60,17 +59,13 @@
{
if (string.IsNullOrEmpty(query.billNo)) throw new Exception("璋冩嫧鍗曞彿涓虹┖");
- var sql1 =
- string.Format(
- @"SELECT * FROM MES_DBCK WHERE FDocumentStatus = 'C' AND FBillNo = '{0}'",
- query.billNo);
+ var sql1 = string.Format(@"SELECT * FROM MES_DBCK WHERE FDocumentStatus = 'C' AND FBillNo = '{0}'", query.billNo);
var dbck = Db.Ado.SqlQuery<ItemDetailModel>(sql1);
if (dbck.Count < 1) throw new Exception("璋冩嫧鍗曞彿涓嶅瓨鍦ㄦ垨鏈鏍革紒");
- var sql2 = string.Format(
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.FQty FQty,b.SQty SQty,b.FQty - b.SQty DSQty ,
+ var sql2 = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.FQty FQty,b.SQty SQty,b.FQty - b.SQty DSQty ,
dbo.F_QX_GETRECODEPOTSE(B.FMATERIALID,'','','') as RecoKw
FROM MES_DBCK_DETAIL B
LEFT JOIN MES_DBCK A ON A.ID = B.pid
@@ -137,17 +132,13 @@
{
if (string.IsNullOrEmpty(query.billNo)) throw new Exception("璋冩嫧鍗曞彿涓虹┖");
- var sql1 =
- string.Format(
- @"SELECT * FROM MES_DBCK WHERE FDocumentStatus = 'C' AND FBillNo = '{0}'",
- query.billNo);
+ var sql1 = string.Format(@"SELECT * FROM MES_DBCK WHERE FDocumentStatus = 'C' AND FBillNo = '{0}'", query.billNo);
var dbck = Db.Ado.SqlQuery<ItemDetailModel>(sql1);
if (dbck.Count < 1) throw new Exception("璋冩嫧鍗曞彿涓嶅瓨鍦ㄦ垨鏈鏍革紒");
- var sql2 = string.Format(
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.FQty FQty,b.SQty SQty,b.RQty RQty,b.SQty - b.RQty DSQty ,
+ var sql2 = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.FQty FQty,b.SQty SQty,b.RQty RQty,b.SQty - b.RQty DSQty ,
dbo.F_QX_GETRECODEPOTSE(B.FMATERIALID,'','','') as RecoKw
FROM MES_DBCK_DETAIL B
LEFT JOIN MES_DBCK A ON A.ID = B.pid
@@ -211,13 +202,12 @@
// 鏍规嵁SQL鏌ヨ鏉′欢鑾峰彇寰呭鐞嗙殑鍑哄簱鏄庣粏
// 鍏宠仈鏌ヨTransferOutDetail銆乀ransferOut鍜孧esItems涓夊紶琛�
// 绛涢�夋潯浠�:鏈畬鎴愭暟閲忓ぇ浜�0涓斿崟鎹凡瀹℃牳
- var result = Db.Queryable<MesDbckDetail, MesDbck, MesItems>((b, a, s) =>
- new JoinQueryInfos(
+ var result = Db.Queryable<MesDbckDetail, MesDbck, MesItems>(
+ (b, a, s) => new JoinQueryInfos(
JoinType.Left, b.Pid == a.Id,
JoinType.Left, b.FMaterialId == s.Id.ToString()))
.Where((b, a, s) =>
- !((b.FQty ?? 0) == (b.SQty ?? 0) &&
- (b.FQty ?? 0) == (b.RQty ?? 0)) // 鏈畬鎴愭暟閲忓ぇ浜�0
+ !((b.FQty ?? 0) == (b.SQty ?? 0) && (b.FQty ?? 0) == (b.RQty ?? 0)) // 鏈畬鎴愭暟閲忓ぇ浜�0
&& a.FBillNo == p_bill_no // 鍖归厤鍗曟嵁鍙�
&& a.FApproveStatus == 1) // 鍗曟嵁宸插鏍�
.OrderBy((b, a, s) => s.ItemNo)
@@ -290,7 +280,7 @@
new("@split_num", SqlDbType.NVarChar, 300),
new("@c_user", query.userName),
new("@p_bill_no", p_bill_no),
- new("@p_item_barcode", p_item_barcode)
+ new("@p_item_barcode", p_item_barcode),
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -304,7 +294,7 @@
var barcodeNum = parameters[2].Value.ToString();
var splitNum = parameters[3].Value.ToString();
-
+
var result = Convert.ToInt32(_intSum);
if (result <= 0) throw new Exception(_strMsg);
@@ -370,9 +360,7 @@
&& !string.IsNullOrEmpty(x.FStockInId)
&& !string.IsNullOrEmpty(x.FOwnerInId))
.First();
- if (stock == null)
- throw new Exception(
- $"璋冩嫧鏄庣粏涓� 銆愮墿鏂欍�戞垨 銆愯皟鍏ヤ粨搴撱�戞垨銆愯皟鍏ヨ揣涓汇�戜俊鎭笉瀛樺湪锛岃鏍稿锛亄p_item_barcode}");
+ if (stock == null) throw new Exception($"璋冩嫧鏄庣粏涓� 銆愮墿鏂欍�戞垨 銆愯皟鍏ヤ粨搴撱�戞垨銆愯皟鍏ヨ揣涓汇�戜俊鎭笉瀛樺湪锛岃鏍稿锛亄p_item_barcode}");
// 鏌ヨ鐗╂枡淇℃伅
var item = Db.Queryable<MesItems>()
@@ -399,7 +387,7 @@
new("@c_user", query.userName),
new("@p_bill_no", p_bill_no),
new("@p_item_barcode", p_item_barcode),
- new("@p_depot_section_code", query.sectionCode)
+ new("@p_depot_section_code", query.sectionCode),
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
@@ -413,7 +401,7 @@
var barcodeNum = parameters[2].Value.ToString();
var outBillNo = parameters[3].Value.ToString();
-
+
var result = Convert.ToInt32(_intSum);
if (result <= 0) throw new Exception(_strMsg);
@@ -462,9 +450,7 @@
&& !string.IsNullOrEmpty(x.FStockInId)
&& !string.IsNullOrEmpty(x.FOwnerInId))
.First();
- if (stock == null)
- throw new Exception(
- $"璋冩嫧鏄庣粏涓� 銆愮墿鏂欍�戞垨 銆愯皟鍏ヤ粨搴撱�戞垨銆愯皟鍏ヨ揣涓汇�戜俊鎭笉瀛樺湪锛岃鏍稿锛亄p_item_barcode}");
+ if (stock == null) throw new Exception($"璋冩嫧鏄庣粏涓� 銆愮墿鏂欍�戞垨 銆愯皟鍏ヤ粨搴撱�戞垨銆愯皟鍏ヨ揣涓汇�戜俊鎭笉瀛樺湪锛岃鏍稿锛亄p_item_barcode}");
// 鏌ヨ鐗╂枡淇℃伅
var item = Db.Queryable<MesItems>()
@@ -510,8 +496,8 @@
var dto = new ProductionPickDto
{
daa001 = query.daa001,
- barcode = query.barcode, //鍘熸潯鐮�
- cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -527,4 +513,5 @@
}
}
}
+
}
\ No newline at end of file
diff --git a/service/Wom/MesWorkProdManager.cs b/service/Wom/MesWorkProdManager.cs
index 4f00f5a..07d18e1 100644
--- a/service/Wom/MesWorkProdManager.cs
+++ b/service/Wom/MesWorkProdManager.cs
@@ -81,9 +81,10 @@
}
// 5. 妫�鏌ユ潯鐮佹槸鍚﹂噸澶嶆壂鎻�
- var exists = Db.Queryable<MesWorkProd, MesWorkProdCDetails>((a, b) =>
- new JoinQueryInfos(JoinType.Inner,
- a.Id == b.MesWorkProdId))
+ var exists = Db.Queryable<MesWorkProd, MesWorkProdCDetails>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Inner,
+ a.Id == b.MesWorkProdId))
.Where((a, b) => b.ItemBarcode == request.ItemBarcode
&& a.BillTypeId == billTypeId
&& a.TransactionNo == transactionNo)
@@ -93,10 +94,10 @@
throw new Exception("鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
// 6. 鑾峰彇宸叉姤宸ユ暟閲�
- var reportedQty = Db
- .Queryable<MesWorkProd, MesWorkProdCDetails>((a, b) =>
- new JoinQueryInfos(JoinType.Inner,
- a.BillNo == b.BillNo))
+ var reportedQty = Db.Queryable<MesWorkProd, MesWorkProdCDetails>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Inner,
+ a.BillNo == b.BillNo))
.Where((a, b) => a.BillTypeId == billTypeId
&& a.TransactionNo == transactionNo
&& a.TaskNo == barcode.BillNo)
@@ -208,18 +209,18 @@
// 13. 鏇存柊宸ュ崟宸叉姤宸ユ暟閲�
db.Updateable<Womdaa>()
- .SetColumns(x => new Womdaa
- {
- Daa011 = (x.Daa011 ?? 0) + (int)barcode.Quantity
- })
- .Where(x => x.Daa001 == barcode.BillNo)
- .ExecuteCommand();
+ .SetColumns(x => new Womdaa
+ {
+ Daa011 = (x.Daa011 ?? 0) + (int)barcode.Quantity
+ })
+ .Where(x => x.Daa001 == barcode.BillNo)
+ .ExecuteCommand();
// 14. 閲嶆柊鑾峰彇鏈�鏂板凡鎶ュ伐鏁伴噺
- reportedQty = db
- .Queryable<MesWorkProd, MesWorkProdCDetails>((a, b) =>
- new JoinQueryInfos(JoinType.Inner,
- a.BillNo == b.BillNo))
+ reportedQty = db.Queryable<MesWorkProd, MesWorkProdCDetails>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Inner,
+ a.BillNo == b.BillNo))
.Where((a, b) => a.BillTypeId == billTypeId
&& a.TransactionNo == transactionNo
&& a.TaskNo == barcode.BillNo)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index fbfc402..11ec6e7 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -2,13 +2,13 @@
using System.Data.SqlClient;
using System.Text;
using Masuit.Tools;
+using Masuit.Tools.Hardware;
+using Microsoft.SqlServer.Server;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
-using NewPdaSqlServer.util;
using SqlSugar;
-using SqlDataAdapter = System.Data.SqlClient.SqlDataAdapter;
namespace NewPdaSqlServer.service.Wom;
@@ -18,8 +18,7 @@
//杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 WomdaaManager.cs
//鑾峰彇宸ュ崟鍙�
- public List<string> GetProductionPickDaa001(WarehouseQuery query,
- dynamic requestInfo)
+ public List<string> GetProductionPickDaa001(WarehouseQuery query, dynamic requestInfo)
{
var sql =
"SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB WHERE DAB006 > DAB007 GROUP BY DAB002) B ON A.GUID = B.daaGuid WHERE DAA001 = " +
@@ -38,7 +37,7 @@
if (query == null)
throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
- if (string.IsNullOrEmpty(query.daa001))
+ if (string.IsNullOrEmpty(query.daa001?.ToString()))
throw new ArgumentException("宸ュ崟鍙蜂笉鑳戒负绌�", nameof(query.daa001));
var orgId = requestInfo.OrgId;
@@ -50,26 +49,25 @@
var parameters = new[]
{
new SugarParameter("@daa001", query.daa001),
- new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@pi_orgId",orgId),
new SugarParameter("@inP1", null),
new SugarParameter("@inP2", null),
new SugarParameter("@inP3", null),
new SugarParameter("@inP4", null)
};
- var womdabs =
- Db.Ado.SqlQuery<ItemDetailModel>(
- "EXEC prc_pda_scll_detailList @daa001", parameters);
+ var womdabs = Db.Ado.SqlQuery<ItemDetailModel>("EXEC prc_pda_scll_detailList @daa001", parameters);
var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
// 淇锛氳ˉ鍏呰幏鍙� womdaa 瀵硅薄
- var daa001Value = query.daa001;
- var womdaa = Db.Ado
- .SqlQuery<dynamic>("EXEC prc_pda_getDaaInfo @daa001", parameters)
- .First();
+ var daa001Value = query.daa001?.ToString();
+ var womdaa = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_getDaaInfo @daa001", parameters).First();
- if (womdaa == null) throw new Exception("璇ュ伐鍗曚俊鎭笉瀛樺湪锛岃鏍稿锛�");
+ if (womdaa == null)
+ {
+ throw new Exception("璇ュ伐鍗曚俊鎭笉瀛樺湪锛岃鏍稿锛�");
+ }
var dto = new ProductionPickDto
{
@@ -161,7 +159,7 @@
var _strMsg = "";
var _intSum = "";
- var _cfBar = ""; //鎷嗗垎鍚庢潯鐮�
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("[prc_pda_SCLL_CF]", conn))
@@ -197,8 +195,8 @@
var dto = new ProductionPickDto
{
daa001 = query.daa001,
- barcode = query.barcode, //鍘熸潯鐮�
- cfBarcode = _cfBar //鎷嗗垎鍚庢潯鐮�
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
};
return dto;
@@ -223,7 +221,7 @@
new JoinQueryInfos(JoinType.Left,
a.Daa002 == i.ItemId.ToString()))
.Where((a, i) => a.Daa001 == query.daa001
- && a.Fstatus == 1)
+ && a.Fstatus == 1)
.Select((a, i) => new
{
a.Daa001, a.CaaGuid
@@ -254,8 +252,7 @@
// })
// .ToList();
- var sql = string.Format(
- @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,C.item_id FMaterialId ,
+ var sql =string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,C.item_id FMaterialId ,
dbo.F_QX_GETRECODEPOTSE(B.dab003,'','','') as RecoKw
FROM WOMDAB B
LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
@@ -293,7 +290,10 @@
var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
.First();
- if (womcaa == null) throw new Exception("鐢熶骇浠诲姟鍗曚笉瀛樺湪");
+ if (womcaa == null)
+ {
+ throw new Exception("鐢熶骇浠诲姟鍗曚笉瀛樺湪");
+ }
var dto = new ProductionPickDto
{
@@ -308,7 +308,7 @@
}
/// <summary>
- /// 鑾峰彇宸ュ崟鏉＄爜淇℃伅
+ /// 鑾峰彇宸ュ崟鏉＄爜淇℃伅
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -324,23 +324,23 @@
throw new ArgumentException("宸ュ簭涓嶈兘涓虹┖", nameof(query.GX));
var parameters = new[]
- {
- new SugarParameter("@pi_trac_barcode", query.Zsbarcode),
- new SugarParameter("@pi_gx", query.GX),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null),
- new SugarParameter("@inP4", null)
- };
+ {
+ new SugarParameter("@pi_trac_barcode", query.Zsbarcode),
+ new SugarParameter("@pi_gx", query.GX),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
try
{
- var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_scll_selZsBarInfo @pi_trac_barcode,@pi_gx,@inP1,@inP2,@inP3,@inP4",
- parameters);
+ var ZsBarInfo = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selZsBarInfo @pi_trac_barcode,@pi_gx,@inP1,@inP2,@inP3,@inP4", parameters);
if (ZsBarInfo.Count < 1)
+ {
throw new Exception($"璇ヨ拷婧爜{query.Zsbarcode}涓嶅瓨鍦ㄦ垨宸茬粦瀹�");
+ }
return ZsBarInfo;
}
@@ -354,8 +354,7 @@
//鑾峰彇鐢熶骇
public dynamic getTraceability(dynamic query)
{
- var sql = string.Format(
- @"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
+ var sql = string.Format(@"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
FROM WORK_COLLECT A
LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
@@ -369,14 +368,14 @@
}
/// <summary>
- /// 鑾峰彇鐗╂枡鐩稿叧鏉＄爜淇℃伅
+ /// 鑾峰彇鐗╂枡鐩稿叧鏉＄爜淇℃伅
/// </summary>
/// <param name="unity"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public dynamic GetBarKwByItem(dynamic unity)
{
- if (unity == null)
+ if (unity == null)
throw new ArgumentNullException(nameof(unity), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
if (string.IsNullOrEmpty(unity.itemId?.ToString()))
@@ -389,20 +388,50 @@
new SugarParameter("@itemId", unity.itemId)
};
- return Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_scll_selBarMx @itemId", parameters);
+ return Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selBarMx @itemId", parameters);
}
catch (Exception ex)
{
throw new Exception($"鑾峰彇鏉＄爜淇℃伅澶辫触锛歿ex.Message}");
}
+
}
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鐩稿叧鏉＄爜淇℃伅
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public dynamic GetBarKwByItemCK(dynamic unity)
+ {
+ if (unity == null)
+ throw new ArgumentNullException(nameof(unity), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+
+ if (string.IsNullOrEmpty(unity.itemId?.ToString()))
+ throw new ArgumentException("鐗╂枡ID涓嶈兘涓虹┖", nameof(unity.itemId));
+
+ try
+ {
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("@itemId", unity.itemId),
+ new SugarParameter("@inP1", unity.type),
+ new SugarParameter("@inP2", unity.billNo)
+ };
+
+ return Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selBarMx @itemId,@inP1,@inP2", parameters);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇鏉＄爜淇℃伅澶辫触锛歿ex.Message}");
+ }
+
+ }
public dynamic ProductBinding(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 2. 浣跨敤 string.IsNullOrEmpty 鐩存帴鍒ゆ柇瀛楃涓插睘鎬э紙閬垮厤 NullReferenceException锛�
if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -426,23 +455,18 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userName },
- new("@pi_trac_barcode", SqlDbType.NVarChar, 100)
- { Value = query.ZsBar },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
- { Value = query.LsBar },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_trac_barcode", SqlDbType.NVarChar, 100) { Value = query.ZsBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.LsBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
-
+
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
-
+
cmd.ExecuteNonQuery();
-
+
_strMsg = parameters[3].Value?.ToString() ?? "";
_intSum = parameters[4].Value?.ToString() ?? "-1";
@@ -472,7 +496,7 @@
/// <summary>
- /// 鑾峰彇鍗℃澘淇℃伅
+ /// 鑾峰彇鍗℃澘淇℃伅
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -481,29 +505,32 @@
if (string.IsNullOrEmpty(query.Kbbarcode?.ToString()))
throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.userName));
- var sql = string.Format(@"SELECT QUANTITY,
+ var sql = string.Format(@"SELECT QUANTITY,agvPostion,
ISNULL((SELECT COUNT(1) FROM MES_INV_ITEM_BARCODES_TBMX WHERE ABOUT_TB_BARCODE = '{0}'), 0) AS YSum,
DAA001
FROM MES_INV_ITEM_BARCODES A LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
-WHERE ITEM_BARCODE = '{0}' ", query.Kbbarcode);
+left join MES_WORKSHOP_LINE C ON DAA015 = C.id AND iSAgV = 1
+WHERE ITEM_BARCODE = '{0}' ", query.Kbbarcode);
var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
if (ZsBarInfo.Count < 1)
+ {
throw new Exception($"璇ュ崱鏉跨爜{query.Zsbarcode}涓嶅瓨鍦紒");
+ }
return ZsBarInfo;
}
/// <summary>
- /// 鑾峰彇鍗℃澘鏄庣粏淇℃伅
+ /// 鑾峰彇鍗℃澘鏄庣粏淇℃伅
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public dynamic getKbBarMxInfo(dynamic query)
{
- var sql = string.Format(
- @"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,weight
+
+ var sql = string.Format(@"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,weight
FROM MES_INV_ITEM_BARCODES_TBMX A
LEFT JOIN WOMDAA B ON B.daa001 = A.DAA_001
LEFT JOIN MES_ITEMS C ON C.item_id = B.daa002
@@ -516,7 +543,7 @@
}
/// <summary>
- /// 鑾峰彇绠辨槑缁嗕俊鎭�
+ /// 鑾峰彇绠辨槑缁嗕俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -547,44 +574,42 @@
{
try
{
- using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY",
- conn, transaction))
- {
- cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+
+ using (var cmd = new SqlCommand("prc_pda_Xbar_binding_JY", conn, transaction))
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userName },
- new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
- { Value = query.KbBar },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
- { Value = query.Xbarcode },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
- };
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.Xbarcode },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
+ };
- foreach (var parameter in parameters)
- cmd.Parameters.Add(parameter);
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
- cmd.ExecuteNonQuery();
+ cmd.ExecuteNonQuery();
- var _strMsg = parameters[3].Value?.ToString() ?? "";
- var _intSum = parameters[4].Value?.ToString() ?? "-1";
+ var _strMsg = parameters[3].Value?.ToString() ?? "";
+ var _intSum = parameters[4].Value?.ToString() ?? "-1";
- var result = Convert.ToInt32(_intSum);
- if (result <= 0)
- //transaction.Rollback();
- throw new Exception(_strMsg);
- //return new {
- // status = result,
- // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
- // failedBarcode = xBar.iteM_BARCODE,
- // successCount = successRecords.Count
- //};
- }
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0)
+ {
+ //transaction.Rollback();
+ throw new Exception(_strMsg);
+ //return new {
+ // status = result,
+ // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
+ // failedBarcode = xBar.iteM_BARCODE,
+ // successCount = successRecords.Count
+ //};
+ }
+ }
+
transaction.Commit(); // 鍏ㄩ儴鎴愬姛鎻愪氦浜嬪姟
}
catch (Exception ex)
@@ -599,8 +624,7 @@
}
}
- var sql2 = string.Format(
- @"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,'0' as is_hedui
+ var sql2 = string.Format(@"SELECT ITEM_BARCODE, QUANTITY,item_no,item_name,item_model,'0' as is_hedui
FROM MES_INV_ITEM_BARCODES_TBMX A
LEFT JOIN WOMDAA B ON B.daa001 = A.DAA_001
LEFT JOIN MES_ITEMS C ON C.item_id = B.daa002
@@ -611,26 +635,25 @@
var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql2);
if (ZsBarInfo.Count < 1)
- throw new Exception(
- $"璇ョ鏉＄爜[{query.Xbarcode}]瀵瑰簲宸ュ崟涓庢墭鐮佸伐鍗昜{query.DAA001}]涓嶅尮閰嶆垨宸茬粦瀹氭墭鐮侊紒");
+ {
+ throw new Exception($"璇ョ鏉＄爜[{query.Xbarcode}]瀵瑰簲宸ュ崟涓庢墭鐮佸伐鍗昜{query.DAA001}]涓嶅尮閰嶆垨宸茬粦瀹氭墭鐮侊紒");
+ }
return ZsBarInfo;
}
public dynamic submitAllChecked(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 鍙傛暟鏍￠獙寮哄寲
if (string.IsNullOrEmpty(query.userName?.ToString()))
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName));
-
+
if (string.IsNullOrEmpty(query.KbBar?.ToString()))
throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.KbBar));
-
- if (query.XbarInfo == null || !((IEnumerable<dynamic>)query.XbarInfo)
- .GetEnumerator().MoveNext())
+
+ if (query.XbarInfo == null || !((IEnumerable<dynamic>)query.XbarInfo).GetEnumerator().MoveNext())
throw new ArgumentException("绠辩爜鍒楄〃涓嶈兘涓虹┖", nameof(query.XbarInfo));
var successRecords = new List<dynamic>();
@@ -642,59 +665,53 @@
try
{
foreach (var xBar in query.XbarInfo) // 閬嶅巻绠辩爜闆嗗悎
- using (var cmd = new SqlCommand("prc_pda_Xbar_binding",
- conn, transaction))
+ {
+ using (var cmd = new SqlCommand("prc_pda_Xbar_binding", conn, transaction))
{
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userName },
- new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
- { Value = query.KbBar },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
- { Value = xBar.iteM_BARCODE },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = xBar.iteM_BARCODE },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
-
+
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
-
+
cmd.ExecuteNonQuery();
-
+
var _strMsg = parameters[3].Value?.ToString() ?? "";
- var _intSum = parameters[4].Value?.ToString() ??
- "-1";
-
+ var _intSum = parameters[4].Value?.ToString() ?? "-1";
+
var result = Convert.ToInt32(_intSum);
if (result <= 0)
+ {
//transaction.Rollback();
throw new Exception(_strMsg);
- //return new {
- // status = result,
- // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
- // failedBarcode = xBar.iteM_BARCODE,
- // successCount = successRecords.Count
- //};
- successRecords.Add(new
- {
+ //return new {
+ // status = result,
+ // message = $"鎿嶄綔鍥炴粴锛歿_strMsg}",
+ // failedBarcode = xBar.iteM_BARCODE,
+ // successCount = successRecords.Count
+ //};
+ }
+
+ successRecords.Add(new {
kbBarcode = query.KbBar,
xBarcode = xBar.iteM_BARCODE,
- processTime =
- DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
+ processTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
});
}
-
+ }
transaction.Commit(); // 鍏ㄩ儴鎴愬姛鎻愪氦浜嬪姟
- return new
- {
- status = 1,
+ return new {
+ status = 1,
message = "鎵归噺缁戝畾鎴愬姛",
successCount = successRecords.Count,
- details = successRecords
+ details = successRecords
};
}
catch (Exception ex)
@@ -712,51 +729,44 @@
public dynamic SubmitKbInspection(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 鍙傛暟鏍￠獙
if (string.IsNullOrEmpty(query.userAccount?.ToString()))
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
-
+
if (string.IsNullOrEmpty(query.KbBar?.ToString()))
throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.KbBar));
-
+
var _strMsg = "";
var _status = -1;
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd =
- new SqlCommand("prc_pda_KBbar_submitInspection", conn))
+ using (var cmd = new SqlCommand("prc_pda_KBbar_submitInspection", conn))
{
try
{
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
- new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
- { Value = query.KbBar },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
-
+
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
-
+
cmd.ExecuteNonQuery();
-
+
_strMsg = parameters[2].Value?.ToString() ?? "";
_status = Convert.ToInt32(parameters[3].Value ?? -1);
-
+
if (_status <= 0) throw new Exception(_strMsg);
-
- return new
- {
+
+ return new {
message = _strMsg,
status = _status,
kbBarcode = query.KbBar
@@ -775,6 +785,7 @@
}
+
//鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
public dynamic GetItemsXcsl(WarehouseQuery query)
{
@@ -784,7 +795,7 @@
new JoinQueryInfos(JoinType.Left,
a.Daa002 == i.ItemId.ToString()))
.Where((a, i) => a.Daa001 == query.daa001
- && a.Fstatus == 1)
+ && a.Fstatus == 1)
.Select((a, i) => new
{
a.Daa001,
@@ -817,7 +828,7 @@
cmd.Parameters.Add(new SqlParameter("@inP3", DBNull.Value));
cmd.Parameters.Add(new SqlParameter("@inP4", DBNull.Value));
- using (var adapter = new SqlDataAdapter(cmd))
+ using (var adapter = new System.Data.SqlClient.SqlDataAdapter(cmd))
{
adapter.Fill(ds);
}
@@ -830,7 +841,7 @@
var XcslYjsBar = Db.Utilities.DataTableToDynamic(ds.Tables[2]);
var daaInfo = Db.Utilities.DataTableToDynamic(ds.Tables[3]);
- var dto = new
+ var dto = new
{
GD_Num = womdaa.Daa008,
workNo = womdaa.Daa021,
@@ -843,11 +854,20 @@
return dto;
}
+ // 鐜板満鏀舵枡灞曠ず鍒楄〃
+ public class XcslResultDto
+ {
+ public int? GD_Num { get; set; }
+ public string? workNo { get; set; }
+ public List<dynamic> XcslItemList { get; set; }
+ public List<dynamic> XcslWjsBarList { get; set; }
+ public List<dynamic> XcslYjsBarList { get; set; }
+ }
+
public dynamic ScanXcsl(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 鍙傛暟鏍￠獙锛堟牴鎹瓨鍌ㄨ繃绋嬫柊澧炲弬鏁帮級
if (string.IsNullOrEmpty(query.userAccount?.ToString()))
@@ -872,16 +892,11 @@
// 鏍规嵁瀛樺偍杩囩▼璋冩暣鍙傛暟椤哄簭鍜屽懡鍚�
SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
- new("@pi_barcode", SqlDbType.NVarChar, 100)
- { Value = query.Bar },
- new("@pi_daa001", SqlDbType.NVarChar, 100)
- { Value = query.DAA001 },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
+ new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = query.Bar },
+ new("@pi_daa001", SqlDbType.NVarChar, 100) { Value = query.DAA001 },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
foreach (var parameter in parameters)
@@ -917,8 +932,7 @@
public dynamic GetWeightByXt(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
// 鍙傛暟鏍￠獙
if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -930,7 +944,7 @@
var _strMsg = "";
var _status = -1;
var _weight = "0";
-
+
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("prc_pda_Xbar_chenzhong", conn))
@@ -940,18 +954,13 @@
conn.Open();
cmd.CommandType = CommandType.StoredProcedure;
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userName },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
- { Value = query.LsBar },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output },
- new("@po_outWeight", SqlDbType.NVarChar, 100)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.LsBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new("@po_outWeight", SqlDbType.NVarChar, 100) { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -963,7 +972,7 @@
if (_status <= 0) throw new Exception(_strMsg);
- return new
+ return new
{
message = _strMsg,
status = _status,
@@ -983,8 +992,9 @@
}
}
- public dynamic GetXcslDaa(dynamic unity, dynamic RequestInfo)
+ public dynamic GetXcslDaa(dynamic unity,dynamic RequestInfo)
{
+
//var sqlParams = new List<SugarParameter> { };
//var sql2 = new StringBuilder(@"
@@ -1012,14 +1022,12 @@
new SugarParameter("@selectKey", unity.selectKey),
new SugarParameter("@inP1", orgId), // 鍙�夊弬鏁�
new SugarParameter("@inP2", unity.selDaaType), // 鍙�夊弬鏁�
- new("@inP3", null), // 鍙�夊弬鏁�
- new("@inP4", null) // 鍙�夊弬鏁�
+ new SugarParameter("@inP3", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP4", null), // 鍙�夊弬鏁�
// ...鍏朵粬鍙�夊弬鏁�
};
- var result = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_getWorkOrderInfo @selectKey, @inP1, @inP2, @inP3, @inP4",
- parameters);
+ var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_getWorkOrderInfo @selectKey, @inP1, @inP2, @inP3, @inP4", parameters);
return result;
@@ -1034,7 +1042,7 @@
new JoinQueryInfos(JoinType.Left,
a.Daa002 == i.ItemId.ToString()))
.Where((a, i) => a.Daa001 == query.daa001
- && a.Fstatus == 1)
+ && a.Fstatus == 1)
.Select((a, i) => new
{
a.Daa001,
@@ -1046,8 +1054,7 @@
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
// 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter>
- { new("@daa001", query.daa001) };
+ var sqlParams = new List<SugarParameter> { new("@daa001", query.daa001) };
var sql1 = @"SELECT A.item_out_no,
SUM(B.QUANTITY) AS BL_Num,
@@ -1091,8 +1098,7 @@
var XcslItem = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
- var sql2 =
- @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date
+ var sql2 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
@@ -1103,8 +1109,7 @@
var XcslWjsBar = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);
- var sql3 =
- @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.CXTR_CREATE_DATE
+ var sql3 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.CXTR_CREATE_DATE
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
@@ -1123,6 +1128,7 @@
XcslItemList = XcslItem,
XcslWjsBarList = XcslWjsBar,
XcslYjsBarList = XcslYjsBar
+
};
return dto;
@@ -1130,8 +1136,7 @@
public dynamic ScanXctl(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 鍙傛暟鏍￠獙锛堟牴鎹瓨鍌ㄨ繃绋嬫柊澧炲弬鏁帮級
if (string.IsNullOrEmpty(query.userAccount?.ToString()))
@@ -1156,16 +1161,11 @@
// 鏍规嵁瀛樺偍杩囩▼璋冩暣鍙傛暟椤哄簭鍜屽懡鍚�
SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
- new("@pi_barcode", SqlDbType.NVarChar, 100)
- { Value = query.Bar },
- new("@pi_daa001", SqlDbType.NVarChar, 100)
- { Value = query.DAA001 },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
+ new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = query.Bar },
+ new("@pi_daa001", SqlDbType.NVarChar, 100) { Value = query.DAA001 },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
foreach (var parameter in parameters)
@@ -1200,12 +1200,13 @@
/// <summary>
- /// 鍐呯鏍稿锛氳幏鍙栧悗鐩栫爜瀵瑰簲浜у搧淇℃伅
+ /// 鍐呯鏍稿锛氳幏鍙栧悗鐩栫爜瀵瑰簲浜у搧淇℃伅
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public dynamic getHgBarInfo(dynamic query)
{
+
var sql = string.Format(@"DECLARE @ZsBar varchar(100)
SELECT TOP 1 @ZsBar= ABOUT_TRAC_BARCODE FROM MES_INV_ITEM_BARCODES_TBMX WHERE ITEM_BARCODE = '{1}'
SELECT TOP 1 A.barCode AS zsBarcode,
@@ -1228,20 +1229,21 @@
var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
if (ZsBarInfo.Count < 1)
+ {
throw new Exception($"璇ュ悗鐩栫爜{query.Zsbarcode}涓嶅瓨鍦ㄦ垨鏈粦瀹�");
+ }
return ZsBarInfo;
}
/// <summary>
- /// 鍐呯鏍稿锛氭牴鎹祦姘寸爜鑾峰彇鐢熶骇灞ュ巻
+ /// 鍐呯鏍稿锛氭牴鎹祦姘寸爜鑾峰彇鐢熶骇灞ュ巻
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public dynamic getTraceabilityByLsBar(dynamic query)
{
- var sql = string.Format(
- @"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
+ var sql = string.Format(@"SELECT processNo, A.barCode, B.lineId, line_no, name AS lineName, checkResult, C.USER_NAME
FROM WORK_COLLECT A
LEFT JOIN WORK_TRAC_CODE B ON A.barCode = B.barCode
LEFT JOIN SYS_USER C ON C.ACCOUNT = A.createBy
@@ -1255,7 +1257,7 @@
}
/// <summary>
- /// 鍐呯鏍稿锛氭壂鐮佹牳瀵�
+ /// 鍐呯鏍稿锛氭壂鐮佹牳瀵�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -1264,8 +1266,7 @@
/// <exception cref="Exception"></exception>
public dynamic ScanNxhd(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
// 2. 浣跨敤 string.IsNullOrEmpty 鐩存帴鍒ゆ柇瀛楃涓插睘鎬э紙閬垮厤 NullReferenceException锛�
if (string.IsNullOrEmpty(query.userName?.ToString()))
@@ -1289,16 +1290,11 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userName },
- new("@pi_hg_barcode", SqlDbType.NVarChar, 100)
- { Value = query.ZsBar },
- new("@pi_x_barcode", SqlDbType.NVarChar, 100)
- { Value = query.LsBar },
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_hg_barcode", SqlDbType.NVarChar, 100) { Value = query.ZsBar },
+ new("@pi_x_barcode", SqlDbType.NVarChar, 100) { Value = query.LsBar },
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
foreach (var parameter in parameters)
@@ -1334,7 +1330,7 @@
}
/// <summary>
- /// 鍐呯鏍稿锛氭壂鐮佹牳瀵�
+ /// 鍐呯鏍稿锛氭壂鐮佹牳瀵�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -1343,16 +1339,15 @@
/// <exception cref="Exception"></exception>
public dynamic ScanFgbd(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
if (string.IsNullOrEmpty(query.userName?.ToString()))
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName));
- if (string.IsNullOrEmpty(query.HgBar?.ToString()))
+ if (string.IsNullOrEmpty(query.HgBar?.ToString()))
throw new ArgumentException("鍚庣洊鐮佷笉鍏佽涓虹┖", nameof(query.HgBar));
- if (string.IsNullOrEmpty(query.FgBar?.ToString()))
+ if (string.IsNullOrEmpty(query.FgBar?.ToString()))
throw new ArgumentException("杩斿伐鐮佷笉鍏佽涓虹┖", nameof(query.FgBar));
var _strMsg = "";
@@ -1367,16 +1362,11 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userName },
- new("@pi_fg_barcode", SqlDbType.NVarChar, 100)
- { Value = query.FgBar },
- new("@pi_ls_barcode", SqlDbType.NVarChar, 100)
- { Value = query.HgBar }, //鍚庣洊/娴佹按
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userName },
+ new("@pi_fg_barcode", SqlDbType.NVarChar, 100) { Value = query.FgBar },
+ new("@pi_ls_barcode", SqlDbType.NVarChar, 100) { Value = query.HgBar },//鍚庣洊/娴佹按
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
foreach (var parameter in parameters)
@@ -1412,14 +1402,15 @@
}
/// <summary>
- /// 鑾峰彇AGV绾夸綋鍒楄〃
+ /// 鑾峰彇AGV绾夸綋鍒楄〃
/// </summary>
/// <param name="unity"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public dynamic GetAgvXt(dynamic unity)
{
- var sqlParams = new List<SugarParameter>();
+
+ var sqlParams = new List<SugarParameter> { };
var sql2 = new StringBuilder(@"
SELECT NAME,line_no FROM MES_WORKSHOP_LINE WHERE isAgv = 1 ORDER BY line_no");
@@ -1427,13 +1418,16 @@
var XtItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
- if (XtItem == null) throw new Exception("鏃犲搴擜GV缁戝畾绾夸綋淇℃伅锛�");
+ if (XtItem == null)
+ {
+ throw new Exception("鏃犲搴擜GV缁戝畾绾夸綋淇℃伅锛�");
+ }
return XtItem;
}
/// <summary>
- /// AGV閫佹
+ /// AGV閫佹
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -1457,14 +1451,11 @@
cmd.CommandType = CommandType.StoredProcedure;
var parameters = new SqlParameter[]
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
- new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
- { Value = query.KbBar },
- new("@outMsg", SqlDbType.NVarChar, 2500)
- { Direction = ParameterDirection.Output },
- new("@outSum", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
+ new("@in1", SqlDbType.NVarChar, 100) { Value = query.AgvDw },
+ new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
+ new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -1473,8 +1464,8 @@
var result = new
{
- message = parameters[2].Value?.ToString(),
- status = Convert.ToInt32(parameters[3].Value)
+ message = parameters[3].Value?.ToString(),
+ status = Convert.ToInt32(parameters[4].Value)
};
if (result.status <= 0)
@@ -1502,14 +1493,10 @@
cmd.CommandType = CommandType.StoredProcedure;
var parameters = new SqlParameter[]
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
- new("@pi_xtNum", SqlDbType.NVarChar, 100)
- { Value = query.XtNum },
- new("@outMsg", SqlDbType.NVarChar, 2500)
- { Direction = ParameterDirection.Output },
- new("@outSum", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
+ new("@pi_xtNum", SqlDbType.NVarChar, 100) { Value = query.XtNum },
+ new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
+ new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -1534,54 +1521,49 @@
public dynamic HandleAgvJy(dynamic query)
{
if (query == null) throw new ArgumentNullException(nameof(query));
-
+
// 鍙傛暟楠岃瘉寮哄寲
if (string.IsNullOrEmpty(query.userAccount?.ToString()))
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userAccount));
-
+
if (string.IsNullOrEmpty(query.KbBar?.ToString()))
throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.KbBar));
-
+
if (string.IsNullOrEmpty(query.jyz?.ToString()))
throw new ArgumentException("妫�楠岀粨鏋滀笉鍏佽涓虹┖", nameof(query.jyz));
var _strMsg = "";
var _intSum = "";
-
+
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
using (var cmd = new SqlCommand("prc_pda_AgvJy", conn))
{
cmd.CommandType = CommandType.StoredProcedure;
-
+
// 娣诲姞瀛樺偍杩囩▼鍙傛暟
- SqlParameter[] parameters =
+ SqlParameter[] parameters =
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
- new("@pi_kbBarcode", SqlDbType.NVarChar, 100)
- { Value = query.KbBar },
- new("@pi_jyz", SqlDbType.NVarChar, 100)
- { Value = query.jyz },
- new("@outMsg", SqlDbType.NVarChar, 2500)
- { Direction = ParameterDirection.Output },
- new("@outSum", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
+ new("@pi_kbBarcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
+ new("@pi_jyz", SqlDbType.NVarChar, 100) { Value = query.jyz },
+ new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
+ new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
-
+
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
-
+
conn.Open();
cmd.ExecuteNonQuery();
-
+
_strMsg = parameters[3].Value?.ToString() ?? "";
_intSum = parameters[4].Value?.ToString() ?? "-1";
var result = Convert.ToInt32(_intSum);
if (result <= 0) throw new Exception(_strMsg);
- return new
+ return new
{
message = _strMsg,
status = result,
@@ -1611,16 +1593,11 @@
cmd.CommandType = CommandType.StoredProcedure;
var parameters = new SqlParameter[]
{
- new("@pi_user", SqlDbType.NVarChar, 100)
- { Value = query.userAccount },
- new("@pi_kb_barcode", SqlDbType.NVarChar, 100)
- { Value = query.KbBar },
- new("@pi_kb_Postition", SqlDbType.NVarChar, 100)
- { Value = query.Postition },
- new("@outMsg", SqlDbType.NVarChar, 2500)
- { Direction = ParameterDirection.Output },
- new("@outSum", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
+ new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
+ new("@pi_kb_Postition", SqlDbType.NVarChar, 100) { Value = query.Postition },
+ new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
+ new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
cmd.Parameters.AddRange(parameters);
@@ -1641,13 +1618,4 @@
}
}
- // 鐜板満鏀舵枡灞曠ず鍒楄〃
- public class XcslResultDto
- {
- public int? GD_Num { get; set; }
- public string? workNo { get; set; }
- public List<dynamic> XcslItemList { get; set; }
- public List<dynamic> XcslWjsBarList { get; set; }
- public List<dynamic> XcslYjsBarList { get; set; }
- }
}
\ No newline at end of file
diff --git a/service/Wom/WomdaahbManager.cs b/service/Wom/WomdaahbManager.cs
index 3d912c6..351a819 100644
--- a/service/Wom/WomdaahbManager.cs
+++ b/service/Wom/WomdaahbManager.cs
@@ -8,6 +8,7 @@
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Wom;
diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index acf49f6..34953f2 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -1,11 +1,14 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Data;
+using System.Data.SqlClient;
+using System.Threading.Tasks.Dataflow;
+using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;
namespace NewPdaSqlServer.service.Wom;
@@ -137,86 +140,110 @@
}
}
- public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
+
+ /// <summary>
+ /// 鑾峰彇搴撲綅淇℃伅
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public dynamic GetBarKwByItem(dynamic unity)
{
- return getDaa001(query);
+ if (unity == null)
+ throw new ArgumentNullException(nameof(unity), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+
+ if (string.IsNullOrEmpty(unity.itemId?.ToString()))
+ throw new ArgumentException("鐗╂枡ID涓嶈兘涓虹┖", nameof(unity.itemId));
+
+ try
+ {
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("@itemId",unity.itemId)
+ };
+
+ return Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selBarMx @itemId", parameters);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇鏉＄爜淇℃伅澶辫触锛歿ex.Message}");
+ }
+
}
- private ProductionPickDto getDaa001(WarehouseQuery query)
+ /// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <param name="RequestInfo"></param>
+ /// <returns></returns>
+ public dynamic GetXcslDaa(dynamic unity, dynamic RequestInfo)
{
- if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
-
- var wwgd = Db.Queryable<WwGd, MesItems>((a, i) =>
- new JoinQueryInfos(JoinType.Left,
- a.Daa003 == i.ItemId))
- .Where((a, i) => a.Daa001 == query.daa001 && (a.PcSh ?? 0) == 1)
- .Select((a, i) => new
- {
- a.Daa001, a.RwdGuid
- }).First();
-
- if (wwgd?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
-
- var womdabs = Db
- .Queryable<WwGd, WwGdDetail, MesItems, ProductionOrderSub>((a, b, c,
- d) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.Id == b.Pid,
- JoinType.Inner,
- c.Id == b.Dab003,
- JoinType.Inner, b.Erpid.ToString() == d.ErpId
- ))
- .Where((a, b, c, d) =>
- a.Daa001 == query.daa001)
- .Select((a, b, c, d) => new WwGdDetail
- {
- Pid = b.Pid,
- Dab003 = b.Dab003,
- Dab006 = b.Dab006,
- Dab007 = b.Dab007,
- wNum = b.Dab006 - b.Dab007, // 璁＄畻瀛楁 W_NUM
- ItemName = c.ItemName, // 鍔ㄦ�佸瓧娈� ITEM_NAME
- ItemNo = c.ItemNo // 鍔ㄦ�佸瓧娈� ITEM_NO
- })
- .ToList();
-
- var list = womdabs.Where(s => s.wNum > 0).ToList();
-
- var mesInvItemOutCDetailsList = Db
- .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
- ((a, b, c) =>
- new JoinQueryInfos(
- JoinType.Inner, a.ItemId == b.Id,
- JoinType.Inner, c.DepotId == a.DepotId
- ))
- .Where((a, b, c) => a.WorkNo == query.daa001)
- .Select((a, b, c) => new MesInvItemOutCDetails
- {
- ItemName = b.ItemName,
- ItemNo = b.ItemNo,
- ItemId = a.ItemId,
- DepotId = a.DepotId,
- WorkNo = a.WorkNo,
- DepotName = c.DepotName,
- Quantity = a.Quantity
- })
- .ToList();
-
- var womcaa = Db.Queryable<ProductionOrder>()
- .Where(s => s.Guid == wwgd.RwdGuid)
- .First();
-
- var dto = new ProductionPickDto
+ var orgId = RequestInfo.OrgId;
+ var parameters = new List<SugarParameter>
{
- daa001 = wwgd.Daa001,
- PlanNo = womcaa.ErpProductionOrderNo,
- totals1 = womdabs,
- daisao1 = list,
- yisao = mesInvItemOutCDetailsList
+ new SugarParameter("@selectKey", unity.selectKey),
+ new SugarParameter("@inP1", orgId), // 鍙�夊弬鏁�
+ new SugarParameter("@inP2", unity.selDaaType), // 鍙�夊弬鏁�
+ new SugarParameter("@inP3", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP4", null), // 鍙�夊弬鏁�
+ // ...鍏朵粬鍙�夊弬鏁�
};
+ var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_wwll_list @selectKey, @inP1, @inP2, @inP3, @inP4", parameters);
+ return result;
+ }
- return dto;
+ /// <summary>
+ /// 鍒楄〃鏄庣粏
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="RequestInfo"></param>
+ /// <returns></returns>
+ public dynamic GetItemsByDaa001(WarehouseQuery query, dynamic RequestInfo)
+ {
+ return getDaa001(query, RequestInfo);
+ }
+
+ private dynamic getDaa001(WarehouseQuery query, dynamic RequestInfo)
+ {
+ if (string.IsNullOrEmpty(query.daa001)) throw new Exception("璇烽�夊伐鍗曞彿锛�");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+ if (string.IsNullOrEmpty(query.daa001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍙蜂笉瀛樺湪", nameof(query.daa001));
+
+ var orgId = RequestInfo.OrgId;
+ if (orgId == null)
+ throw new Exception("缁勭粐涓嶅瓨鍦紒");
+
+ var parameters = new[]
+ {
+ new SugarParameter("@daa001", query.daa001),
+ new SugarParameter("@pi_orgId", orgId),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
+ try
+ {
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC prc_pda_wwll_detailList @daa001,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ var planNo = blDetails.FirstOrDefault()?.ErpProductionOrderNo?.ToString();// 鑾峰彇宸ュ崟璁″垝鍙�
+ return new
+ {
+ daa001 = query.daa001,
+ PlanNo = planNo,
+ items = items,
+ ysitems = ysitems
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"{ex.Message}");
+ }
}
#region 濮斿閫�鏂�
@@ -284,6 +311,7 @@
if (c_mes_inv_item_barcodes == null)
throw new Exception("姝ゆ潯鐮佷笉灞炰簬璇ラ��鏂欏崟锛岃鏍稿锛�");
+
// if (c_mes_inv_item_barcodes.Memo != "鐢熶骇閫�鏂�")
// throw new Exception("姝ゆ潯鐮佷笉鏄敓浜ч��鏂欐潯鐮侊紝涓嶅彲浣跨敤鐢熶骇閫�鏂欐ā鍧楋紒");
@@ -318,17 +346,12 @@
throw new Exception("鏉＄爜涓嶅睘浜庤鐢宠鍗曟槑缁�,鏃犳硶鎵爜!");
//鍒ゆ柇璐т富淇℃伅
- var CABerpid = Db.Queryable<WwGdDetail>()
- .Where(womdab =>
- womdab.Id.ToString() == C_MES_ITEM_TBL_DETAIL.Tld013)
- .Select(womdab => womdab.Erpid).First();
+ var CABerpid = Db.Queryable<WwGdDetail>().Where(womdab => womdab.Id.ToString() == C_MES_ITEM_TBL_DETAIL.Tld013).Select(womdab => womdab.Erpid).First();
- var WWCAB = Db.Queryable<ProductionOrderSub>()
- .Where(womcab => womcab.ErpId == CABerpid.Value.ToString()).First();
+ var WWCAB = Db.Queryable<ProductionOrderSub>().Where(womcab => womcab.ErpId == CABerpid.Value.ToString()).First();
- if (string.IsNullOrEmpty(WWCAB.Owner))
- throw new Exception("鐢ㄦ枡娓呭崟璐т富淇℃伅涓嶅瓨鍦�,鏃犳硶鎵爜锛岃鑱旂郴绠＄悊鍛�!");
+ if ( String.IsNullOrEmpty(WWCAB.Owner)) throw new Exception("鐢ㄦ枡娓呭崟璐т富淇℃伅涓嶅瓨鍦�,鏃犳硶鎵爜锛岃鑱旂郴绠＄悊鍛�!");
//var owner_type = "";
//if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
@@ -423,10 +446,10 @@
// 妫�鏌ユ槸鍚﹀瓨鍦ㄤ簬 MES_INV_ITEM_IN_C_ITEMS 琛�
var existingCount = db.Queryable<MesInvItemInCItems>()
- .Where(it =>
- it.ItemInId == c_id &&
- it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
- it.DepotId == c_depot_code.ToString())
+ .Where(it =>
+ it.ItemInId == c_id &&
+ it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
+ it.DepotId == c_depot_code.ToString())
.Count();
if (existingCount == 0)
@@ -462,14 +485,12 @@
db.Updateable<MesInvItemInCItems>()
.SetColumns(it => new MesInvItemInCItems
{
- Quantity = SqlFunc.IsNull(it.Quantity, 0) +
- c_mes_inv_item_barcodes
- .Quantity // 纭繚 Quantity 涓嶄负 null
+ Quantity = SqlFunc.IsNull(it.Quantity, 0) + c_mes_inv_item_barcodes.Quantity // 纭繚 Quantity 涓嶄负 null
})
- .Where(it =>
- it.ItemInId == c_id &&
- it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
- it.DepotId == c_depot_code.ToString())
+ .Where(it =>
+ it.ItemInId == c_id &&
+ it.ItemId == C_MES_ITEM_TBL_DETAIL.Tld009 &&
+ it.DepotId == c_depot_code.ToString())
//.IgnoreColumns(true) // 淇濈暀 IgnoreColumns
.ExecuteCommand();
@@ -511,7 +532,7 @@
ReceiveOrgId = c_mes_depots.FSubsidiary,
EbelnK3id = c_mes_inv_item_barcodes.EbelnK3id,
LineK3id = c_mes_inv_item_barcodes.LineK3id,
- Ischeck = true
+ Ischeck = true,
}).IgnoreColumns(true).ExecuteCommand();
// 鎻掑叆涓氬姟璁板綍
@@ -629,8 +650,8 @@
})
.Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
&& it.Tld009 == c_mes_inv_item_barcodes.ItemId)
- //&& it.Tld010 ==
- //c_mes_inv_item_barcodes.WorkLine)
+ //&& it.Tld010 ==
+ //c_mes_inv_item_barcodes.WorkLine)
.ExecuteCommand();
}
// 浣滀笟涓嶈壇閫�鏂� - 鏇存柊宸ュ崟琛ㄥ拰閫�鏂欏崟鏄庣粏琛�
@@ -663,8 +684,8 @@
})
.Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
&& it.Tld009 == c_mes_inv_item_barcodes.ItemId)
- //&& it.Tld010 ==
- //c_mes_inv_item_barcodes.WorkLine)
+ //&& it.Tld010 ==
+ //c_mes_inv_item_barcodes.WorkLine)
.ExecuteCommand();
}
@@ -679,9 +700,9 @@
.ExecuteCommand();
// 妫�鏌ラ��鏂欏崟鏄惁鎵�鏈夋槑缁嗛兘宸插畬鎴�
- var remainingCount = Db
- .Queryable<MesItemTbl, MesItemTblDetail>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Tlmid))
+ var remainingCount = Db.Queryable<MesItemTbl, MesItemTblDetail>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Id == b.Tlmid))
.Where((a, b) =>
a.BillNo == p_bill_no &&
(b.Tld005 ?? 0) - (b.Tld006 ?? 0) > 0)
@@ -702,10 +723,8 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "[PDA]濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" +
- c_bill_no + "銆�";
- logService.CreateLog(db, query.userName, wwgd.Id.ToString(),
- "WW_GD", LogMsg, wwgd.Daa001);
+ var LogMsg = "[PDA]濮斿閫�鏂欍�傛潯鐮併��" + query.barcode + "銆� 閫�鏂欏崟鍙枫��" + c_bill_no + "銆�";
+ logService.CreateLog(db, query.userName, wwgd.Id.ToString(), "WW_GD", LogMsg, wwgd.Daa001);
return totalResult;
});
@@ -720,7 +739,7 @@
#region 濮斿琛ユ枡
/// <summary>
- /// 濮斿宸ュ崟琛ユ枡鎵爜
+ /// 濮斿宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -781,8 +800,7 @@
// 鑾峰彇琛ユ枡鍗曟槑缁嗗苟鏍￠獙
var blDetail = Db.Queryable<MesItemBlDetail>()
.Where(b =>
- b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId &&
- b.Bld007 > b.Bld008)
+ b.Mid == mesItemBl.Id && b.Bld012 == stockBarcode.ItemId && b.Bld007 > b.Bld008)
.First();
if (blDetail == null)
@@ -850,9 +868,13 @@
//query.Type = "濮斿琛ユ枡";
var outNoType = "WWBL(濮斿琛ユ枡)";
if (query.Type == "濮斿琛ユ枡")
+ {
outNoType = "WWBL(濮斿琛ユ枡)";
+ }
else
+ {
outNoType = "WWCL(濮斿瓒呴)";
+ }
//outNoType = "WWBL(濮斿琛ユ枡)";
// 鑾峰彇鎴栧垱寤哄嚭搴撳崟
var outId = Guid.NewGuid();
@@ -900,7 +922,7 @@
OutDate = DateTime.Now,
Status = 0,
DepotId = stockBarcode.DepotId,
- THORGID = stockBarcode.StockOrgId
+ THORGID = stockBarcode.StockOrgId,
//BbillNo = query.billNo
}).IgnoreColumns(true).ExecuteCommand();
}
@@ -908,9 +930,7 @@
// 妫�鏌ュ苟鏇存柊鍑哄簱鍗曠墿鏂欐槑缁�
var itemCount = db.Queryable<MesInvItemOutItems>()
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId &&
- i.ItemOutId == outId &&
- i.DepotId == stockBarcode.DepotsId.ToString())
+ i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
.Count();
if (itemCount > 0)
@@ -919,10 +939,7 @@
.SetColumns(i =>
i.TlQty == i.TlQty + stockBarcode.Quantity)
.Where(i =>
- i.ItemOutId == outId &&
- i.ItemId == stockBarcode.ItemId &&
- i.ItemOutId == outId &&
- i.DepotId == stockBarcode.DepotsId.ToString())
+ i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
.ExecuteCommand();
else
// 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
@@ -949,7 +966,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
DepotId = stockBarcode.DepotId.ToString(),
- ItemDabid = blDetail.Id
+ ItemDabid = blDetail.Id,
//AboutGuid = womdab.Id
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
@@ -1080,19 +1097,16 @@
// 鍒涘缓 鎻掑叆鏃ュ織
var logService = new LogService();
- var LogMsg = "[PDA]" + query.Type + "銆傛潯鐮併��" + query.barcode +
- "銆� 鏁伴噺銆�" + stockBarcode.Quantity + "銆� 鍑哄簱鍗曞彿銆�" + outNo +
- "銆�";
- logService.CreateLog(db, query.userName, wwgd.Id.ToString(),
- "WW_GD", LogMsg, wwgd.Daa001);
+ var LogMsg = "[PDA]"+query.Type + "銆傛潯鐮併��" +query.barcode+"銆� 鏁伴噺銆�"+ stockBarcode.Quantity.ToString() + "銆� 鍑哄簱鍗曞彿銆�"+ outNo +"銆�";
+ logService.CreateLog(db,query.userName,wwgd.Id.ToString(), "WW_GD", LogMsg,wwgd.Daa001);
return 1;
});
// 鑾峰彇鏈�缁堢殑寰呭彂鏂欐槑缁嗗垪琛�
- var finalPendingList = Db
- .Queryable<MesItemBl, MesItemBlDetail>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
+ var finalPendingList = Db.Queryable<MesItemBl, MesItemBlDetail>(
+ (a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
.Select((a, b) => new MesItemBlDetail
diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index d671f46..5314f17 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -3,6 +3,7 @@
using NewPdaSqlServer.entity;
using NewPdaSqlServer.util;
using SqlSugar;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace NewPdaSqlServer.service.@base;
@@ -10,27 +11,27 @@
{
public dynamic login(string name, string pwd)
{
+
var strPass = UtilityHelper.MD5Encrypt32(pwd);
//var sysUser = Db.Queryable<SysUser>()
// .Where(s => s.Account == name
// && s.Password == strPass).First();
+
+
var parameters = new[]
{
- new SugarParameter("@pi_account", name),
- new SugarParameter("@pi_password", strPass),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null)
- };
+ new SugarParameter("@pi_account", name),
+ new SugarParameter("@pi_password", strPass),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null)
+ };
try
{
- var sysUser = Db.Ado
- .SqlQuery<dynamic>(
- "EXEC prc_pda_login_selUserOrgInfo @pi_account,@pi_password,@inP1,@inP2,@inP3",
- parameters).First();
+ var sysUser = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_login_selUserOrgInfo @pi_account,@pi_password,@inP1,@inP2,@inP3", parameters).First();
if (sysUser == null) throw new Exception("鐢ㄦ埛涓嶅瓨鍦�");
@@ -43,6 +44,7 @@
// 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫
throw new Exception($"{ex.Message}");
}
+
}
public List<dynamic> getUserMenu(string name)
@@ -51,13 +53,13 @@
if ("admin".Equals(name))
{
pageViewList = Db.Queryable<MesSysPageview>()
- .Where(s => s.PageStatus == true)
- .OrderBy(s => s.PageIdx)
- .ToList();
+ .Where(s => s.PageStatus == true)
+ .OrderBy(s => s.PageIdx)
+ .ToList();
}
else
{
- var sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A
+ string sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A
LEFT JOIN SYS_USER_BIND B ON CAST(A.guid AS VARCHAR(100)) = B.aboutGuid
LEFT JOIN SYS_USER C ON C.GUID = B.userGuid
WHERE C.ACCOUNT = '{0}'", name);
@@ -113,8 +115,9 @@
}
return result;
+
}
- catch (Exception e)
+ catch(Exception e)
{
throw new Exception(e.Message);
}
@@ -134,6 +137,7 @@
public List<dynamic> getUserInfo(string userGuid)
{
+
//string sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A
// LEFT JOIN SYS_USER_BIND B ON A.guid = B.aboutGuid
// LEFT JOIN SYS_USER C ON C.GUID = B.userGuid
@@ -147,25 +151,22 @@
public dynamic changeOrg(dynamic query)
{
- if (query == null)
- throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
+ if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
if (string.IsNullOrEmpty(query.userName?.ToString()))
throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName));
var parameters = new[]
{
- new SugarParameter("@pi_account", query.userName),
- new SugarParameter("@inP1", null),
- new SugarParameter("@inP2", null),
- new SugarParameter("@inP3", null)
+ new SugarParameter("@pi_account", query.userName),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null)
};
try
{
- var orgInfo = Db.Ado.SqlQuery<dynamic>(
- "EXEC prc_pda_my_selOrgInfo @pi_account,@inP1,@inP2,@inP3",
- parameters);
+ var orgInfo = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_my_selOrgInfo @pi_account,@inP1,@inP2,@inP3", parameters);
//if (sysUser.Count < 1) throw new Exception("鐢ㄦ埛涓嶅瓨鍦ㄥ叧鑱旂粍缁�");
return orgInfo;
@@ -175,5 +176,6 @@
// 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫
throw new Exception($"{ex.Message}");
}
+
}
}
\ No newline at end of file
diff --git a/service/base/MesDepotsManager.cs b/service/base/MesDepotsManager.cs
index 92bafa7..a5bddc9 100644
--- a/service/base/MesDepotsManager.cs
+++ b/service/base/MesDepotsManager.cs
@@ -4,5 +4,4 @@
namespace NewPdaSqlServer.service.@base;
public class MesDepotsManager : Repository<MesDepots>
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/service/base/MesImageManager.cs b/service/base/MesImageManager.cs
index d9be77f..dd1d13d 100644
--- a/service/base/MesImageManager.cs
+++ b/service/base/MesImageManager.cs
@@ -1,5 +1,4 @@
锘縰sing NewPdaSqlServer.DB;
-using NewPdaSqlServer.Dto.@base;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
@@ -15,8 +14,8 @@
public List<MesFile> getImage(ImageDto dto)
{
var withOracle = Db.Queryable<MesFile>()
- .Where(s => s.ParentGuid.ToString() == dto.parentId)
- .ToList();
+ .Where(s => s.ParentGuid.ToString() == dto.parentId)
+ .ToList();
return withOracle;
}
@@ -25,8 +24,8 @@
public int deleteImage(ImageDto dto)
{
var withOracle = Db.Deleteable<MesFile>()
- .Where(s => s.Guid.ToString() == dto.id)
- .ExecuteCommand();
+ .Where(s => s.Guid.ToString() == dto.id)
+ .ExecuteCommand();
return withOracle;
}
diff --git a/service/base/MesPrintMangeer.cs b/service/base/MesPrintMangeer.cs
index 84ef4fb..b73c912 100644
--- a/service/base/MesPrintMangeer.cs
+++ b/service/base/MesPrintMangeer.cs
@@ -1,104 +1,109 @@
-锘縰sing NewPdaSqlServer.DB;
-using SqlSugar;
-
-namespace NewPdaSqlServer.service.@base;
-
-public class MesPrintMangeer : Repository<dynamic>
+锘縩amespace NewPdaSqlServer.service.@base
{
- public dynamic getPrintInfo(dynamic query)
- {
- // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
- var sqlParams = new List<SugarParameter>
- { new("@userAccount", query.userName) };
+ using NewPdaSqlServer.Dto.service;
+ using NewPdaSqlServer.entity;
+ using SqlSugar;
+ using System;
+ using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+ using System.Data;
+ using NewPdaSqlServer.DB;
+ using System.Data;
+ using System.Data.SqlClient;
+ using Microsoft.EntityFrameworkCore.Metadata.Internal;
- var sql1 = @"SELECT TOP 1 ip,port fROM print_info A
+
+ public class MesPrintMangeer : Repository<dynamic>
+ {
+ public dynamic getPrintInfo(dynamic query)
+ {
+
+ // 浣跨敤鍙傛暟鍖栨煡璇㈤槻姝QL娉ㄥ叆
+ var sqlParams = new List<SugarParameter> { new("@userAccount", query.userName) };
+
+ var sql1 = @"SELECT TOP 1 ip,port fROM print_info A
left join SYS_USER_BIND B on A.guid = B.aboutGuid
left join SYS_USER C ON C.GUID = B.userGuid
WHERE C.ACCOUNT = @userAccount AND B.fType = '鎵撳嵃鏈�'";
- var printInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
+ var printInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);
- if (printInfo.Count < 1) throw new Exception("褰撳墠鐢ㄦ埛鏈粦瀹氭墦鍗版満锛岃缁存姢鍚庝娇鐢ㄦ媶鍒嗗姛鑳斤紒");
+ if (printInfo.Count < 1 ) throw new Exception("褰撳墠鐢ㄦ埛鏈粦瀹氭墦鍗版満锛岃缁存姢鍚庝娇鐢ㄦ媶鍒嗗姛鑳斤紒");
- return printInfo;
- }
+ return printInfo;
+ }
- public dynamic getCfInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
- {
- // 鍙傛暟鏍￠獙
- if (string.IsNullOrEmpty(query?.cfBarcode))
- throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
- if (string.IsNullOrEmpty(query?.barcode))
- throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
-
- // 浣跨敤寮虹被鍨嬪弬鏁�
- var sqlParams = new List<SugarParameter>
+ public dynamic getCfInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
{
- new("@cfBar", query.cfBarcode.Trim()),
- new("@oldBar", query.barcode.Trim())
- };
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query?.cfBarcode))
+ throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(query?.barcode))
+ throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
- var sql = @"EXEC prc_pda_base_selBarCfInfo @cfBar,@oldBar";
+ // 浣跨敤寮虹被鍨嬪弬鏁�
+ var sqlParams = new List<SugarParameter> {
+ new("@cfBar", query.cfBarcode.Trim()),
+ new("@oldBar", query.barcode.Trim())
+ };
- var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
+ var sql = @"EXEC prc_pda_base_selBarCfInfo @cfBar,@oldBar";
- //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
- return mergedData;
- }
+ //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
- /// <summary>
- /// PDA閲嶆墦鏉＄爜
- /// </summary>
- /// <param name="query"></param>
- /// <returns></returns>
- /// <exception cref="ArgumentException"></exception>
- public dynamic getPrintBarInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
- {
- // 鍙傛暟鏍￠獙
- if (string.IsNullOrEmpty(query?.barcode))
- throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
+ return mergedData;
+ }
- // 浣跨敤寮虹被鍨嬪弬鏁�
- var sqlParams = new List<SugarParameter>
+ /// <summary>
+ /// PDA閲嶆墦鏉＄爜
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="ArgumentException"></exception>
+ public dynamic getPrintBarInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
{
- new("@pi_Bar", query.barcode.Trim())
- };
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query?.barcode))
+ throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
- var sql = @"EXEC prc_pda_basePrint_selBarInfo @pi_Bar ";
+ // 浣跨敤寮虹被鍨嬪弬鏁�
+ var sqlParams = new List<SugarParameter> {
+ new("@pi_Bar", query.barcode.Trim())
+ };
- var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
+ var sql = @"EXEC prc_pda_basePrint_selBarInfo @pi_Bar ";
- //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
- return mergedData;
- }
+ //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
- // // 鐜板満鏀舵枡灞曠ず鍒楄〃
- // public class PrintBarInfo
- // {
- // public List<dynamic> cfBarInfo { get; set; }
- // public List<dynamic> oldBarInfo { get; set; }
- // }
+ return mergedData;
+ }
- public dynamic getCfBeforeInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
- {
- // 鍙傛暟鏍￠獙
- if (string.IsNullOrEmpty(query?.cfBarcode))
- throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
- if (string.IsNullOrEmpty(query?.barcode))
- throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
+ // // 鐜板満鏀舵枡灞曠ず鍒楄〃
+ // public class PrintBarInfo
+ // {
+ // public List<dynamic> cfBarInfo { get; set; }
+ // public List<dynamic> oldBarInfo { get; set; }
+ // }
- // 浣跨敤寮虹被鍨嬪弬鏁�
- var sqlParams = new List<SugarParameter>
+ public dynamic getCfBeforeInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
{
- new("@cfBar", query.cfBarcode.Trim()),
- new("@oldBar", query.barcode.Trim())
- };
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query?.cfBarcode))
+ throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(query?.barcode))
+ throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
- var sql =
- @"SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鎷嗗垎鏉＄爜' AS BarType,B.ITEM_BARCODE,GETDATE() as print_date
+ // 浣跨敤寮虹被鍨嬪弬鏁�
+ var sqlParams = new List<SugarParameter> {
+ new("@cfBar", query.cfBarcode.Trim()),
+ new("@oldBar", query.barcode.Trim())
+ };
+
+ var sql = @"SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鎷嗗垎鏉＄爜' AS BarType,B.ITEM_BARCODE,GETDATE() as print_date
FROM MES_INV_ITEM_BARCODES B
LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
WHERE B.ITEM_BARCODE = @cfBar
@@ -110,10 +115,13 @@
LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
WHERE B.ITEM_BARCODE = @oldBar";
- var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
+ var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
- if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
- return mergedData;
+ return mergedData;
+ }
+
+
}
}
\ No newline at end of file
diff --git a/service/base/WmsBaseMangeer.cs b/service/base/WmsBaseMangeer.cs
index ae7fa43..e3eadf8 100644
--- a/service/base/WmsBaseMangeer.cs
+++ b/service/base/WmsBaseMangeer.cs
@@ -1,144 +1,150 @@
-锘縰sing System.Data;
-using System.Data.SqlClient;
-using NewPdaSqlServer.DB;
-using NewPdaSqlServer.Dto.service;
-using NewPdaSqlServer.entity;
-using NewPdaSqlServer.util;
-using SqlSugar;
-
-namespace NewPdaSqlServer.service.@base;
-
-public class WmsBaseMangeer : Repository<dynamic>
+锘縩amespace NewPdaSqlServer.service.@base
{
- /// <summary>
- /// 閫氱敤鍏ュ簱鏍￠獙
- /// </summary>
- /// <param name="db">SqlSugar 鏁版嵁搴撲笂涓嬫枃</param>
- /// <param name="edtUserNo">鎿嶄綔浜哄伐鍙�</param>
- /// <param name="barcode">鐗╂枡鏉＄爜</param>
- /// <param name="sectionCode">搴撲綅缂栫爜</param>
- /// <param name="stockId">浠撳簱ID</param>
- /// <param name="stockOrgId">搴撳瓨缁勭粐ID</param>
- /// <param name="billNo">鐢宠鍗曞彿</param>
- /// <param name="transactionNo">浜嬪姟绫诲瀷</param>
- /// <returns>鍖呭惈鏍￠獙缁撴灉鐨勬暟鎹紶杈撳璞�</returns>
- public dynamic pdaInvJY(SqlSugarScope db, string edtUserNo,
- string barcode, string sectionCode, string stockId, string stockOrgId,
- string billNo, string transactionNo)
+ using NewPdaSqlServer.Dto.service;
+ using NewPdaSqlServer.entity;
+ using SqlSugar;
+ using System;
+ using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+ using System.Data;
+ using NewPdaSqlServer.DB;
+ using System.Data;
+ using System.Data.SqlClient;
+ using Microsoft.EntityFrameworkCore.Metadata.Internal;
+
+
+ public class WmsBaseMangeer : Repository<dynamic>
{
- var outputMsg = "";
- var outputStatus = -1;
- using (var conn = new SqlConnection(DbHelperSQL.strConn))
- using (var cmd = new SqlCommand("prc_pda_inv_JY", conn))
+ /// <summary>
+ /// 閫氱敤鍏ュ簱鏍￠獙
+ /// </summary>
+ /// <param name="db">SqlSugar 鏁版嵁搴撲笂涓嬫枃</param>
+ /// <param name="edtUserNo">鎿嶄綔浜哄伐鍙�</param>
+ /// <param name="barcode">鐗╂枡鏉＄爜</param>
+ /// <param name="sectionCode">搴撲綅缂栫爜</param>
+ /// <param name="stockId">浠撳簱ID</param>
+ /// <param name="stockOrgId">搴撳瓨缁勭粐ID</param>
+ /// <param name="billNo">鐢宠鍗曞彿</param>
+ /// <param name="transactionNo">浜嬪姟绫诲瀷</param>
+ /// <returns>鍖呭惈鏍￠獙缁撴灉鐨勬暟鎹紶杈撳璞�</returns>
+ public dynamic pdaInvJY(SqlSugarScope db, string edtUserNo,
+ string barcode, string sectionCode, string stockId, string stockOrgId,
+ string billNo, string transactionNo)
{
- cmd.CommandType = CommandType.StoredProcedure;
- // 杈撳叆鍙傛暟閰嶇疆
- SqlParameter[] parameters =
+ var outputMsg = "";
+ var outputStatus = -1;
+
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ using (var cmd = new SqlCommand("prc_pda_inv_JY", conn))
{
- new("@pi_user", SqlDbType.NVarChar, 100) { Value = edtUserNo },
- new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = barcode },
- new("@pi_sectionCode", SqlDbType.NVarChar, 100)
- { Value = sectionCode },
- new("@pi_stockId", SqlDbType.NVarChar, 100) { Value = stockId },
- new("@pi_stockOrgId", SqlDbType.NVarChar, 100)
- { Value = stockOrgId },
- new("@pi_billno", SqlDbType.NVarChar, 100) { Value = billNo },
- new("@pi_transaction_no", SqlDbType.NVarChar, 10)
- { Value = transactionNo },
- new("@pi_val1", SqlDbType.NVarChar, 100)
- { Value = DBNull.Value }, // 棰勭暀鎵╁睍瀛楁
- new("@pi_val2", SqlDbType.NVarChar, 100)
- { Value = DBNull.Value }, // 棰勭暀鎵╁睍瀛楁
- new("@po_outMsg", SqlDbType.NVarChar, 2000)
- { Direction = ParameterDirection.Output },
- new("@po_outStatus", SqlDbType.Int)
- { Direction = ParameterDirection.Output }
- };
-
- try
- {
- conn.Open();
- cmd.Parameters.AddRange(parameters);
- cmd.ExecuteNonQuery();
-
- // 鑾峰彇杈撳嚭鍙傛暟
- outputMsg = parameters[9].Value?.ToString() ?? "";
- outputStatus = Convert.ToInt32(parameters[10].Value);
-
- if (outputStatus <= 0)
- throw new Exception(outputMsg);
-
- return new ProductionPickDto
+ cmd.CommandType = CommandType.StoredProcedure;
+ // 杈撳叆鍙傛暟閰嶇疆
+ SqlParameter[] parameters =
{
- barcode = barcode,
- strMsg = outputMsg,
- result = outputStatus.ToString()
- // 鍏朵粬闇�瑕佹槧灏勭殑瀛楁...
+ new("@pi_user", SqlDbType.NVarChar, 100) { Value = edtUserNo },
+ new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = barcode },
+ new("@pi_sectionCode", SqlDbType.NVarChar, 100) { Value = sectionCode },
+ new("@pi_stockId", SqlDbType.NVarChar, 100) { Value = stockId },
+ new("@pi_stockOrgId", SqlDbType.NVarChar, 100) { Value = stockOrgId },
+ new("@pi_billno", SqlDbType.NVarChar, 100) { Value = billNo },
+ new("@pi_transaction_no", SqlDbType.NVarChar, 10) { Value = transactionNo },
+ new("@pi_val1", SqlDbType.NVarChar, 100) { Value = DBNull.Value }, // 棰勭暀鎵╁睍瀛楁
+ new("@pi_val2", SqlDbType.NVarChar, 100) { Value = DBNull.Value }, // 棰勭暀鎵╁睍瀛楁
+ new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
- }
- catch (Exception ex)
- {
- throw new Exception($"鍏ュ簱鏍￠獙澶辫触: {ex.Message}");
+
+ try
+ {
+ conn.Open();
+ cmd.Parameters.AddRange(parameters);
+ cmd.ExecuteNonQuery();
+
+ // 鑾峰彇杈撳嚭鍙傛暟
+ outputMsg = parameters[9].Value?.ToString() ?? "";
+ outputStatus = Convert.ToInt32(parameters[10].Value);
+
+ if (outputStatus <= 0)
+ throw new Exception(outputMsg);
+
+ return new ProductionPickDto
+ {
+ barcode = barcode,
+ strMsg = outputMsg,
+ result = outputStatus.ToString(),
+ // 鍏朵粬闇�瑕佹槧灏勭殑瀛楁...
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鍏ュ簱鏍￠獙澶辫触: {ex.Message}");
+ }
}
}
- }
- /// <summary>
- /// 鑾峰彇鏉＄爜淇℃伅
- /// </summary>
- /// <param name="unity"></param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public MesInvItemBarcodes GetBarInfo(WarehouseQuery unity)
- {
- var barInfo = Db.Queryable<MesInvItemBarcodes>()
- .Where(s => s.ItemBarcode == unity.barcode)
- .First();
- if (barInfo is null) throw new Exception("璇ユ潯鐮佸簱瀛樹笉瀛樺湪锛�");
+ /// <summary>
+ /// 鑾峰彇鏉＄爜淇℃伅
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public MesInvItemBarcodes GetBarInfo(WarehouseQuery unity)
+ {
+ var barInfo = Db.Queryable<MesInvItemBarcodes>()
+ .Where(s => s.ItemBarcode == unity.barcode)
+ .First();
+ if (barInfo is null) throw new Exception("璇ユ潯鐮佸簱瀛樹笉瀛樺湪锛�");
- return barInfo; // 杩斿洖绗竴琛屾暟鎹紝濡傛灉娌℃湁鍒欒繑鍥� null
- }
+ return barInfo; // 杩斿洖绗竴琛屾暟鎹紝濡傛灉娌℃湁鍒欒繑鍥� null
+ }
- /// <summary>
- /// 鑾峰彇鐗╂枡淇℃伅
- /// </summary>
- /// <param name="strItemId"></param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public MesItems GetItemNo(decimal strItemId)
- {
- var itemInfo = Db.Queryable<MesItems>()
- .Where(s => s.Id == strItemId && s.Fforbidstatus == "A")
- .First();
- if (itemInfo is null) throw new Exception("璇ユ潯鐮佸搴旂墿鏂欎俊鎭笉瀛樺湪鎴栧凡绂佺敤锛�");
+ /// <summary>
+ /// 鑾峰彇鐗╂枡淇℃伅
+ /// </summary>
+ /// <param name="strItemId"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public MesItems GetItemNo(decimal strItemId)
+ {
+ var itemInfo = Db.Queryable<MesItems>()
+ .Where(s => s.Id == strItemId && s.Fforbidstatus == "A")
+ .First();
+ if (itemInfo is null) throw new Exception("璇ユ潯鐮佸搴旂墿鏂欎俊鎭笉瀛樺湪鎴栧凡绂佺敤锛�");
- return itemInfo;
- }
+ return itemInfo;
+ }
- /// <summary>
- /// 鑾峰彇璐т富绫诲瀷
- /// </summary>
- /// <param name="ownerId">璐т富ID</param>
- /// <returns>璐т富绫诲瀷(BD_OwnerOrg/BD_Customer/BD_Supplier)</returns>
- public string GetOwnerType(string ownerId)
- {
- if (string.IsNullOrEmpty(ownerId))
- throw new ArgumentNullException(nameof(ownerId));
+ /// <summary>
+ /// 鑾峰彇璐т富绫诲瀷
+ /// </summary>
+ /// <param name="ownerId">璐т富ID</param>
+ /// <returns>璐т富绫诲瀷(BD_OwnerOrg/BD_Customer/BD_Supplier)</returns>
+ public string GetOwnerType(string ownerId)
+ {
+ if (string.IsNullOrEmpty(ownerId))
+ throw new ArgumentNullException(nameof(ownerId));
- if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
- return "BD_OwnerOrg";
+ if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
+ {
+ return "BD_OwnerOrg";
+ }
+ else if (Db.Queryable<MesCustomer>().Any(x => x.Id == Convert.ToInt32(ownerId)))
+ {
+ return "BD_Customer";
+ }
+ else if (Db.Queryable<MesSupplier>().Any(x => x.Id == Convert.ToInt32(ownerId)))
+ {
+ return "BD_Supplier";
+ }
+ else if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
+ {
+ return "BD_OwnerOrg";
+ }
+
+ throw new Exception("鏃犳硶纭畾璐т富绫诲瀷锛岃妫�鏌ヨ揣涓籌D鏄惁姝ｇ‘锛�");
+ }
- if (Db.Queryable<MesCustomer>()
- .Any(x => x.Id == Convert.ToInt32(ownerId))) return "BD_Customer";
-
- if (Db.Queryable<MesSupplier>()
- .Any(x => x.Id == Convert.ToInt32(ownerId))) return "BD_Supplier";
-
- if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
- return "BD_OwnerOrg";
-
- throw new Exception("鏃犳硶纭畾璐т富绫诲瀷锛岃妫�鏌ヨ揣涓籌D鏄惁姝ｇ‘锛�");
+
}
}
\ No newline at end of file
diff --git a/util/BillNo.cs b/util/BillNo.cs
index e8c2ad3..5b985cf 100644
--- a/util/BillNo.cs
+++ b/util/BillNo.cs
@@ -30,27 +30,25 @@
return str;
}
- public static string ExecuteBarcodeSplit(string cUser, string oldBarcode,
- decimal? qty)
+ public static string ExecuteBarcodeSplit(string cUser, string oldBarcode, decimal? qty)
{
var sbSql = new StringBuilder();
- sbSql.Append(
- "DECLARE @outMsg nvarchar(2000), @outSum int, @barcodeNew varchar(200) ");
+ sbSql.Append("DECLARE @outMsg nvarchar(2000), @outSum int, @barcodeNew varchar(200) ");
sbSql.Append("EXEC prc_pda_bar_cf '").Append(cUser).Append("', '")
- .Append(oldBarcode).Append("', ").Append(qty)
- .Append(", @outMsg OUTPUT, @outSum OUTPUT, @barcodeNew OUTPUT ");
+ .Append(oldBarcode).Append("', ").Append(qty)
+ .Append(", @outMsg OUTPUT, @outSum OUTPUT, @barcodeNew OUTPUT ");
sbSql.Append("SELECT @barcodeNew");
var str = "";
try
{
- str = DbHelperSQL.GetSingle(sbSql.ToString())?.ToString();
+ str = DbHelperSQL.GetSingle(sbSql.ToString())?.ToString();
}
catch (Exception ex)
{
// 璁板綍鏃ュ織鎴栧鐞嗗紓甯�
- str = "";
+ str = "";
}
-
return str;
}
-}
\ No newline at end of file
+}
+
diff --git a/util/LogUtil.cs b/util/LogUtil.cs
index aeecbfe..8c88150 100644
--- a/util/LogUtil.cs
+++ b/util/LogUtil.cs
@@ -1,45 +1,45 @@
-锘縰sing NewPdaSqlServer.DB;
-using NewPdaSqlServer.entity;
-using SqlSugar;
-
-namespace NewPdaSqlServer.util;
-
-public class LogService : RepositoryNoEntity
+锘縩amespace NewPdaSqlServer.util
{
- /// <summary>
- /// 鍒涘缓鏃ュ織璁板綍
- /// </summary>
- /// <param name="db">SqlSugar 鏁版嵁搴撲笂涓嬫枃</param>
- /// <param name="edtUserNo">鐢ㄦ埛缂栧彿</param>
- /// <param name="abtGuid">鍏宠仈鍗曟嵁id</param>
- /// <param name="abtTable">琛ㄥ悕绉�</param>
- /// <param name="detail">鏃ュ織鍐呭</param>
- /// <param name="orderNo">鍗曟嵁鍙�</param>
- public void CreateLog(SqlSugarScope db, string edtUserNo, string abtGuid,
- string abtTable, string detail, string orderNo)
+ using NewPdaSqlServer.DB;
+ using NewPdaSqlServer.entity;
+ using SqlSugar;
+ using System;
+
+ public class LogService : RepositoryNoEntity
{
- var edtUserGuid = db.Queryable<SysUser>()
- .Where(it => it.Account == edtUserNo)
- .Select(it => it.Guid) //
- .First();
+ /// <summary>
+ /// 鍒涘缓鏃ュ織璁板綍
+ /// </summary>
+ /// <param name="db">SqlSugar 鏁版嵁搴撲笂涓嬫枃</param>
+ /// <param name="edtUserNo">鐢ㄦ埛缂栧彿</param>
+ /// <param name="abtGuid">鍏宠仈鍗曟嵁id</param>
+ /// <param name="abtTable">琛ㄥ悕绉�</param>
+ /// <param name="detail">鏃ュ織鍐呭</param>
+ /// <param name="orderNo">鍗曟嵁鍙�</param>
+ public void CreateLog(SqlSugarScope db, string edtUserNo, string abtGuid, string abtTable, string detail, string orderNo)
+ {
+ var edtUserGuid = db.Queryable<SysUser>()
+ .Where(it => it.Account == edtUserNo)
+ .Select(it => it.Guid) //
+ .First();
- //detail = "[PDA]" + detail;
- // 鎵ц瀛樺偍杩囩▼
- db.Ado.ExecuteCommand(
- "exec prc_log_create @edtUserGuid, @abtGuid, @abtTable, @detail, @orderNo",
- new
- {
- edtUserGuid,
- abtGuid,
- abtTable,
- detail,
- orderNo
- }
- );
- }
+ //detail = "[PDA]" + detail;
+ // 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "exec prc_log_create @edtUserGuid, @abtGuid, @abtTable, @detail, @orderNo",
+ new
+ {
+ edtUserGuid,
+ abtGuid,
+ abtTable,
+ detail,
+ orderNo
+ }
+ );
+ }
- public void CreateLogI(
+ public void CreateLogI(
SqlSugarScope db,
Guid edtUserGuid,
string abtGuid,
@@ -53,14 +53,11 @@
int sendStatus,
string executeTime)
{
- Db.Ado.ExecuteCommand(
+ Db.Ado.ExecuteCommand(
"exec prc_log_create @edtUserGuid, @abtGuid, @abtTable, @detail, @hNo,@RtnLogGuid, @SendJson, @RtnJson, @xkyBeginTime, @xkyEndTime, @sendStatus, @executeTime",
- new
- {
+ new {
edtUserGuid,
- abtGuid = string.IsNullOrEmpty(abtGuid)
- ? DBNull.Value
- : (object)abtGuid,
+ abtGuid = string.IsNullOrEmpty(abtGuid) ? DBNull.Value : (object)abtGuid,
abtTable = (object)abtTable ?? DBNull.Value,
detail,
hNo = orderNo,
@@ -73,4 +70,7 @@
executeTime = (object)executeTime ?? DBNull.Value
});
}
+ }
+
+
}
\ No newline at end of file
diff --git a/util/XkyApiHelper.cs b/util/XkyApiHelper.cs
index 09fb2c8..0a3159b 100644
--- a/util/XkyApiHelper.cs
+++ b/util/XkyApiHelper.cs
@@ -1,6 +1,9 @@
-锘縰sing System.Security.Cryptography;
+锘縰sing Newtonsoft.Json;
using System.Text;
-using Newtonsoft.Json;
+using NewPdaSqlServer.util;
+using System.Security.Cryptography;
+
+
namespace NewPdaSqlServer.util
{
@@ -20,11 +23,11 @@
//this.appSecret = "fa7c117c02fd4967849a612963c034ca";
//this.version = "1.0";
//姝ｅ紡
- appKey = "edfa5f089979c94f2db47ab0b2cdc35d";
- operateCompanyCode = "25832037";
- ownerCompanyCode = "25832037";
- appSecret = "4e46a1b61c5a8ce2fb2a519120f59520";
- version = "1.0";
+ this.appKey = "edfa5f089979c94f2db47ab0b2cdc35d";
+ this.operateCompanyCode = "25832037";
+ this.ownerCompanyCode = "25832037";
+ this.appSecret = "4e46a1b61c5a8ce2fb2a519120f59520";
+ this.version = "1.0";
}
public string appKey { get; set; }
@@ -38,21 +41,20 @@
namespace NewPdaSqlServer.util
{
/// API鐩稿叧鍙傛暟瀹氫箟鐨勫叏灞�绫�
- public class ApiGlobal
+ public partial class ApiGlobal
{
- private static readonly object _lock = new();
- private static bool _initialized;
+ private static readonly object _lock = new object();
+ private static bool _initialized = false;
static ApiGlobal()
{
Init();
}
- public static SignConst signConst { get; set; }
-
public static void Init()
{
if (!_initialized)
+ {
lock (_lock)
{
if (!_initialized)
@@ -61,7 +63,10 @@
_initialized = true;
}
}
+ }
}
+
+ public static SignConst signConst { get; set; }
}
}
@@ -73,27 +78,28 @@
{
public static MD5 md5 = MD5.Create();
- public static string buildCurrentSign(
- IDictionary<string, string> parameters, string appSecret)
+ public static string buildCurrentSign(IDictionary<string, string> parameters, String appSecret)
{
try
{
- var secret = ":" + appSecret;
- IDictionary<string, string> sortedParams =
- new SortedDictionary<string, string>(parameters,
- StringComparer.Ordinal);
- var dem = sortedParams.GetEnumerator();
- var query = new StringBuilder();
+ string secret = ":" + appSecret;
+ IDictionary<string, string> sortedParams = new SortedDictionary<string, string>(parameters, StringComparer.Ordinal);
+ IEnumerator<KeyValuePair<string, string>> dem = sortedParams.GetEnumerator();
+ StringBuilder query = new StringBuilder();
while (dem.MoveNext())
{
- var key = dem.Current.Key;
- var value = dem.Current.Value;
- if (key == "sign") continue;
+ string key = dem.Current.Key;
+ string value = dem.Current.Value;
+ if (key == "sign")
+ {
+ continue;
+ }
if (!string.IsNullOrEmpty(key))
+ {
query.Append(value).Append(":");
+ }
}
-
- var strvalue = query.ToString().TrimEnd(':') + secret;
+ string strvalue = query.ToString().TrimEnd(':') + secret;
return MD5Encrypt32(strvalue);
}
catch (Exception)
@@ -104,20 +110,22 @@
public static string MD5Encrypt32(string text)
{
- var pwd = "";
+ string pwd = "";
// 鍔犲瘑鍚庢槸涓�涓瓧鑺傜被鍨嬬殑鏁扮粍锛岃繖閲岃娉ㄦ剰缂栫爜UTF8/Unicode鐨勯�夋嫨銆�
- var s = md5.ComputeHash(Encoding.UTF8.GetBytes(text));
+ byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(text));
// 閫氳繃浣跨敤寰幆锛屽皢瀛楄妭绫诲瀷鐨勬暟缁勮浆鎹负瀛楃涓诧紝姝ゅ瓧绗︿覆鏄父瑙勫瓧绗︽牸寮忓寲鎵�寰�
- for (var i = 0; i < s.Length; i++)
+ for (int i = 0; i < s.Length; i++)
+ {
//灏嗗緱鍒扮殑瀛楃涓蹭娇鐢ㄥ崄鍏繘鍒剁被鍨嬫牸寮忋�傛牸寮忓悗鐨勫瓧绗︽槸灏忓啓鐨勫瓧姣嶏紝濡傛灉浣跨敤澶у啓锛圶锛夊垯鏍煎紡鍚庣殑瀛楃鏄ぇ鍐欏瓧绗�
pwd = pwd + s[i].ToString("x2");
- return pwd.ToLower();
+ }
+ return pwd.ToString().ToLower();
}
public static long GetTimestamp(DateTime d)
{
- var ts = d.ToUniversalTime() - new DateTime(1970, 1, 1);
- return (long)ts.TotalSeconds; //绮剧‘鍒扮
+ TimeSpan ts = d.ToUniversalTime() - new DateTime(1970, 1, 1);
+ return (long)ts.TotalSeconds; //绮剧‘鍒扮
}
}
}
@@ -128,12 +136,9 @@
/// ApiCommonParam API璇锋眰瀵瑰簲鐨凜ommon鍙傛暟绫�
public class ApiCommonParam
{
- public ApiCommonParam()
- {
- }
+ public ApiCommonParam() { }
- public ApiCommonParam(string appKey, string version,
- string operateCompanyCode, string ownerCompanyCode, long timestamps)
+ public ApiCommonParam(string appKey, string version, string operateCompanyCode, string ownerCompanyCode, long timestamps)
{
this.appKey = appKey;
this.version = version;
@@ -142,13 +147,12 @@
this.timestamps = timestamps;
}
- public string appKey { get; set; } //appKey
- public string version { get; set; } //鎺ュ彛鐗堟湰
- public string ownerCompanyCode { get; set; } //鏁版嵁鎵�灞炲叕鍙哥紪鐮�
- public string operateCompanyCode { get; set; } //鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
- public string sign { get; set; } //绛惧悕
-
- public long timestamps { get; set; } //璇锋眰鐨勬椂闂存埑
+ public string appKey { get; set; }//appKey
+ public string version { get; set; }//鎺ュ彛鐗堟湰
+ public string ownerCompanyCode { get; set; }//鏁版嵁鎵�灞炲叕鍙哥紪鐮�
+ public string operateCompanyCode { get; set; }//鎿嶄綔鑰呮墍灞炲叕鍙哥紪鐮�
+ public string sign { get; set; }//绛惧悕
+ public long timestamps { get; set; }//璇锋眰鐨勬椂闂存埑
//public object reserver { get; set; }//鎵╁睍瀛楁
/// 鏋勯�犲璞�
@@ -156,10 +160,10 @@
{
// 纭繚鍒濆鍖栧畬鎴�
ApiGlobal.Init();
-
+
// 鏋勯�犲璞★紙鍘熸湁閫昏緫淇濇寔涓嶅彉锛�
- var param = new ApiCommonParam(
- ApiGlobal.signConst.appKey,
+ ApiCommonParam param = new ApiCommonParam(
+ ApiGlobal.signConst.appKey,
ApiGlobal.signConst.version,
ApiGlobal.signConst.operateCompanyCode,
ApiGlobal.signConst.ownerCompanyCode,
@@ -168,12 +172,9 @@
var jsonParam = JsonConvert.SerializeObject(param);
//JavaScriptSerializer json = new JavaScriptSerializer();
//string jsonParam = json.Serialize(param);
- var paramDict =
- JsonConvert.DeserializeObject<Dictionary<string, string>>(
- jsonParam);
- param.sign = SignUtils.buildCurrentSign(paramDict,
- ApiGlobal.signConst.appSecret);
+ var paramDict = JsonConvert.DeserializeObject<Dictionary<string, string>>(jsonParam);
+ param.sign = SignUtils.buildCurrentSign(paramDict, ApiGlobal.signConst.appSecret);
return param;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3