From 5b84275a7ce63b83c778c5ac050b8c039cd4fac8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 八月 2024 17:46:25 +0800
Subject: [PATCH] 1.修改接口：UpdateMesOrderStepSearch --工单派发 2.修改接口：MesOrderNewStepContent --工单派发 3.修改接口：RouteSelectStep--工单派发 4.新增组织架构类型接口：TOrganTypeDate 5.新增组织架构车间接口：TorgWkshop 6.新增车间查找设备接口：WkshopEqpPermissions 7.新增往来单位基础资料接口：CustomerTypePermissions 8.新增往来单位类型查找往来单位资料接口：CustomerTypeSearchPermissions 9.新增工序关联工作站接口 10.修改工序工价提交接口(增加了设备)
---
VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
index 19a99e4..7a93986 100644
--- a/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
@@ -287,7 +287,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select distinct A.id,K.wkshp_code,F.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.usergroupcode,G.usergroupname,A.good_qty,
- isnull(P.stepprice,0) as unprice,A.good_qty*isnull(P.stepprice,0) as usermoney,U.username as lm_user,A.lm_date,B.report_date
+ isnull(A.step_price,0) as unprice,A.good_qty*isnull(A.step_price,0) as usermoney,U.username as lm_user,A.lm_date,B.report_date
from TK_Wrk_Record A
inner join TK_Wrk_RecordSub B on A.id=B.m_id
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
@@ -413,7 +413,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select distinct K.wkshp_code as 杞﹂棿缂栫爜,F.torg_name as 杞﹂棿鍚嶇О, A.wo_code as 宸ュ崟缂栧彿,M.partcode as 浜у搧缂栫爜,M.partname as 浜у搧鍚嶇О,M.partspec as 浜у搧瑙勬牸,
T.stepcode as 宸ュ簭缂栫爜,T.stepname as 宸ュ簭鍚嶇О,A.task_qty as 浠诲姟鏁伴噺,G.usergroupcode as 鐝粍缂栫爜,G.usergroupname as 鐝粍鍚嶇О,
- A.good_qty as 鎶ュ伐鏁伴噺,isnull(P.stepprice,0) as 宸ュ簭鍗曚环,A.good_qty*isnull(P.stepprice,0) as 璁′欢宸ヨ祫,U.username as 鎿嶄綔浜哄憳,A.lm_date as 鎿嶄綔鏃堕棿,B.report_date as 鎶ュ伐鏃堕棿
+ A.good_qty as 鎶ュ伐鏁伴噺,isnull(A.step_price,0) as 宸ュ簭鍗曚环,A.good_qty*isnull(A.step_price,0) as 璁′欢宸ヨ祫,U.username as 鎿嶄綔浜哄憳,A.lm_date as 鎿嶄綔鏃堕棿,B.report_date as 鎶ュ伐鏃堕棿
from TK_Wrk_Record A
inner join TK_Wrk_RecordSub B on A.id=B.m_id
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
--
Gitblit v1.9.3