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="" />

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

@ -70,7 +70,7 @@ public partial class Employee_Form : CommonPage
//jbgz.Value = "0";
DataSet hylx = bmlx.GetAllList();
DataRow [] dr = hylx.Tables[0].Select("leixing='学历'");
DataRow[] dr = hylx.Tables[0].Select("leixing='学历'");
if (dr != null && dr.Length > 0)
{
DataSet xz = bm.GetList("zhongleiid='" + dr[0]["id"] + "'");
@ -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
@ -251,7 +251,7 @@ public partial class Employee_Form : CommonPage
string biao = "<table width='100%' class='bule' id='ddxm'> ";
DataSet dtgx = DBHlper.Execute("select * from view_bianma where zhonglei='工序项目'");
string gxcode = "<tr><td style='width:120px;'><span>登记工艺权限</span></td><td><ul>";
DataSet djqxgyds = DBHlper.Execute("select * from nr_z_ryda_gxqx where ryid='"+id.Value+"' and qxlx='登记权限'");
DataSet djqxgyds = DBHlper.Execute("select * from nr_z_ryda_gxqx where ryid='" + id.Value + "' and qxlx='登记权限'");
DataRow[] ckdr = djqxgyds.Tables[0].Select("gyxx='制模'");
if (ckdr != null && ckdr.Length > 0)
{
@ -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 敏感权限查看
@ -453,10 +453,10 @@ public partial class Employee_Form : CommonPage
}
if (rtx > 0)
{
int delez=DBHlper.excutecmd("delete nr_z_ryda_gxqx where ryid='" + rtx + "'");
int delez = DBHlper.excutecmd("delete nr_z_ryda_gxqx where ryid='" + rtx + "'");
foreach (string djgx in djgyqxhd.Value.Split(','))
{
int djz=DBHlper.excutecmd("insert into nr_z_ryda_gxqx (ryid,gyxx,qxlx) values ('"+rtx+"','"+djgx+"','登记权限')");
int djz = DBHlper.excutecmd("insert into nr_z_ryda_gxqx (ryid,gyxx,qxlx) values ('" + rtx + "','" + djgx + "','登记权限')");
}
foreach (string xfgx in xfgyqxhd.Value.Split(','))
{

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

@ -113,11 +113,11 @@ public partial class Employee_browse : CommonPage
Response.Redirect("../Common/nopower.htm");
}
if (DBHlper.GetPermission(juese, "人员档案", "nr_z_ryda", "编辑") )
if (DBHlper.GetPermission(juese, "人员档案", "nr_z_ryda", "编辑"))
{
bt_tj.Visible = true;
}
if (DBHlper.GetPermission(juese, "人员档案", "nr_z_ryda", "删除") )
if (DBHlper.GetPermission(juese, "人员档案", "nr_z_ryda", "删除"))
{
shanchu.Visible = true;
}

14
newyt/Module_data/Wages_browse.aspx.cs
View File

@ -55,7 +55,7 @@ public partial class Wages_browse : CommonPage
#region 修改时获取真正数据值
private void initdata(string did)
{
DataSet ds=DBHlper.Execute("select * from view_nr_z_cpkc_gj where id='"+did+"'");
DataSet ds = DBHlper.Execute("select * from view_nr_z_cpkc_gj where id='" + did + "'");
if (ds != null && ds.Tables[0].Rows.Count > 0)
{
cpbh.Value = ds.Tables[0].Rows[0]["cpbh"].ToString();
@ -64,21 +64,21 @@ public partial class Wages_browse : CommonPage
guige.Value = ds.Tables[0].Rows[0]["gg"].ToString();
zhongliang.Value = ds.Tables[0].Rows[0]["zhongliang"].ToString();
tiji.Value = ds.Tables[0].Rows[0]["tiji"].ToString();
DataSet gjds=DBHlper.Execute(" select * from view_bianma where zhonglei='前段工价' or zhonglei='中段工价' or zhonglei='后段工价'");
DataSet gjds = DBHlper.Execute(" select * from view_bianma where zhonglei='前段工价' or zhonglei='中段工价' or zhonglei='后段工价'");
if (gjds != null && gjds.Tables[0].Rows.Count > 0)
{
//修改页面时，首先吧项目明细的表头加载出来
string biao = " <table class='tablewk' id='gjfytb'>";
int x=0;
int x = 0;
foreach(DataRow r in gjds.Tables[0].Rows)
foreach (DataRow r in gjds.Tables[0].Rows)
{
if (x == 0)
{
biao += "<tr>";
}
x = x + 1;
string cpgjzhi= DBHlper.getfirstcolmn("select isnull(gjjg,0) from nr_z_cpkc_gj where cpid='" + did + "' and gjmc='"+r["mingcheng"]+"'");
string cpgjzhi = DBHlper.getfirstcolmn("select isnull(gjjg,0) from nr_z_cpkc_gj where cpid='" + did + "' and gjmc='" + r["mingcheng"] + "'");
biao += "<td class='wktblm' ><span>" + r["mingcheng"] + "</span></td><td ><input type='text' id='dhsl' name='" + r["mingcheng"] + "' runat='server' value='" + cpgjzhi + "' class='tbinput' onkeyup='doubleshuru(this)' /> </td>";
if (x == 6)
{
@ -157,14 +157,14 @@ public partial class Wages_browse : CommonPage
int rtx = 0;
//判断uid是否存在值，有值为修改，无值为添加
DBHlper.excutecmd("delete nr_z_cpkc_gj where cpid='"+id.Value+"'");
DBHlper.excutecmd("delete nr_z_cpkc_gj where cpid='" + id.Value + "'");
List<Maticsoft.Model.nr_z_cpkc_gj> gjdads = new List<Maticsoft.Model.nr_z_cpkc_gj>();
gjdads = DBHlper.ConvertJsonToEntityListEntity<Maticsoft.Model.nr_z_cpkc_gj>(gjxxhd.Value);
foreach (Maticsoft.Model.nr_z_cpkc_gj gjx in gjdads)
{
gjx.cpid = Convert.ToInt32(id.Value);
rtx= gjdabll.Add(gjx);
rtx = gjdabll.Add(gjx);
}
caozuo = "修改";

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

@ -54,9 +54,9 @@ 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);
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");
}
@ -382,18 +383,18 @@ public partial class Wages_list : System.Web.UI.Page
for (int i = 0; i < gjds.Tables[0].Rows.Count; i++)
{
dt.Columns.Add("fy" +i);
dt.Columns.Add("fy" + i);
}
foreach (DataRow dr in dt.Rows)
{
for (int j = 0; j < gjds.Tables[0].Rows.Count; j++)
{
double gjjg=0;
DataSet gzds=DBHlper.Execute("select isnull(gjjg,0) from nr_z_cpkc_gj where gjmc='"+gjds.Tables[0].Rows[j]["mingcheng"]+"' and cpid='"+dr["id"]+"'");
if(gzds!=null&gzds.Tables[0].Rows.Count>0)
double gjjg = 0;
DataSet gzds = DBHlper.Execute("select isnull(gjjg,0) from nr_z_cpkc_gj where gjmc='" + gjds.Tables[0].Rows[j]["mingcheng"] + "' and cpid='" + dr["id"] + "'");
if (gzds != null & gzds.Tables[0].Rows.Count > 0)
{
gjjg= Convert.ToDouble(gzds.Tables[0].Rows[0][0]);
gjjg = Convert.ToDouble(gzds.Tables[0].Rows[0][0]);
}
dr["fy" + j] = gjjg;
@ -405,7 +406,7 @@ public partial class Wages_list : System.Web.UI.Page
DBHlper.ExportByWeb(dt, "工价档案信息"+DateTime.Now, sList);
DBHlper.ExportByWeb(dt, "工价档案信息" + DateTime.Now, sList);
}
#endregion
#region 汇总

73
newyt/Module_data/WorkRecord_browse.aspx
View File

@ -19,6 +19,7 @@
<script type="text/javascript">
var djryxzzhi;
//调用登记方法
function seqrscdj() {
$("#<%=scdjbt.ClientID%>").click();
@ -36,16 +37,20 @@
//给每行的id 赋值上一行的id 加1； 不会重复的id;
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='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("当前登记数量不得超过待登记数量");

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

@ -56,8 +56,8 @@ 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='登记权限'");
if (djgxds != null && djgxds.Tables[0].Rows.Count> 0)
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;
gyxx.DataValueField = "id";
@ -96,31 +96,39 @@ public partial class WorkRecord_browse : CommonPage
cpbh.Value = scdjds.Tables[0].Rows[0]["cphh"].ToString();
}
//已接收数量总数量
int yjszsl =0;
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 + "'");
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>";
@ -129,7 +137,7 @@ public partial class WorkRecord_browse : CommonPage
else
{
DataSet zldds = DBHlper.Execute("select * from nr_z_scdj_xf where scxmid='"+id.Value+"' and xfgx='"+gyxx.SelectedItem.Text+"'");
DataSet zldds = DBHlper.Execute("select * from nr_z_scdj_xf where scxmid='" + id.Value + "' and xfgx='" + gyxx.SelectedItem.Text + "'");
biao = "<table class='bule' id='djstb' > <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></tr>";
@ -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,35 +236,35 @@ 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>"
+"</tr>";
//+ "<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>";
}
#endregion
[Ajax.AjaxMethod()]
public int xzjsgy(string gyid,string cpid, string gyxx)
public int xzjsgy(string gyid, string cpid, string gyxx)
{
string cmd ="update nr_z_scdj_xf set zt='已接收' where id='"+gyid+"'";
string cmd = "update nr_z_scdj_xf set zt='已接收' where id='" + gyid + "'";
int fhz = DBHlper.excutecmd(cmd);
if (fhz > 0)
{
string xfsl=DBHlper.getfirstcolmn("select xfsl from nr_z_scdj_xf where id='" + gyid + "'");
if (gyxx== "土坯仓")
string xfsl = DBHlper.getfirstcolmn("select xfsl from nr_z_scdj_xf where id='" + gyid + "'");
if (gyxx == "土坯仓")
{
DBHlper.Execute("update nr_z_cpkc set tpcsl='" + xfsl + "' where id='" + cpid+ "'");
DBHlper.Execute("update nr_z_cpkc set tpcsl='" + xfsl + "' where id='" + cpid + "'");
}
else if (gyxx== "素坯仓")
else if (gyxx == "素坯仓")
{
DBHlper.Execute("update nr_z_cpkc set spcsl='" + xfsl + "' where id='" + cpid + "'");
}
else if (gyxx== "白地仓")
else if (gyxx == "白地仓")
{
DBHlper.Execute("update nr_z_cpkc set bdcsl='" + xfsl + "' where id='" + cpid + "'");
}
else if (gyxx== "成品仓")
else if (gyxx == "成品仓")
{
DBHlper.Execute("update nr_z_cpkc set sl='" + xfsl + "' where id='" + cpid + "'");
}
@ -371,12 +380,12 @@ public partial class WorkRecord_browse : CommonPage
x.ywy = user.zhanghao;
mxid = djbll.Add(x);
//查询物料需求列表
DataSet wlxqds=DBHlper.Execute("select * from dbo.view_nr_z_cpkc_wlxq where cpbh='"+cpbh.Value+"' and glgx='"+x.djgx+"' and xqyl>0");
foreach( DataRow xqr in wlxqds.Tables[0].Rows)
DataSet wlxqds = DBHlper.Execute("select * from dbo.view_nr_z_cpkc_wlxq where cpbh='" + cpbh.Value + "' and glgx='" + x.djgx + "' and xqyl>0");
foreach (DataRow xqr in wlxqds.Tables[0].Rows)
{
decimal clcksl = x.djsl * Convert.ToDecimal(xqr["xqyl"]);
string ckbh= DBHlper.getbh("YLCK-", "nr_z_scdck", "ckbh", 4);
int setckz=DBHlper.excutecmd("insert into nr_z_scdck(ckbh,ckrq,xmid,wlbh,sl,jsr,zt,djbh,lx,kufang) values('" + ckbh + "','" + DateTime.Now + "','" + id.Value + "','" + xqr["wlbh"] + "','" + clcksl + "','" + user.zhanghao + "','待确认','" + scdh.Value + "','生产领料','" + xqr["kufang"] + "')");
string ckbh = DBHlper.getbh("YLCK-", "nr_z_scdck", "ckbh", 4);
int setckz = DBHlper.excutecmd("insert into nr_z_scdck(ckbh,ckrq,xmid,wlbh,sl,jsr,zt,djbh,lx,kufang) values('" + ckbh + "','" + DateTime.Now + "','" + id.Value + "','" + xqr["wlbh"] + "','" + clcksl + "','" + user.zhanghao + "','待确认','" + scdh.Value + "','生产领料','" + xqr["kufang"] + "')");
}
@ -385,7 +394,7 @@ public partial class WorkRecord_browse : CommonPage
rizhi.leixing = "生产登记";
rizhi.yonghuming = user.zhanghao;
//拼接字符串插入日志
rizhi.jilu = user.zhanghao + "进行了生产登记；登记工序为："+x.djgx+",登记人员为："+x.djry+"，登记数量为：" +x.djsl+ "，报废数量为" +x.bfsl+ "；";
rizhi.jilu = user.zhanghao + "进行了生产登记；登记工序为：" + x.djgx + ",登记人员为：" + x.djry + "，登记数量为：" + x.djsl + "，报废数量为" + x.bfsl + "；";
rizhibll.Add(rizhi);
}
if (mxid > 0)
@ -406,7 +415,7 @@ public partial class WorkRecord_browse : CommonPage
int xfz = 0;
foreach (string r in xfgxhd.Value.Split(','))
{
xfz = DBHlper.excutecmd("insert into nr_z_scdj_xf (dqgx,xfgx,xfsl,czr,bz,zt,scxmid,xfsj) values ('" + gyxx.SelectedItem.Text + "','" + r+ "','" + xfsl.Value + "','" + xfczr.Value + "','" + xfbz.Value + "','待接收','" + id.Value +"','"+DateTime.Now+ "')");
xfz = DBHlper.excutecmd("insert into nr_z_scdj_xf (dqgx,xfgx,xfsl,czr,bz,zt,scxmid,xfsj) values ('" + gyxx.SelectedItem.Text + "','" + r + "','" + xfsl.Value + "','" + xfczr.Value + "','" + xfbz.Value + "','待接收','" + id.Value + "','" + DateTime.Now + "')");
}
if (xfz > 0)
{
@ -415,7 +424,7 @@ public partial class WorkRecord_browse : CommonPage
rizhi.leixing = "生产登记";
rizhi.yonghuming = xfczr.Value;
//拼接字符串插入日志
rizhi.jilu = xfczr.Value + "进行了生产下发：从" + gyxx.SelectedItem.Text + ",下发到：" + xfgxhd.Value + "；下发数量为" + xfsl.Value+"；";
rizhi.jilu = xfczr.Value + "进行了生产下发：从" + gyxx.SelectedItem.Text + ",下发到：" + xfgxhd.Value + "；下发数量为" + xfsl.Value + "；";
rizhibll.Add(rizhi);
Response.Write("<script Language='javascript'>alert('下发操作成功！');window.location.href='WorkRecord_browse.aspx?uid=" + id.Value + "&xzgy=" + gyxx.SelectedValue + "';</script>");
@ -436,10 +445,10 @@ public partial class WorkRecord_browse : CommonPage
{
upsql = "update nr_z_scd_cp_tqkc set bdzt='1' where xmid='" + id.Value + "'";
}
int updz=DBHlper.excutecmd(upsql);
if(updz>0)
int updz = DBHlper.excutecmd(upsql);
if (updz > 0)
{
Response.Write("<script Language='javascript'>alert('提取库存成功！');window.location.href='WorkRecord_browse.aspx?uid=" + id.Value + "&xzgy=" + gyxx.SelectedValue+ "';</script>");
Response.Write("<script Language='javascript'>alert('提取库存成功！');window.location.href='WorkRecord_browse.aspx?uid=" + id.Value + "&xzgy=" + gyxx.SelectedValue + "';</script>");
}
}