From b289e477c13910c2814d89915342a7edabee5a8d Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 14 八月 2025 08:45:01 +0800
Subject: [PATCH] 巡检入库检修改
---
StandardInterface/MESApplication/Controllers/QC/XJController.cs | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/StandardInterface/MESApplication/Controllers/QC/XJController.cs b/StandardInterface/MESApplication/Controllers/QC/XJController.cs
index 8068a2f..e515b8c 100644
--- a/StandardInterface/MESApplication/Controllers/QC/XJController.cs
+++ b/StandardInterface/MESApplication/Controllers/QC/XJController.cs
@@ -15,7 +15,7 @@
[HttpPost("getAll")]
public ResponseResult getAll([FromBody] JObject data)
{
- var modify1Flag = Convert.ToInt32(data["modify1Flag"].ToString());
+ var modify1Flag = Convert.ToInt32(data["modify1Flag"]?.ToString() ?? "0");
try
{
dynamic resultInfos = new ExpandoObject();
@@ -88,13 +88,36 @@
[HttpPost("getDaa001")]
public ResponseResult getDaa001([FromBody] JObject data)
{
- var daa020 = data["daa020"].ToString();
- var item = data["item"].ToString();
+ var daa020 = data["daa020"]?.ToString() ?? "";
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getDaa001(daa020, item);
+ var tbBillList = new XJService().getDaa001(daa020);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸ュ崟璇︾粏淇℃伅锛堝寘鍚墿鏂欎俊鎭級
+ /// </summary>
+ [HttpPost("getWorkOrderWithItem")]
+ public ResponseResult getWorkOrderWithItem([FromBody] JObject data)
+ {
+ var daa020 = data["daa020"]?.ToString() ?? "";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList = new XJService().getWorkOrderWithItem(daa020);
resultInfos.tbBillList = tbBillList;
return new ResponseResult
{
@@ -116,7 +139,7 @@
[HttpPost("getBoardItem")]
public ResponseResult getBoardItem([FromBody] JObject data)
{
- var lineNo = data["lineNo"].ToString();
+ var lineNo = data["lineNo"]?.ToString() ?? "";
try
{
dynamic resultInfos = new ExpandoObject();
@@ -142,7 +165,7 @@
[HttpPost("getItem")]
public ResponseResult getItem([FromBody] JObject data)
{
- var daa001 = data["daa001"].ToString();
+ var daa001 = data["daa001"]?.ToString() ?? "";
try
{
dynamic resultInfos = new ExpandoObject();
@@ -166,7 +189,7 @@
[HttpPost("setJYItem")]
public ResponseResult setJYItem([FromBody] JObject data)
{
- var itemNo = data["itemNo"].ToString();
+ var itemNo = data["itemNo"]?.ToString() ?? "";
try
{
dynamic resultInfos = new ExpandoObject();
@@ -193,9 +216,12 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().save(xjDto);
- resultInfos.tbBillList = tbBillList;
+ var result = new XJService().save(xjDto);
+
+ // 杩斿洖瀹屾暣鐨刋JDto瀵硅薄锛屽寘鍚洿鏂板悗鐨刬tems
+ resultInfos.tbBillList = result;
+ resultInfos.xjDto = xjDto; // 鍖呭惈瀹屾暣鐨勬楠岄」鐩俊鎭�
+
return new ResponseResult
{
status = 0,
@@ -529,8 +555,8 @@
try
{
var id = Convert.ToDecimal(data["id"]);
- var departmentId = data["departmentId"].ToString();
- var departmentName = data["departmentName"].ToString();
+ var departmentId = data["departmentId"]?.ToString() ?? "";
+ var departmentName = data["departmentName"]?.ToString() ?? "";
dynamic resultInfos = new ExpandoObject();
var result = new XJService().SaveDepartmentSelection(id, departmentId, departmentName);
@@ -556,7 +582,7 @@
{
try
{
- var departmentId = data["departmentId"].ToString();
+ var departmentId = data["departmentId"]?.ToString() ?? "";
dynamic resultInfos = new ExpandoObject();
var tbBillList = new XJService().GetLinesByDepartment(departmentId);
--
Gitblit v1.9.3