生产订单备注字段改成白坯要求，底部备注下推流转卡的时候带到流转卡底部备注中去 生产订单 已经下推过 流转卡或 生产入库单 或生产领料单 后，就不能删...

yangle

2023-05-23 3db477ccda04b391872cbd570b7d1c1253e1f6e0

生产订单备注字段改成白坯要求，底部备注下推流转卡的时候带到流转卡底部备注中去
生产订单 已经下推过  流转卡或 生产入库单 或生产领料单 后，就不能删除；
生产资源新增模块增加   负责人 HEmpID int 字段（gy_Employee） 非必录入，打印的时候打印出来
生产订单列表里增加关闭和反关闭按钮（在生产订单编辑模块里有这个功能，将一样的功能复制出来），列表显示关闭状态
工序流转卡维护列表增加当前工序过滤条件（下拉框形式，取值取工序列表）
网格选中行， 背景行 浅蓝色 显示；（优先改  生产订单列表，流转卡列表，出站单列表，进站单列表）（最好改JS底层方法）

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_Source_Model.cs

@@ -23,6 +23,7 @@
        public double HMinAdd;//        money        //最小进阶             --addnew
        public Int64 HClassCount;//    int        //每日班次                  --addnew
        public int HUSEORGID;
        public int HEmpID; //负责人
        public string HMacAddr; //mac地址
    }
}

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -386,6 +386,7 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                if (user == "10000")//api同步方式
                {
                    oCN.RunProc("delete from Gy_Material where HERPItemID=" + HItemID);
@@ -395,6 +396,7 @@
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

                //删除权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Material_Delete", 1, false, user))
                {
@@ -416,6 +418,7 @@
                ds = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + HItemID, "Gy_Material");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    oCN.RollBack();//回滚事务
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有数据，无法删除！";
@@ -444,6 +447,7 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();//回滚事务
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -202,6 +202,8 @@
                    "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
                    ",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
                    ","+ HmaterOutqty + ") ");

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工序进站单据:" + HBillNo);
                }
                else if ("Modify".Equals(eventType))
                {
@@ -244,6 +246,8 @@
                    ",HProcNo='" + HProcNo + "'" +
                    ",HOrderProcNO='" + HOrderProcNO + "'" +
                    " where HInterID=" + HInterID);

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序进站单据:" + HBillNo);
                }
                else
                {
@@ -1034,8 +1038,7 @@
                        return objJsonResult;
                    }

                    //写入删除日志 
                    string WorkList = "删除进站单：" + oBill.omodel.HBillNo;
                   
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
@@ -1046,6 +1049,9 @@
                    }
                    else
                    {
                        //写入删除日志 
                        LogService.Write("用户:" + HDeleteMan + ",日期:" + DateTime.Now + ",删除工序流进站单据:" + oBill.omodel.HBillNo);

                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "删除成功！";

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -314,6 +314,8 @@
                    "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
                    "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
                     ","+ HmaterOutqty + ") ");

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工序出站单据:" + HBillNo);
                }
                else if ("Modify".Equals(eventType))
                {
@@ -346,6 +348,8 @@
                    ",HWasterQty=" + HWasterQty +
                    ",HLastSubProc=" + Convert.ToString(HLastSubProc ? 1 : 0) +
                    " where HInterID=" + HInterID);

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序出站单据:" + HBillNo);
                }
                else
                {
@@ -1682,8 +1686,6 @@
                        return objJsonResult;
                    }

                    //写入删除日志 
                    string WorkList = "删除出站单：" + oBill.omodel.HBillNo;
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
@@ -1694,6 +1696,9 @@
                    }
                    else
                    {
                        //写入删除日志 
                        LogService.Write("用户:" + HDeleteMan + ",日期:" + DateTime.Now + ",删除工序流出站单据:" + oBill.omodel.HBillNo);

                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "删除成功！";

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -98,11 +98,13 @@
                bool bResult;
                if (msg5 == "xz")
                {
                    LogService.Write("用户:" + msg4 + ",日期:" + DateTime.Now + ",新增工序流转卡单据:" + oBill.omodel.HBillNo);
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    LogService.Write("用户:" + msg4 + ",日期:" + DateTime.Now + ",修改工序流转卡单据:" + oBill.omodel.HBillNo);
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
@@ -459,6 +461,8 @@
                        //保存完毕后处理
                        bool bResult;

                        LogService.Write("用户:" + msg4 + ",日期:" + DateTime.Now + ",新增工序流转卡单据:" + oBill.omodel.HBillNo);

                        bResult = oBill.AddBill(ref sReturn);
                        if (bResult)
                        {
@@ -578,6 +582,8 @@
                    bool bResult=false;
                    if (msg5 == "2")
                    {
                        LogService.Write("用户:" + msg6 + ",日期:" + DateTime.Now + ",新增工序流转卡单据:" + oBill.omodel.HBillNo);

                        bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    }
                    oBill.DetailColl.Clear();
@@ -828,6 +834,8 @@

            string[] HBillNo = HInterID.Split(',');

            string HBillNo_S = "";

            foreach (var item in HBillNo)
            {
                Int64 lngBillKey = 0;
@@ -886,6 +894,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    if (oBill.omodel.HChecker != "")
                    {
                        objJsonResult.code = "0";
@@ -894,6 +903,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    HBillNo_S += oBill.omodel.HBillNo + ",";
                }
                else
                {
@@ -904,6 +914,10 @@
                    return objJsonResult;
                }
            }

            HBillNo_S = HBillNo_S.Substring(0, HBillNo_S.Length - 1);
            LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",删除工序流转卡单据:" + HBillNo_S);

            foreach (var item in HBillNo)
            {
                bool IsDete = oBill.DeleteBill(long.Parse(item), ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -203,6 +203,8 @@
                    "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
                    "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
                    ",'" + HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "'," + HOrgID + ") ");

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工艺路线单据:" + HBillNo);
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
@@ -219,6 +221,8 @@

                    //删除子表
                    oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "'");

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工艺路线单据:" + HBillNo);
                }
                //保存子表
                objJsonResult = AddBillSub(msg3, HInterID, OperationType);

 WebAPI/Controllers/LMESController.cs

@@ -74,6 +74,7 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");


                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
@@ -430,7 +431,7 @@
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务
                ds = oCN.RunProcReturn("select * from Gy_RoutingBillmain where HInterID=" + lngBillKey, "Gy_RoutingBillmain");
                ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + lngBillKey, "Gy_RoutingBillmain");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -459,6 +460,9 @@
                //}
                oCN.RunProc("delete from Gy_RoutingBillmain where HInterID=" + lngBillKey);
                oCN.RunProc("delete from Gy_RoutingBillSub where HInterID=" + lngBillKey);

                LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",删除工艺路线单据:" + ds.Tables[0].Rows[0]["HBillNo"].ToString());

                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;

 WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs

