生产订单备注字段改成白坯要求,底部备注下推流转卡的时候带到流转卡底部备注中去
生产订单 已经下推过 流转卡或 生产入库单 或生产领料单 后,就不能删除;
生产资源新增模块增加 负责人 HEmpID int 字段(gy_Employee) 非必录入,打印的时候打印出来
生产订单列表里增加关闭和反关闭按钮(在生产订单编辑模块里有这个功能,将一样的功能复制出来),列表显示关闭状态
工序流转卡维护列表增加当前工序过滤条件(下拉框形式,取值取工序列表)
网格选中行, 背景行 浅蓝色 显示;(优先改 生产订单列表,流转卡列表,出站单列表,进站单列表)(最好改JS底层方法)
| | |
| | | public double HMinAdd;// money //æå°è¿é¶ --addnew |
| | | public Int64 HClassCount;// int //æ¯æ¥ç次 --addnew |
| | | public int HUSEORGID; |
| | | public int HEmpID; //è´è´£äºº |
| | | public string HMacAddr; //macå°å |
| | | } |
| | | } |
| | |
| | | try |
| | | { |
| | | SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); |
| | | |
| | | if (user == "10000")//api忥æ¹å¼ |
| | | { |
| | | oCN.RunProc("delete from Gy_Material where HERPItemID=" + HItemID); |
| | |
| | | objJsonResult.data = null; |
| | | return objJsonResult; ; |
| | | } |
| | | |
| | | //å 餿é |
| | | if (!DBUtility.ClsPub.Security_Log("Gy_Material_Delete", 1, false, user)) |
| | | { |
| | |
| | | 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 = "æ²¡ææ°æ®ï¼æ æ³å é¤ï¼"; |
| | |
| | | } |
| | | catch (Exception e) |
| | | { |
| | | oCN.RollBack();//åæ»äºå¡ |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 0; |
| | | objJsonResult.Message = "å é¤å¤±è´¥ï¼" + e.ToString(); |
| | |
| | | "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID + |
| | | ",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID + |
| | | ","+ HmaterOutqty + ") "); |
| | | |
| | | LogService.Write("ç¨æ·:" + user + ",æ¥æ:" + DateTime.Now + ",æ°å¢å·¥åºè¿ç«åæ®:" + HBillNo); |
| | | } |
| | | else if ("Modify".Equals(eventType)) |
| | | { |
| | |
| | | ",HProcNo='" + HProcNo + "'" + |
| | | ",HOrderProcNO='" + HOrderProcNO + "'" + |
| | | " where HInterID=" + HInterID); |
| | | |
| | | LogService.Write("ç¨æ·:" + user + ",æ¥æ:" + DateTime.Now + ",ä¿®æ¹å·¥åºè¿ç«åæ®:" + HBillNo); |
| | | } |
| | | else |
| | | { |
| | |
| | | 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"; |
| | |
| | | } |
| | | else |
| | | { |
| | | //åå
¥å 餿¥å¿ |
| | | LogService.Write("ç¨æ·:" + HDeleteMan + ",æ¥æ:" + DateTime.Now + ",å é¤å·¥åºæµè¿ç«åæ®:" + oBill.omodel.HBillNo); |
| | | |
| | | objJsonResult.code = "1"; |
| | | objJsonResult.count = 1; |
| | | objJsonResult.Message = "å 餿åï¼"; |
| | |
| | | "," + 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)) |
| | | { |
| | |
| | | ",HWasterQty=" + HWasterQty + |
| | | ",HLastSubProc=" + Convert.ToString(HLastSubProc ? 1 : 0) + |
| | | " where HInterID=" + HInterID); |
| | | |
| | | LogService.Write("ç¨æ·:" + user + ",æ¥æ:" + DateTime.Now + ",ä¿®æ¹å·¥åºåºç«åæ®:" + HBillNo); |
| | | } |
| | | else |
| | | { |
| | |
| | | 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"; |
| | |
| | | } |
| | | else |
| | | { |
| | | //åå
¥å 餿¥å¿ |
| | | LogService.Write("ç¨æ·:" + HDeleteMan + ",æ¥æ:" + DateTime.Now + ",å é¤å·¥åºæµåºç«åæ®:" + oBill.omodel.HBillNo); |
| | | |
| | | objJsonResult.code = "1"; |
| | | objJsonResult.count = 1; |
| | | objJsonResult.Message = "å 餿åï¼"; |
| | |
| | | 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) |
| | |
| | | //ä¿å宿¯åå¤ç |
| | | bool bResult; |
| | | |
| | | LogService.Write("ç¨æ·:" + msg4 + ",æ¥æ:" + DateTime.Now + ",æ°å¢å·¥åºæµè½¬å¡åæ®:" + oBill.omodel.HBillNo); |
| | | |
| | | bResult = oBill.AddBill(ref sReturn); |
| | | if (bResult) |
| | | { |
| | |
| | | bool bResult=false; |
| | | if (msg5 == "2") |
| | | { |
| | | LogService.Write("ç¨æ·:" + msg6 + ",æ¥æ:" + DateTime.Now + ",æ°å¢å·¥åºæµè½¬å¡åæ®:" + oBill.omodel.HBillNo); |
| | | |
| | | bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); |
| | | } |
| | | oBill.DetailColl.Clear(); |
| | |
| | | |
| | | string[] HBillNo = HInterID.Split(','); |
| | | |
| | | string HBillNo_S = ""; |
| | | |
| | | foreach (var item in HBillNo) |
| | | { |
| | | Int64 lngBillKey = 0; |
| | |
| | | objJsonResult.data = null; |
| | | return objJsonResult; |
| | | } |
| | | |
| | | if (oBill.omodel.HChecker != "") |
| | | { |
| | | objJsonResult.code = "0"; |
| | |
| | | objJsonResult.data = null; |
| | | return objJsonResult; |
| | | } |
| | | HBillNo_S += oBill.omodel.HBillNo + ","; |
| | | } |
| | | else |
| | | { |
| | |
| | | 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); |
| | |
| | | "," + 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) |
| | | { //ä¿®æ¹ |
| | |
| | | |
| | | //å é¤å表 |
| | | oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "'"); |
| | | |
| | | LogService.Write("ç¨æ·:" + user + ",æ¥æ:" + DateTime.Now + ",ä¿®æ¹å·¥èºè·¯çº¿åæ®:" + HBillNo); |
| | | } |
| | | //ä¿åå表 |
| | | objJsonResult = AddBillSub(msg3, HInterID, OperationType); |
| | |
| | | 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) |
| | | { |
| | |
| | | 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"; |
| | |
| | | //} |
| | | 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; |
| | |
| | | ",'" + 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) |
| | | { |
| | |
| | | |
| | | //å é¤å表 |
| | | 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); |
| | |
| | | } |
| | | } |
| | | |
| | | |
| | | |
| | | if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1) |
| | | { |
| | | objJsonResult.code = "0"; |
| | |
| | | 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; |
| | |
| | | " (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(); |
| | |
| | | ",HRelationID=" + oModel.HRelationID.ToString() + |
| | | ",HCenterID=" + oModel.HCenterID.ToString() + |
| | | ",HType='" + oModel.HType + "'" + |
| | | ",HEmpID='" + oModel.HEmpID + "'" + |
| | | ",HOverTimes=" + oModel.HOverTimes + |
| | | ",HWorkTimes=" + oModel.HWorkTimes + |
| | | ",HMaxWorkTimes=" + oModel.HMaxWorkTimes + |