Ling0925
/
CeramicProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 生产登记问题 

Update 人员信息工序权限
Update 工价档案权限问题
This commit is contained in:
Ling 2024-05-22 11:30:40 +08:00
parent b1fa5ce3c9
commit 4bc97852f8
7 changed files with 286 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newyt/Module_data/Employee_Form.aspx
View File

@ -219,8 +219,12 @@
<td class="auto-style6">&nbsp </td>
</tr>
</table>
<div id="gxxm" runat=server></div>
<div id="gysq" runat=server></div>
</div>
</div>
<span style=" display:none"> <asp:button id="severbc" runat="server" CssClass="button bluez small" Text="保存" OnClientClick="return bcgyqxxx()" onclick="bt_tj_Click" ></asp:button> </span>
<asp:HiddenField ID="id" runat="server" Value="" />
<asp:HiddenField ID="djgyqxhd" runat="server" Value="" />

4
newyt/Module_data/Employee_Form.aspx.cs
View File

@ -239,7 +239,7 @@ public partial class Employee_Form : CommonPage
gxcode += "<li class='gxli'><input type='checkbox' class='jn_gx' tag='" + dr["mingcheng"] + "'>&nbsp" + dr["mingcheng"] + "</li>";
}
gxcode += "</ul></td></tr>";
//gysq.InnerHtml=biao+gxcode+"</table>";
gxxm.InnerHtml = biao + gxcode + "</table>";
}
#endregion
@ -379,7 +379,7 @@ public partial class Employee_Form : CommonPage
}
}
gxcode += "</ul></td></tr>";
//gysq.InnerHtml = biao + gxcode + "</table>";
gysq.InnerHtml = biao + gxcode + "</table>";
}
#endregion
#region 敏感权限查看

9
newyt/Module_data/Wages_list.aspx.cs
View File

