Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2023-01-21 76dfcdf6ced44433f4e70f9cc3edc8bb46635fa3

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -212,7 +212,8 @@
                    return objJsonResult;
                }

                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2); 
                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
                DBUtility.ClsPub.CurUserName = user;
                long HMainInterID = 0;
                HMainInterID = list[0].HMainInterID;
                string eventType = list[0].eventType;
@@ -243,7 +244,7 @@
                double HMoney = list[0].HMoney;//金额
                string HRemark = list[0].HRemark;//备注
                double HTaxRate = list[0].HTaxRate;//税率
                long HProcNo = list[0].HProcNo;//流水号
                string HProcNo = list[0].HProcNo;//流水号
                string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                int HWWWorkOrderInterID = 0;//委外工单号子内码
                int HWWWorkOrderEntryID = 0;//委外工单号主内吗
@@ -273,7 +274,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HProcNo <= 0)
                if (HProcNo == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -375,6 +376,7 @@
                    ",HTaxRate=" + HTaxRate +
                    ",HMaterID=" + HMaterID +
                    ",HProcID=" + HProcID +
                    ",HEmpID=" + HEmpID +
                    ",HProcNo=" + HProcNo +
                    ",HOrderProcNO='" + HOrderProcNO + "'" +
                    " where HInterID=" + HInterID);
@@ -433,7 +435,7 @@
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";
                objJsonResult.Message = "操作单据成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }