From 3db477ccda04b391872cbd570b7d1c1253e1f6e0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 五月 2023 14:11:00 +0800
Subject: [PATCH] 生产订单备注字段改成白坯要求,底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过  流转卡或 生产入库单 或生产领料单 后,就不能删除; 生产资源新增模块增加   负责人 HEmpID int 字段(gy_Employee) 非必录入,打印的时候打印出来 生产订单列表里增加关闭和反关闭按钮(在生产订单编辑模块里有这个功能,将一样的功能复制出来),列表显示关闭状态 工序流转卡维护列表增加当前工序过滤条件(下拉框形式,取值取工序列表) 网格选中行, 背景行 浅蓝色 显示;(优先改  生产订单列表,流转卡列表,出站单列表,进站单列表)(最好改JS底层方法)

---
 WebAPI/Controllers/OtherInStockController.cs |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/OtherInStockController.cs b/WebAPI/Controllers/OtherInStockController.cs
index 80fc610..9b7169d 100644
--- a/WebAPI/Controllers/OtherInStockController.cs
+++ b/WebAPI/Controllers/OtherInStockController.cs
@@ -167,6 +167,7 @@
         {
             try
             {
+
                 string sErrMsg = "";
                 bool sBool = false;
                 oView = webserver.get_InfoByBarCode_Source(sBarCode, sInterID, ref sBool, ref sErrMsg);
@@ -233,6 +234,8 @@
             string msg1 = _value.ToString();
             try
             {
+                
+               
                 List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
                 ListModels oListModels = new ListModels();
                 lsmain = oListModels.getICStockBillMainByJson(msg1);
@@ -336,8 +339,8 @@
                 List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
                 ListModels oListModels = new ListModels();
                 lsmain = oListModels.getOtherInBillMainByJson(msg1);
-                lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
-                lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                 string sSourceBillType = lsmain[0].HBillType;
 
                 WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
@@ -350,7 +353,9 @@
                 websLsmain.HMaker = lsmain[0].HMaker;
                 websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
                 websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
+                websLsmain.HKeeperID = lsmain[0].HKeeperID;
                 websLsmain.HBillType = "1203";//鍥哄畾鍊�
+                websLsmain.HBillSubType = lsmain[0].HBillSubType;
 
                 WebS.WebService1 oWebs = new WebS.WebService1();
                 WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
@@ -358,7 +363,7 @@
                 {            
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                     objJsonResult.data = null;
                     return objJsonResult;
                 }

--
Gitblit v1.9.1