@ -54,7 +54,7 @@ public partial class Wages_list : System.Web.UI.Page
wherecode += dtr["lieming"] + ",";
}
wherecode += "id";
if (DBHlper.GetPermission(zhanghao.juese, "工价档案", "nr_z_cpkc_gj", "查看全部"))
if (DBHlper.GetPermission(zhanghao.juese, "工价档案", "view_nr_z_cpkc_gj", "查看全部"))
{
wherecode += string.Format(" from view_nr_z_cpkc_gj where " + tiaojian + " id not in(select top ({0}*{1}) id from view_nr_z_cpkc_gj " + " where " + tiaojian + " 1=1 " + paixu + ")" + paixu, pg, pageitem);
@ -124,7 +124,7 @@ public partial class Wages_list : System.Web.UI.Page
int fanhuizhi = 0;
string cmd = string.Format("select count(*) from view_nr_z_cpkc_gj " + tj);
Maticsoft.Model.nr_z_yhzh yhzh = (Maticsoft.Model.nr_z_yhzh)Session["user"];
if (!DBHlper.GetPermission(yhzh.juese, "工价档案", "nr_z_cpkc_gj", "查看全部"))
if (!DBHlper.GetPermission(yhzh.juese, "工价档案", "view_nr_z_cpkc_gj", "查看全部"))
{
if (tj == "")
{
@ -224,7 +224,7 @@ public partial class Wages_list : System.Web.UI.Page
{
string selectcmd = "select count(*) from view_nr_z_cpkc_gj " + wheretj;
Maticsoft.Model.nr_z_yhzh yhzh = (Maticsoft.Model.nr_z_yhzh)Session["user"];
if (!DBHlper.GetPermission(yhzh.juese, "工价档案", "nr_z_cpkc_gj", "查看全部"))
if (!DBHlper.GetPermission(yhzh.juese, "工价档案", "view_nr_z_cpkc_gj", "查看全部"))
{
if (wheretj == "")
{
@ -297,7 +297,8 @@ public partial class Wages_list : System.Web.UI.Page
{
Response.Redirect("../index.aspx");
}
if (!DBHlper.GetPermission(juese, "工价档案", "nr_z_cpkc_gj", "查看全部") && !DBHlper.GetPermission(juese, "工价档案", "nr_z_cpkc_gj", "查看个人"))
if (!DBHlper.GetPermission(juese, "工价档案", "view_nr_z_cpkc_gj", "查看全部")
&& !DBHlper.GetPermission(juese, "工价档案", "view_nr_z_cpkc_gj", "查看个人"))
{
Response.Redirect("../Common/nopower.htm");
}

71
newyt/Module_data/WorkRecord_browse.aspx
View File

@ -19,6 +19,7 @@
<script type="text/javascript">
var djryxzzhi;
//调用登记方法
function seqrscdj() {
$("#<%=scdjbt.ClientID%>").click();
@ -37,15 +38,19 @@
var hcount = parseFloat($("#djtb tbody").children().eq($("#djtb tbody").children().length - 1).attr("id")) + 1;
$("#djtb").append("<tr id='" + hcount + "' ><td width='25px'> <img src='../Images_Folder/Button/tjljh.png' onclick='jianhang(this)' width='25px' height='25px' /></td>"
+ "<td><input type='text' id='djgx" + hcount + "' name='0' value='" + $("#gyxx").find("option:selected").text() + "' Class='inpittxt_hx' readonly /></td >"
// + "<td><input type='text' id='djgxr" + hcount + "' name='0' value='" + $("#gyxx").val() + "' Class='inpittxt_hx' readonly />"
//+"</td > "
+ "<td><select Class='inpittxt_xl' id='djry" + hcount + "' >" + djryxzzhi + "</select></td> "
+ "<td><input type='text' id='djsl" + hcount + "' value='' onkeyup='doubleshuru(this)' Class='inpittxt' /></td>"
+ "<td><input type='text' id='bfsl" + hcount + "' value='' onkeyup='doubleshuru(this)' Class='inpittxt' /></td>"
+ "<td><input type='text' id='beizhu" + hcount + "' value='' Class='inpittxt' />"
+ "<td><input type='text' id='djgxr" + hcount + "' name='0' value='" + $("#gyxx").val() + "' Class='inpittxt_hx' readonly /></td>"
+ "<td><select Class='inpittxt_xl' id='djryr" + hcount + "' >" + djryxzzhi + "</select></td> "
+ "<td><input type='text' id='djslr" + hcount + "' value='' onkeyup='doubleshuru(this)' Class='inpittxt' /></td>"
+ "<td><input type='text' id='bfslr" + hcount + "' value='' onkeyup='doubleshuru(this)' Class='inpittxt' /></td>"
+ "<td><input type='text' id='beizhur" + hcount + "' value='' Class='inpittxt' /> </td></tr>");
//+ "<td><input type='text' id='djgxr" + hcount + "' name='0' value='" + $("#gyxx").val() + "' Class='inpittxt_hx' readonly /></td>"
//+ "<td><select Class='inpittxt_xl' id='djryr" + hcount + "' >" + djryxzzhi + "</select></td> "
//+ "<td><input type='text' id='djslr" + hcount + "' value='' onkeyup='doubleshuru(this)' Class='inpittxt' /></td>"
//+ "<td><input type='text' id='bfslr" + hcount + "' value='' onkeyup='doubleshuru(this)' Class='inpittxt' /></td>"
// + "<td><input type='text' id='beizhur" + hcount + "' value='' Class='inpittxt' />"
+ "</td></tr>");
}
function qrtqcz() {
if (confirm("确定要提取库存吗？")) {
@ -117,34 +122,34 @@
jsonStr2 += "\"bfsl\":\"" + bfsl + "\",";
jsonStr2 += "\"bz\":\"" + beizhu + "\"";
jsonStr2 += "},";
var djgxrid = "djgxr" + trid;
var djgxr = document.getElementById(djgxrid).value;
var namer = document.getElementById(djgxrid).name;
var djryrid = "djryr" + trid;
var djryr = document.getElementById(djryrid).value;
var djslrid = "djslr" + trid;
var djslr = document.getElementById(djslrid).value;
if (djslr == "") {
djslr = 0;
}
var bfslrid = "bfslr" + trid;
var bfslr = document.getElementById(bfslrid).value;
if (bfslr == "") {
bfslr = 0;
}
var beizhurid = "beizhur" + trid;
var beizhur = document.getElementById(beizhurid).value;
if(djslr!="")
{
jsonStr2 += "{";
jsonStr2 += "\"id\":\"" + namer + "\",";
jsonStr2 += "\"djgx\":\"" + djgxr + "\",";
jsonStr2 += "\"djry\":\"" + djryr + "\",";
jsonStr2 += "\"djsl\":\"" + djslr + "\",";
jsonStr2 += "\"bfsl\":\"" + bfslr + "\",";
jsonStr2 += "\"bz\":\"" + beizhur + "\"";
jsonStr2 += "},";
}
//var djgxrid = "djgxr" + trid;
//var djgxr = document.getElementById(djgxrid).value;
//var namer = document.getElementById(djgxrid).name;
//var djryrid = "djryr" + trid;
//var djryr = document.getElementById(djryrid).value;
//var djslrid = "djslr" + trid;
//var djslr = document.getElementById(djslrid).value;
//if (djslr == "") {
// djslr = 0;
//}
//var bfslrid = "bfslr" + trid;
//var bfslr = document.getElementById(bfslrid).value;
//if (bfslr == "") {
// bfslr = 0;
//}
//var beizhurid = "beizhur" + trid;
//var beizhur = document.getElementById(beizhurid).value;
//if(djslr!="")
//{
// jsonStr2 += "{";
// jsonStr2 += "\"id\":\"" + namer + "\",";
// jsonStr2 += "\"djgx\":\"" + djgxr + "\",";
// jsonStr2 += "\"djry\":\"" + djryr + "\",";
// jsonStr2 += "\"djsl\":\"" + djslr + "\",";
// jsonStr2 += "\"bfsl\":\"" + bfslr + "\",";
// jsonStr2 += "\"bz\":\"" + beizhur + "\"";
// jsonStr2 += "},";
//}
}
if (djgyzsl > $("#ddjsl").val() * 1) {
alert("当前登记数量不得超过待登记数量");

49
newyt/Module_data/WorkRecord_browse.aspx.cs
View File

@ -56,7 +56,7 @@ public partial class WorkRecord_browse : CommonPage
//获取角色权限
Maticsoft.Model.nr_z_yhzh user = (Maticsoft.Model.nr_z_yhzh)(Session["user"]);
xfczr.Value = user.zhanghao;
DataSet djgxds = DBHlper.Execute("select * from view_nr_z_ryda_gxqx where glzh='" + user.zhanghao + "' and zt='在职' and qxlx='登记权限'");
DataSet djgxds = DBHlper.Execute("select * from view_nr_z_ryda_gxqx where glzh='" + user.zhanghao + "' and zt='在职' and qxlx='登记权限'"); //
if (djgxds != null && djgxds.Tables[0].Rows.Count > 0)
{
gyxx.DataSource = djgxds.Tables[0].DefaultView;
@ -98,29 +98,37 @@ public partial class WorkRecord_browse : CommonPage
//已接收数量总数量
int yjszsl = 0;
//已登记总数量
//string djzsl=DBHlper.getfirstcolmn("select isnull(SUM(djsl),0) from nr_z_scdj_djjl where scxmid='" + id.Value + "'and djgx='" + gyxx.SelectedItem.Text+ "'");
string djzsl = DBHlper.getfirstcolmn("select isnull(SUM(djsl),0) from nr_z_scdj_djjl where scxmid='" + id.Value + "'and djgx='" + gyxx.SelectedItem.Text + "'");
//已下发总数量
//string yxfzsl = DBHlper.getfirstcolmn("select isnull(SUM(xfsl),0) from nr_z_scdj_xf where scxmid='" + id.Value + "' and dqgx='" + gyxx.SelectedItem.Text + "' and xfgx=(select top 1 xfgx from nr_z_scdj_xf where dqgx='" + gyxx.SelectedItem.Text + "')");
string yxfzsl = DBHlper.getfirstcolmn("select isnull(SUM(xfsl),0) from nr_z_scdj_xf where scxmid='" + id.Value + "' and dqgx='" + gyxx.SelectedItem.Text + "' and xfgx=(select top 1 xfgx from nr_z_scdj_xf where dqgx='" + gyxx.SelectedItem.Text + "')");
//已报废总数量
//string ybfzsl = DBHlper.getfirstcolmn("select isnull(SUM(bfsl),0) from nr_z_scdj_djjl where scxmid='" + id.Value + "' and djgx='" + gyxx.SelectedItem.Text + "'");
string ybfzsl = DBHlper.getfirstcolmn("select isnull(SUM(bfsl),0) from nr_z_scdj_djjl where scxmid='" + id.Value + "' and djgx='" + gyxx.SelectedItem.Text + "'");
qrtq.Visible = false;
sctqkc.Visible = false;
//接收||需产总数量
int xczsl = 0;
string biao = "";
tqsl.InnerText = "";
if (gyxx.SelectedItem.Text == "制模")
if (gyxx.SelectedItem != null && gyxx.SelectedItem.Text == "制模")
{
DataSet zldds = DBHlper.Execute("select * from nr_z_mjzld where scdbh='" + scdh.Value + "' and xmid='" + id.Value + "' and pm='" + cpmc.Value + "'");
biao = "<table id='djstb' class='bule'> <tr id='0' class='tbtilt'>"
+ "<td><span>生产编号</span></td><td><span>模具代码</span></td><td><span>模具名称</span></td>"
+ "<td><span>指令类型</span></td><td><span>计划数量</span></td>"
+ "<td><span>备注</span></td><td><span>状态</span></td></tr>";
+ "<td><span>生产编号</span></td>" +
"<td><span>模具代码</span></td>" +
"<td><span>模具名称</span></td>"
+ "<td><span>指令类型</span></td>" +
"<td><span>计划数量</span></td>"
+ "<td><span>备注</span></td>" +
"<td><span>状态</span></td></tr>";
foreach (DataRow r in zldds.Tables[0].Rows)
{
biao += "<tr><td><span>" + r["scdbh"].ToString() + "</span></td><td><span>" + r["mjh"].ToString() + "</span></td>"
+ "<td><span>" + r["pm"].ToString() + "</span></td><td><span>" + r["djlx"].ToString() + "</span></td>"
+ "<td><span>" + r["xcmj"].ToString() + "</span></td><td><span>" + r["bz"].ToString() + "</span></td><td><span>已接收</span></td></tr>";
biao += "<tr><td><span>" + r["scdbh"].ToString() + "</span></td>" +
"<td><span>" + r["mjh"].ToString() + "</span></td>"
+ "<td><span>" + r["pm"].ToString() + "</span></td>" +
"<td><span>" + r["djlx"].ToString() + "</span></td>"
+ "<td><span>" + r["xcmj"].ToString() + "</span></td>" +
"<td><span>" + r["bz"].ToString() + "</span></td>" +
"<td><span>已接收</span></td></tr>";
xczsl = xczsl + Convert.ToInt32(r["xcmj"]);
}
jsxm.InnerHtml = biao + "</table>";
@ -162,7 +170,8 @@ public partial class WorkRecord_browse : CommonPage
tqslbt.Visible = true;
tqsl.InnerText = "可提取数量：" + dtqkcsl + "；已提取数量：" + ytqkcsl;
yjszsl = Convert.ToInt32(gyyjssl) + Convert.ToInt32(ytqkcsl);
} else if (gyxx.SelectedItem.Text == "素坯仓")
}
else if (gyxx.SelectedItem.Text == "素坯仓")
{
string dtqkcsl = DBHlper.getfirstcolmn("select sptqsl from dbo.nr_z_scd_cp_tqkc where xmid='" + id.Value + "' and spzt='0'");
string ytqkcsl = DBHlper.getfirstcolmn("select sptqsl from dbo.nr_z_scd_cp_tqkc where xmid='" + id.Value + "' and spzt='1'");
@ -210,12 +219,12 @@ public partial class WorkRecord_browse : CommonPage
}
}
jhsl.Value = xczsl.ToString();
//int dxfzsl = Convert.ToInt32(djzsl) - Convert.ToInt32(yxfzsl);
//int ddjzsl = yjszsl - Convert.ToInt32(djzsl) - Convert.ToInt32(ybfzsl);
//ddjsl.Value = ddjzsl.ToString();
//yxfsl.Value = yxfzsl.ToString();
//dxfsl.Value = dxfzsl.ToString();
//ybfsl.Value = ybfzsl;
int dxfzsl = Convert.ToInt32(djzsl) - Convert.ToInt32(yxfzsl);
int ddjzsl = yjszsl - Convert.ToInt32(djzsl) - Convert.ToInt32(ybfzsl);
ddjsl.Value = ddjzsl.ToString();
yxfsl.Value = yxfzsl.ToString();
dxfsl.Value = dxfzsl.ToString();
ybfsl.Value = ybfzsl;
}
#endregion
@ -227,8 +236,8 @@ public partial class WorkRecord_browse : CommonPage
+ "<td width='25px' onclick='add_djxm()' class='head5'> <img src='../Images_Folder/Button/tjltj.png' width='25px' height='25px' /></td>"
+ "<td><span>登记工序</span></td><td><span>登记人员</span></td><td><span>登记数量</span></td><td><span>报废数量</span></td>"
+ "<td><span>备注</span></td>"
+ "<td><span>登记工序</span></td><td><span>登记人员</span></td><td><span>登记数量</span></td><td><span>报废数量</span></td>"
+ "<td><span>备注</span></td>"
//+ "<td><span>登记工序</span></td><td><span>登记人员</span></td><td><span>登记数量</span></td><td><span>报废数量</span></td>"
//+ "<td><span>备注</span></td>"
+ "</tr>";
scdjdiv.InnerHtml = biao + "</table>";