From d15ca20186d19b7b572b25d337a772edc11eaf81 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 25 七月 2023 14:25:06 +0800
Subject: [PATCH] 称重入库模块修改：扫流转卡时带出客户物料名称，写入条码档案；生成条码时增加界面输入克重与物料维护克重对比预警
---
WebAPI/Controllers/项目管理/业绩指标/PM_YearEmployeeMoneyBillController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillController.cs"
index f82e012..b0e141c 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\344\270\232\347\273\251\346\214\207\346\240\207/PM_YearEmployeeMoneyBillController.cs"
@@ -288,13 +288,13 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from PM_YearEmployeeMoneyBillMain order by HBillNo ", "PM_YearEmployeeMoneyBillMain");
+ ds = oCN.RunProcReturn("select * from h_v_PM_YearEmployeeMoneyBillList order by 鍗曟嵁鍙� ", "h_v_PM_YearEmployeeMoneyBillList");
}
else
{
- string sql1 = "select * from PM_YearEmployeeMoneyBillMain where 1 = 1 ";
- string sql = sql1 + sWhere + " order by HBillNo ";
- ds = oCN.RunProcReturn(sql, "PM_YearEmployeeMoneyBillMain");
+ string sql1 = "select * from h_v_PM_YearEmployeeMoneyBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� ";
+ ds = oCN.RunProcReturn(sql, "h_v_PM_YearEmployeeMoneyBillList");
}
//娣诲姞鍒楀悕
--
Gitblit v1.9.1