From 76dfcdf6ced44433f4e70f9cc3edc8bb46635fa3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 21 一月 2023 12:12:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 9f7c6c7..ccf068c 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -437,6 +437,7 @@
                 string msg2 = sArray[0].ToString();
                 string msg3 = sArray[1].ToString();
                 string msg4 = sArray[2].ToString();
+                string msg5 = sArray[3].ToString();
 
                 List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>();
                 
@@ -454,8 +455,8 @@
                     oBill.omodel.HBillNo = msg3 + "- " + j;
                     oBill.omodel.HBillStatus = 0;
                     oBill.omodel.HMouldNum = list[i].HMouldNum;
-                    oBill.omodel.HYear = 2022;
-                    oBill.omodel.HPeriod = 1;
+                    oBill.omodel.HYear = DateTime.Now.Year;
+                    oBill.omodel.HPeriod = DateTime.Now.Month;
                     oBill.omodel.HRemark = list[i].HRemark;
                     oBill.omodel.HSourceName = list[i].HSourceName;
                     oBill.omodel.HPieceQty = list[i].HPieceQty;
@@ -508,6 +509,7 @@
                     oBill.omodel.HWorkTimes = list[i].HWorkTimes;
                     oBill.omodel.HQCCheckID = list[i].HQCCheckID;
                     oBill.omodel.HMaker = msg4;
+                    oBill.omodel.HEmpNum = msg5;
 
                     //string HBillSubType = "3791";
                     //long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D

--
Gitblit v1.9.1