yangle
2023-03-10 dabd6d20c31442d461fc30c49aa04abd4549be6b
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -50,7 +50,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DBUtility.ClsPub.CurUserName = msg4;
                DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
                List<Model.ClsSc_ProcessExchangeBillMain> lsmain = new List<Model.ClsSc_ProcessExchangeBillMain>();
                msg2 = msg2.Replace("\\", "");
@@ -61,8 +61,8 @@
                    UserName = oItem.HMaker;  //制单人
                    oItem.HBillType = "3772";
                    oItem.HBillSubType = "3772";
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --日期
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
@@ -466,7 +466,6 @@
                    oBill.DetailColl.Clear();
                    if (!bResult)
                    {
                        oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
@@ -667,7 +666,7 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select 流水号 HProcNo,HProcID,工序代码 HProcNumber,工序名称 HProcName,加工说明 HWorkRemark,HCenterID,工作中心代码 HCenterNumber,
                                                工作中心 HCenterName,HSupID,供应商代码 HSupNumber,供应商 HSupName,isEntrust,计划数量 HQty,加工单价 HOutPrice, 表体备注 HRemark,
                                                工作中心 HCenterName,HSupID,供应商代码 HSupNumber,供应商 HSupName,isEntrust HSupFlag,计划数量 HQty,加工单价 HOutPrice, 表体备注 HRemark,
                                            进站关联数量 HRelationQty_In,出站关联数量 HRelationQty_Out,委外工单数量 HRelationQty_WWOrder,不合格数量 HRelationQty_Bad,超额比例 HOverRate,
                                            良率 HPassRate,累计良率 HSumPassRate,图纸编号 HPicNum,本工序确认记录 HProcCheckNote,工艺参数 HTechnologyParameter,HDeptID,
                                            加工车间代码 HDeptNumber,加工车间 HDeptName
@@ -934,6 +933,7 @@
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();
            string linterid = sArray[4].ToString();
            string UserName = "";
            ListModels oListModels = new ListModels();
@@ -954,16 +954,11 @@
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Sc_ProcessExchangeBillMain(msg2);
                string sReturn = "";
                DBUtility.ClsPub.HOrgID = lsmain[0].HPRDORGID;
                oBill.ShowBill(long.Parse(linterid), ref sReturn);
                foreach (Model.ClsSc_ProcessExchangeBillMain oItem in lsmain)
                {
                    oItem.HMaker = msg5;  //制单人
                    oItem.HBillType = "3772";
                    oBill.HBillSubType = "Split";
                    oItem.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[1]);
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --日期
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMaterID2 = oItem.HMaterID;
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
@@ -972,7 +967,16 @@
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                    oBill.omodel.HMaker = msg5;  //制单人
                    oBill.omodel.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[1]);
                    oBill.omodel.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oBill.omodel.HDate = oItem.HDate;// 日期
                    oBill.omodel.HPlanBeginDate = oItem.HPlanBeginDate;// 计划开工日期
                    oBill.omodel.HPlanEndDate = oItem.HPlanEndDate;// 计划完工日期
                    oBill.omodel.HQty = oItem.HQty;// 数量
                    oBill.omodel.HBillNo = oItem.HBillNo;// 单据号
                }
                //表体数据
@@ -987,19 +991,19 @@
                foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls)
                {
                    i++;
                    if (oItemSub.HSplitQty > oItemSub.HLeftQty)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "第"+i+ "行,拆分数量不能大于可拆分数量!";
                        objJsonResult.Message = "第" + (i + 1) + "行,拆分数量不能大于可拆分数量!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oBill.DetailColl.Add(oItemSub);
                    oBill.DetailColl[i].HQty = oItemSub.HQty;
                    oBill.DetailColl[i].HBackProc = oItemSub.HBackProc;
                    oBill.DetailColl[i].HPrevSourceInterID = oItemSub.HPrevSourceInterID;
                    oBill.DetailColl[i].HPrevSourceEntryID = oItemSub.HPrevSourceEntryID;
                    i++;
                }
                //保存