基础资料 添加校验控制 进站单出站单扫完流转卡默认带出最大工序汇报数量（获取 上一道的 合格数量（如果拆分后，上道合格数量大于流转卡数量时，仍取流转卡...

yangle

2023-04-24 105bb5f0f4edd01d8f915ffda28ccd37afbfddc8

基础资料 添加校验控制
进站单出站单扫完流转卡默认带出最大工序汇报数量（获取 上一道的 合格数量（如果拆分后，上道合格数量大于流转卡数量时，仍取流转卡数量），如果是第一道则获取流转卡数量）
拆卡必须最大工序出站之后才允许拆卡，汇报过的工序拆卡出来不需要显示
增加生产订单 复制功能；
流转卡添加复制功能
工艺路线 增加 上一行 下一行 刷新流水号 按钮功能， 可以调整 工序上下次序； 以及重新刷新流水号

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -193,7 +193,7 @@
                            { //系统参数是否为只显示当前登录用户关联的工序信息,N为否，Y为是
                                if (oSystemParameter.omodel.MES_StationInBill_ShowUSERProcess == "Y")
                                {
                                    ds = oCN.RunProcReturn($"exec h_p_ProcessExchangeBillLastHProNo '{BillNo_PGD}','{UserID}','In'", "h_v_Gy_ProcessList_GetProcNoByUser");
                                    ds = oCN.RunProcReturn($"exec h_p_ProcessExchangeBillLastHProNo '{BillNo_PGD}','{UserID}','{HBillType}'", "h_v_Gy_ProcessList_GetProcNoByUser");
                                }
                                else
                                {

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -903,12 +903,26 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                var ds1= oCN.RunProcReturn("select isnull(max(流水号),0) from h_v_Sc_ProcessExchangeBillQuerySub where hmainid=" + HInterID + " and 出站关联数量>0 ", "h_v_Sc_ProcessExchangeBillQuerySub");

                string sql = string.Format(@"select * from h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(sql + " where hmainid=" + HInterID, "h_v_Sc_ProcessExchangeBillQuerySub");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];

                ds = oCN.RunProcReturn(sql + " where hmainid=" + HInterID + " and 出站关联数量=0  and  cast(流水号 as int)>" + ds1 .Tables[0].Rows[0][0].ToString(), "h_v_Sc_ProcessExchangeBillQuerySub");

                if (float.Parse(ds.Tables[0].Rows[0]["进站关联数量"].ToString()) > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "当前单据:"+ ds.Tables[0].Rows[0]["工序名称"].ToString() + "未出站不能拆分!";
                    objJsonResult.data = ds.Tables[0];
                }
                else {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                }
            }
            catch (Exception e)
            {
@@ -990,26 +1004,52 @@
                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsSc_ProcessExchangeBillSub> ls = new List<Model.ClsSc_ProcessExchangeBillSub>();
                ls = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub(msg3);
                int i = 0;
                foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls)
                {
              
                string HEntryID = "";

                    if (oItemSub.HSplitQty > oItemSub.HLeftQty)
                for (int i = 0; i < oBill.DetailColl.Count; i++)
                {
                    if (oBill.DetailColl[i].HRelationQty_Out > 0 || oBill.DetailColl[i].HRelationQty_In > 0)
                    {
                        HEntryID += i + ",";
                    }
                }
                if (HEntryID != "")
                {
                    HEntryID = HEntryID.Substring(0, HEntryID.Length - 1);
                    var num = HEntryID.Split(',');

                    for (int k = 0; k < num.Length; k++)
                    {
                        oBill.DetailColl.RemoveAt(int.Parse(num[k]) - k);
                    }
                }

                int j = 0 ;
                foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in oBill.DetailColl)
                {
                    if (ls[j].HSplitQty > ls[j].HLeftQty)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "第" + (i + 1) + "行，拆分数量不能大于可拆分数量！";
                        objJsonResult.Message = "第" + (j + 1) + "行，拆分数量不能大于可拆分数量！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oBill.DetailColl[i].HQty = oItemSub.HQty;
                    oBill.DetailColl[i].HBackProc = oItemSub.HBackProc;
                    oBill.DetailColl[i].HPrevSourceInterID = oItemSub.HPrevSourceInterID;
                    oBill.DetailColl[i].HPrevSourceEntryID = oItemSub.HPrevSourceEntryID;
                    oBill.DetailColl[i].HRemark = oItemSub.HRemark;
                    oBill.DetailColl[i].HTechnologyParameter = oItemSub.HTechnologyParameter;
                    i++;

                    if (oBill.DetailColl[j].HProcNo == ls[j].HProcNo)
                    {
                        oBill.DetailColl[j].HEntryID = j+1;
                        oBill.DetailColl[j].HQty = ls[j].HQty;
                        oBill.DetailColl[j].HBackProc = ls[j].HBackProc;
                        oBill.DetailColl[j].HPrevSourceInterID = ls[j].HPrevSourceInterID;
                        oBill.DetailColl[j].HPrevSourceEntryID = ls[j].HPrevSourceEntryID;
                        oBill.DetailColl[j].HRemark = ls[j].HRemark;
                        oBill.DetailColl[j].HTechnologyParameter = ls[j].HTechnologyParameter;
                        j++;
                    }
                }


                //保存
                //保存完毕后处理
@@ -1022,6 +1062,13 @@
                //{
                //    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                //}
               
                oCN.BeginTran();

                oCN.RunProc("update Sc_ProcessExchangeBillSub set HQty=(select HQty from Sc_ProcessExchangeBillMain where HInterID="+ oBill.DetailColl[0].HPrevSourceInterID + ") where HInterID=" + oBill.DetailColl[0].HPrevSourceInterID );

                oCN.Commit();

                if (bResult)
                {
                    objJsonResult.code = "0";