生产质量汇报单添加工序字段；工序出站汇报单列表添加下推生产质量汇报单功能；出站汇报单工序工价字段添加权限控制

yusijie

2024-10-15 1b5e5394b2162f110a1813ef4374348a119cc810

生产质量汇报单添加工序字段；工序出站汇报单列表添加下推生产质量汇报单功能；出站汇报单工序工价字段添加权限控制

 DAL/Éú²ú¹ÜÀí/ClsSc_QualityReportBill.cs

@@ -88,7 +88,7 @@
                      ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
                      ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
                      ",HBarCode,HReportType,HBadProcID" +
                      ",HAddr,HMaker,HMakeDate" +
                      ",HAddr,HMaker,HMakeDate,HProcID" +
                      ") values(" +
                      "" + omodel.HInterID.ToString() + "" +
                      "," + oSub.HEntryID.ToString() + "" +
@@ -122,6 +122,7 @@
                      "','" + oSub.HAddr + "'" +
                      ",'" + oSub.HMaker + "'" +
                      ",'" + oSub.HMakeDate.ToShortDateString() + "'" +
                      "," + oSub.HProcID +
                      ") ";
                    oCn.RunProc(subSql);
                }
@@ -221,7 +222,7 @@
                      ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
                      ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
                      ",HBarCode,HReportType,HBadProcID" +
                      ",HAddr,HMaker,HMakeDate" +
                      ",HAddr,HMaker,HMakeDate,HProcID" +
                      ") values(" +
                      "" + omodel.HInterID.ToString() + "" +
                      "," + oSub.HEntryID.ToString() + "" +
@@ -255,6 +256,7 @@
                      ",'" + oSub.HAddr + "'" +
                      ",'" + oSub.HMaker + "'" +
                      ",'" + oSub.HMakeDate.ToShortDateString() + "'" +
                      "," + oSub.HProcID +
                      ") ";
                    oCn.RunProc(subSql);
                }

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -3829,5 +3829,53 @@
            }
        }
        #endregion

        #region ä¸‹æŽ¨è´¨é‡æ±‡æŠ¥å•æ—¶è¿”回工序出站汇报单信息
        [Route("Cj_StationOutBill/PushDownBackInfo")]
        [HttpGet]
        public object PushDownBackInfo(string linterid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("select * from h_v_Sc_StationOutBill_PushDownBackInfo where hmainid in (" + linterid + ")", "h_v_Sc_StationOutBill_PushDownBackInfo");

                if (ds.Tables[0].Rows.Count > 0 && ds != null)
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.list = columnNameList;
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无数据";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/LMESController.cs

@@ -1456,7 +1456,7 @@
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    //判断客户为龙山汽配
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
                    if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配" || oSystemParameter.omodel.WMS_CampanyName == "添康科技")
                    {
                        //判断是否有查询工价权限
                        if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_CheckProcPrice", 1, false, UserName))