From 7e8fbf96c0e985791b7aad451b1b33d933ba77df Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 29 七月 2024 16:56:11 +0800
Subject: [PATCH] 库存检验单 增加 批次号，检验数量，良品数量，报废数量，可疑数 HBatchNo varchar(200) --批号 HInSpectQty dec(18,8) --检验数量 HRightQty dec(18,8) --合格数量 HUnRightQty dec(18,8) --不合格数量 HUnKnowQty dec(18,8) --可疑数量 实验室 仪器检验时，扫码流转卡二维码的， 改为 可以扫 取样单 二维码（即 可以扫流转卡也可以扫取样单）。 检验单里 保存 对应的 取样单 内码； 首件单，巡检单，工序检验单 表头增加 字段 HTakeSampleCheckBillID int --取样单内码 HTakeSampleCheckBillNo int --取样单 出站单 ：增加 字段： 返工数，工废数量，料废数量 ，料废返工数量 HBackWorkQty dec(18,8) -- 返工数 HBadByWorkQty dec(18,8) -- 工废数量 HBadByMaterQty dec(18,8) --料废数量 HBackWorkByMaterQty dec(18,8) --料废返工数量
---
WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs b/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
index b5de632..6691b80 100644
--- a/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
@@ -26,29 +26,30 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from Gy_RoutingGroup where 1=1", "Gy_RoutingGroup");
+ ds = oCN.RunProcReturn("select * from Gy_RoutingGroup where 1=1 order by HItemID ", "Gy_RoutingGroup");
}
else
{
- string sql = "select * from Gy_RoutingGroup where 1 = 1 " + sWhere;
+ string sql = "select * from Gy_RoutingGroup where 1 = 1 " + sWhere+ " order by HItemID ";
ds = oCN.RunProcReturn(sql, "Gy_RoutingGroup");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁璁板綍锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
--
Gitblit v1.9.1