@@ -461,6 +461,9 @@
                    ",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
                    "," + HCenterID + ",0,0,0,0," + HBomID + ",'',''" +
                    ",'"+ HIsStockQty + "','"+ HRemark3 + "') ");

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增生产订单单据:" + HBillNo);

                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                {
@@ -481,6 +484,8 @@

                    //删除子表
                    oCN.RunProc("delete from Sc_ICMOBillSub where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'");

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改生产订单单据:" + HBillNo);
                }
                //保存子表
                objJsonResult = AddBillSub_NoTable(msg3, HInterID, OperationType, HEntryID);
@@ -865,8 +870,6 @@
                    }
                }



                if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
                {
                    objJsonResult.code = "0";
@@ -876,8 +879,46 @@
                    return objJsonResult; ;
                }

               var DataSet = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HICMOBillNo='" + ds.Tables[0].Rows[0]["HBillNo"].ToString() +"'", "Sc_ProcessExchangeBillMain");

                if (DataSet.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据已下推工序流转卡,不允许删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

                 DataSet = oCN.RunProcReturn("select * from h_v_IF_ProductInBillList where æºå•å•å·='" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "'", "h_v_IF_ProductInBillList");

                if (DataSet.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据已下推生产入库单,不允许删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

                DataSet = oCN.RunProcReturn("select * from h_v_IF_MateOutBillList where æºå•å•å·='" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "'", "h_v_IF_MateOutBillList");

                if (DataSet.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据已下推生产领料单,不允许删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }



                oCN.RunProc("delete from Sc_ICMOBillMain  where HInterID=" + HInterID);
                oCN.RunProc("delete from Sc_ICMOBillSub  where HInterID=" + HInterID);

                LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",删除生产订单单据:" + ds.Tables[0].Rows[0]["HBillNo"].ToString());

                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;

 WebAPI/DLL/ClsGy_Source_Ctl.cs

@@ -22,12 +22,12 @@
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HType,HRelationID,HCenterID,HEquipFileID_K3,HDeptID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HProcID,HOverTimes " +
                    ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID,HMacAddr)" +
                    ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID,HMacAddr,HEmpID)" +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ",'" + oModel.HType + "'," + oModel.HRelationID.ToString() + "," + oModel.HCenterID.ToString() + "," + oModel.HEquipFileID_K3.ToString() + "," + oModel.HDeptID.ToString() +
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                    ",'" + oModel.HRemark + "'," + oModel.HProcID + "," + oModel.HOverTimes + "," + oModel.HWorkTimes + "," + oModel.HMaxWorkTimes +
                    "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + "," + oModel.HUSEORGID + ",'" + oModel.HMacAddr + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + "," + oModel.HUSEORGID + ",'" + oModel.HMacAddr + "',"+oModel.HEmpID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
@@ -58,6 +58,7 @@
                    ",HRelationID=" + oModel.HRelationID.ToString() +
                    ",HCenterID=" + oModel.HCenterID.ToString() +
                    ",HType='" + oModel.HType + "'" +
                    ",HEmpID='" + oModel.HEmpID + "'" +
                    ",HOverTimes=" + oModel.HOverTimes +
                    ",HWorkTimes=" + oModel.HWorkTimes +
                    ",HMaxWorkTimes=" + oModel.HMaxWorkTimes +

 WebAPI/Vlog/webapi20220325.txt

File was deleted

 WebAPI/Vlog/webapi20220408.txt

File was deleted

 WebAPI/Vlog/webapi20220411.txt

File was deleted

 WebAPI/Vlog/webapi20220413.txt

File was deleted

 WebAPI/Vlog/webapi20220422.txt

File was deleted

 WebAPI/Vlog/webapi20220512.txt

File was deleted

 WebAPI/Vlog/webapi20220513.txt

File was deleted

 WebAPI/Vlog/webapi20220517.txt

File was deleted

 WebAPI/Vlog/webapi20220623.txt

File was deleted

 WebAPI/Vlog/webapi20220701.txt

File was deleted

 WebAPI/Vlog/webapi20220708.txt

File was deleted

 WebAPI/Vlog/webapi20220714.txt

File was deleted

 WebAPI/Vlog/webapi20220805.txt

File was deleted