From a39e1db786da4d91121c11844b87a5e5e84e8a86 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 05 九月 2025 08:19:40 +0800
Subject: [PATCH] 1.ERP修改 2.其他出库优化 3.生产领料新增开工时间
---
service/Wom/WomdaaManager.cs | 1
service/Warehouse/MesItemQtManager.cs | 144 +++++++++++++++++++++++++++++++++++
Dto/service/ProductionPickDto.cs | 2
entity/Womdaa.cs | 6 +
Config/appsettings.json | 22 +++-
Controllers/Warehouse/MesItemQtController.cs | 60 ++++++++++++++-
6 files changed, 222 insertions(+), 13 deletions(-)
diff --git a/Config/appsettings.json b/Config/appsettings.json
index 0a74805..b921a8d 100644
--- a/Config/appsettings.json
+++ b/Config/appsettings.json
@@ -8,15 +8,23 @@
"AllowedHosts": "*",
"AppSettings": {
"TestErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
- "ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest",
+ "ProductionErpUrl": "http://192.168.1.149:8066/WebService1.asmx/MesToErpinfoTest"
//"DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=TEST_MES;User ID=sa;Password =qixi123;Encrypt=True;TrustServerCertificate=True;"
- "DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes;Encrypt=True;TrustServerCertificate=True;"
+ //"DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes;Encrypt=True;TrustServerCertificate=True;"
},
+ //"Version": "1.0.0",
+ //"X-KDApi-AcctID": "683e92c7f92688",
+ //"X-KDApi-UserName": "MES",
+ //"X-KDApi-AppID": "315464_W58Nw/DtRIpUxewFR6WpRZzN5qT62BPK",
+ //"X-KDApi-AppSec": "f853011716de43589aade7b9dbbbe9e6",
+ //"X-KDApi-LCID": "2052",
+ //"X-KDApi-ServerUrl": "http://192.168.1.141/k3cloud/",
+
"Version": "1.0.0",
- "X-KDApi-AcctID": "683e92c7f92688",
- "X-KDApi-UserName": "MES",
- "X-KDApi-AppID": "315464_W58Nw/DtRIpUxewFR6WpRZzN5qT62BPK",
- "X-KDApi-AppSec": "f853011716de43589aade7b9dbbbe9e6",
+ "X-KDApi-AcctID": "6704a3360dafca",
+ "X-KDApi-UserName": "GS_MES",
+ "X-KDApi-AppID": "322643_SYeD28kvynn+4V9tX4XKSb1HRM66QpnI",
+ "X-KDApi-AppSec": "aac3bd55e1f542bd85ca69c7419d9d8f",
"X-KDApi-LCID": "2052",
- "X-KDApi-ServerUrl": "http://192.168.1.141/k3cloud/"
+ "X-KDApi-ServerUrl": "http://192.168.1.141/K3Cloud/"
}
diff --git a/Controllers/Warehouse/MesItemQtController.cs b/Controllers/Warehouse/MesItemQtController.cs
index d329e90..3a80f9e 100644
--- a/Controllers/Warehouse/MesItemQtController.cs
+++ b/Controllers/Warehouse/MesItemQtController.cs
@@ -1,6 +1,7 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
@@ -14,6 +15,8 @@
public class MesItemQtController : BaseController
{
private readonly MesItemQtManager _manager = new();
+
+ private readonly MesPrintMangeer _mCf = new();
#region 鍩虹CRUD
@@ -133,13 +136,38 @@
[HttpPost("OutScanBarcode")]
public ResponseResult OutScanBarcode([FromBody] WarehouseQuery query)
{
+ //try
+ //{
+ // dynamic resultInfos = new ExpandoObject();
+ // var (form, items, message) = _manager.OutScanBarcode(query);
+ // resultInfos.form = form;
+ // resultInfos.items = items;
+ // resultInfos.message = message;
+ // return new ResponseResult
+ // {
+ // status = 0,
+ // message = "OK",
+ // data = resultInfos
+ // };
+ //}
+ //catch (Exception ex)
+ //{
+ // return ResponseResult.ResponseError(ex);
+ //}
+
try
{
dynamic resultInfos = new ExpandoObject();
- var (form, items, message) = _manager.OutScanBarcode(query);
- resultInfos.form = form;
- resultInfos.items = items;
- resultInfos.message = message;
+ 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,
@@ -197,5 +225,29 @@
}
}
+
+ [HttpPost("ScanCodeCF")]
+ public ResponseResult ScanCodeCF(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+ var scanResult = _manager.ScanCodeCF(query);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
#endregion
}
\ No newline at end of file
diff --git a/Dto/service/ProductionPickDto.cs b/Dto/service/ProductionPickDto.cs
index dc51f2c..01393fc 100644
--- a/Dto/service/ProductionPickDto.cs
+++ b/Dto/service/ProductionPickDto.cs
@@ -19,6 +19,8 @@
//鎷嗗垎鍚庢潯鐮�
public string? cfBarcode { get; set; }
+ public string? startTime { get; set; }
+
//杩斿洖淇℃伅
public string? strMsg { get; set; }
//杩斿洖鍙傛暟绫诲瀷 -1锛氬け璐� 1锛氭垚鍔�
diff --git a/entity/Womdaa.cs b/entity/Womdaa.cs
index 5ff5888..16dbc5a 100644
--- a/entity/Womdaa.cs
+++ b/entity/Womdaa.cs
@@ -419,4 +419,10 @@
/// </summary>
[SugarColumn(ColumnName = "sj_xt")]
public string? SjXt { get; set; }
+
+ /// <summary>
+ /// 瀹為檯绾夸綋缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "mes_start_prod")]
+ public string? mesStartProd { get; set; }
}
\ No newline at end of file
diff --git a/service/Warehouse/MesItemQtManager.cs b/service/Warehouse/MesItemQtManager.cs
index 6fb9b43..a254c1e 100644
--- a/service/Warehouse/MesItemQtManager.cs
+++ b/service/Warehouse/MesItemQtManager.cs
@@ -1,9 +1,12 @@
-锘縰sing NewPdaSqlServer.DB;
+锘縰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;
namespace NewPdaSqlServer.service.Warehouse;
@@ -74,7 +77,8 @@
return new
{
items = items,
- ysitems = ysitems
+ ysitems = ysitems,
+ allList = blDetails,
};
}
catch (Exception ex)
@@ -881,4 +885,140 @@
});
return (query, mesItemQtDatalls, message);
}
+
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱锛堟柊锛夊瓨鍌ㄨ繃绋�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public ProductionPickDto ScanCode(WarehouseQuery query)
+ {
+ var _strMsg = "";
+ var _intSum = "";
+ 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("鏉＄爜涓嶅厑璁镐负绌�");
+
+ using (var cmd = new SqlCommand("[prc_pda_QTCK]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.NVarChar, 300),
+ new("@barcode_num", SqlDbType.NVarChar, 300),
+ new("@split_num", SqlDbType.NVarChar, 300),
+ new("@c_User", query.userName),
+ new("@p_biLL_no", query.billNo),
+ new("@p_item_barcode", query.barcode)
+ };
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
+ parameters[3].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _strMsg = parameters[0].Value.ToString();
+ _intSum = parameters[1].Value.ToString();
+
+ var barcodeNum = parameters[2].Value.ToString();
+ var splitNum = parameters[3].Value.ToString();
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.billNo,
+ barcodeNum = barcodeNum,
+ splitNum = splitNum,
+ barcode = query.barcode,
+ result = result.ToString()
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+
+ public ProductionPickDto ScanCodeCF(WarehouseQuery query)
+ {
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("鐢宠鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ if (query.Num is null or 0) throw new Exception("鏉＄爜鎷嗗垎鏁颁笉鍏佽涓虹┖鎴栬�呬负0");
+
+ var _strMsg = "";
+ var _intSum = "";
+ var _cfBar = "";//鎷嗗垎鍚庢潯鐮�
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd = new SqlCommand("[prc_pda_QTCK_CF]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ 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();
+
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.billNo,
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = _cfBar//鎷嗗垎鍚庢潯鐮�
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index d6f50d5..579d1df 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -74,6 +74,7 @@
{
daa001 = query.daa001,
PlanNo = womcaa.Caa020,
+ startTime = womdaa.mesStartProd,
items = DS_list,
Ysitems = YS_list
};
--
Gitblit v1.9.3