From 1e926de88d3690ed057d9b2c930ef2af611461a4 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 15 四月 2024 17:29:36 +0800
Subject: [PATCH] 物料 增加 字段 HPictureFile --照片 HCommonUseFlag bit --是否不常用材料 HAvgStockPrice dec(18,4) --加权平均价 HFootPrice dec(18,8) --结算价 HTaxCost dec(18,8) --含税成本价 HNoTaxCost dec(18,8) --不含税成本价 照片 需要 选择文件上传,并可以 预览;

---
 WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
index 5e24800..7344dad 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
@@ -26,30 +26,19 @@
             {
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere+ " order by 鍗曟嵁鍙� desc";
                     ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
                 }
-                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 = "鏌ヨ鏁版嵁鎴愬姛锛�";
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
-                }
             }
             catch (Exception e)
             {

--
Gitblit v1.9.1