yangle
2023-05-10 05e8d342bbff483c73ac4fc481ea16f203a78ba1
斯莫尔生产订单 货主
工序流转卡批量复制
4个文件已修改
123 ■■■■■ 已修改文件
Model/生产管理/设备管理/ClsSc_ICMOBillMain.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BLL/Xt_UserGroupController.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSc_ICMOBillMain.cs
@@ -24,6 +24,7 @@
        public Int64 HBomID;          //  --BOM单ID
        public string HBomNumber;              
        public Int64 HRoutingInterID;     //    --工艺路线ID
        public Int64 HOWNERID;     //    --货主
        public DateTime HPlanBeginDate;      //计划开工日期
        public DateTime HPlanEndDate;        //计划完工日期
        public DateTime HBeginDate;    // --最迟开工日期         
WebAPI/Controllers/BLL/Xt_UserGroupController.cs
@@ -192,8 +192,10 @@
                if (ds.Tables[0].Rows.Count > 0)
                {
                    oCN.BeginTran();//开启事务
                    oCN.RunProc($"delete from h_v_System_UserGroup where HGroupID={HInterID}");
                    //删除角色表
                    oCN.RunProc($"delete from System_UserGroup where GroupID={HInterID}");
                    //删除关联的用户关系
                    oCN.RunProc($"delete from System_UserGroupInfo where GroupId={HInterID}");
                    oCN.Commit();//结束事务
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -373,6 +373,112 @@
        //}
        #endregion
        #region[新增单据-保存按钮-批量复制]
        /// <summary>
        /// æ–°å¢žå•据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Sc_ProcessExchangeBill/AddBill_Copy_pl")]
        [HttpPost]
        public object AddBill_Copy_pl([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            int msg2 = int.Parse(sArray[0].ToString());
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();
            string UserName = "";
            ListModels oListModels = new ListModels();
            string sReturn = "";
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
                DBUtility.ClsPub.HOrgID = long.Parse(msg5);
                DBUtility.ClsPub.CurUserName = msg4;
                oBill.ShowBill(long.Parse(msg3), ref sReturn);
                ds = oCN.RunProcReturn("select isnull(sum(HQty),0) from Sc_ProcessExchangeBillMain where HICMOBillNo='" + oBill.omodel.HICMOBillNo + "' and HInterID <>"+ oBill.omodel.HInterID, "Sc_ProcessExchangeBillMain");
                var HQty = double.Parse(ds.Tables[0].Rows[0][0].ToString());
                int num = 0;
                //单据数量 * å¼ æ•° + å·²ç”Ÿæˆä¸åŒ…括本单据的数量 >生产订单数量
                if ((oBill.omodel.HQty * msg2) + HQty > oBill.omodel.HPlanQty)
                {
                    if (((oBill.omodel.HPlanQty - oBill.omodel.HQty - HQty) % oBill.omodel.HQty) == 0)
                    {
                        num = (int)((oBill.omodel.HPlanQty - oBill.omodel.HQty - HQty) / oBill.omodel.HQty);
                    } else
                    {
                        num = (int)((oBill.omodel.HPlanQty - oBill.omodel.HQty - HQty) / oBill.omodel.HQty);
                        num += 1;
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "最多可以复制" + num + "张!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (num == 0) {
                    double HPlanQty = oBill.omodel.HPlanQty - oBill.omodel.HQty - HQty;
                    for (int i = 0; i < msg2; i++)
                    {
                        oBill.omodel.HBillNo = DBUtility.ClsPub.CreateBillCode("3772", ref DBUtility.ClsPub.sExeReturnInfo, true);
                        oBill.omodel.HDate =DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
                        oBill.omodel.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                        oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                        oBill.omodel.HChecker = "";
                        oBill.omodel.HCheckDate = "";
                        oBill.omodel.HMaker = msg4;
                        if (HPlanQty < oBill.omodel.HQty)
                        {
                            oBill.omodel.HQty = HPlanQty;
                        }
                        //保存完毕后处理
                        bool bResult;
                        bResult = oBill.AddBill(ref sReturn);
                        if (bResult)
                        {
                            num++;
                            HPlanQty -= oBill.omodel.HQty;
                        }
                    }
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "复制了" + num + "张单据!";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
        #region[批量新增单据-保存按钮]
        /// <summary>
        /// æ–°å¢žå•据-保存按钮
WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs
@@ -287,11 +287,13 @@
                        (HBillType,HInterID,HBillNo,HDate,HPRDORGID
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate
                        ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus)
                        ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
                        ,HOWNERID)
                        values('3710'," + mainList[0].HInterID + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'," + mainList[0].HPRDORGID +
                "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate()" +
                ",'" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HEmpID + "," + mainList[0].HCusID +
                "," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2) ");
                "," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2" +
                ","+ mainList[0].HOWNERID + ") ");
                //保存主表
                foreach (var oSub in subList)
                {
@@ -301,13 +303,13 @@
                ,HBeginDate,HEndDate
                ,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
                ,HCOSTRATE,HISBACKFLUSH,HBatchNo,HBomID,HCHECKPRODUCT,HSEQ)
                ,HCOSTRATE,HISBACKFLUSH,HBatchNo,HBomID,HCHECKPRODUCT,HSEQ,HSTOCKINORGID)
                 values({oSub.HInterID},{oSub.HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
                ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
                ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
                ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},4
                        ,0,0,'','',0,0
                ,{oSub.HCOSTRATE},{oSub.HISBACKFLUSH},'{oSub.HBatchNo}',{oSub.HBomID},{oSub.HCHECKPRODUCT},{oSub.HSEQ})");
                ,{oSub.HCOSTRATE},{oSub.HISBACKFLUSH},'{oSub.HBatchNo}',{oSub.HBomID},{oSub.HCHECKPRODUCT},{oSub.HSEQ},{oSub.HSTOCKINORGID})");
                }
                foreach (var _item in _mainList)