From f1c258211a7bcc79cb7b86e6007a27afebb24e21 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 18 十月 2021 16:23:31 +0800
Subject: [PATCH] 新增工资结算单（集体），工资结算各列表表体的金额能自动按照工时*数量*工价得出总价且能按照所选物料和工序自动填入工价,加入工序流转卡维护拆分功能权限
---
WebAPI/Controllers/Sc_MouldController.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index 81af6ee..2bc9e08 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -190,10 +190,10 @@
//msg2 = "[" + msg2.ToString() + "]";
msg1 = "[" + msg1.ToString() + "]";
DAL.ClsSc_MouldProdOutBill BillNew = new DAL.ClsSc_MouldProdOutBill();
- List<Model.ClsSc_MouldProdOutBillMain> mainList = Newtonsoft
+ List<Model.ClsSc_MouldStockBillMain> mainList = Newtonsoft
.Json
.JsonConvert
- .DeserializeObject<List<Model.ClsSc_MouldProdOutBillMain>>(msg1);
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(msg1);
List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
.Json
.JsonConvert
@@ -213,6 +213,7 @@
}
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HInterID = mainList[0].HInterID;
BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
BillNew.omodel.HMaker = mainList[0].HMaker;
BillNew.omodel.HDate = HDate;
@@ -229,7 +230,8 @@
BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
-
+
+ oSub.HInterID = mainList[0].HInterID;
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
@@ -287,7 +289,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HInterID.ToString()+"鍗曟嵁涓籌D:"+ mainList[0].HInterID;
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1