From e8eed61d8b70215766a4e5c226e10d2f0d28ff95 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 11:31:40 +0800
Subject: [PATCH] 1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发 2.组织架构删除update改为delete 3.工艺路线新增else if改为if 4.节拍工价根据工序线编码查找关联设备集合 5.PC/APP工资报表
---
VueWebApi/DLL/DAL/AppQualityManagementDAL.cs | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 160 insertions(+), 3 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs b/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
index dbb3def..7c8bb60 100644
--- a/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
@@ -1,10 +1,12 @@
锘縰sing Dapper;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
+using VueWebApi.Models;
using VueWebApi.Tools;
namespace VueWebApi.DLL.DAL
@@ -57,7 +59,7 @@
from T_BarCodeBill A
left join TMateriel_Info M on A.hmaterialcode=M.partcode
left join TCustomer C on A.hcustomercode=C.code
- where A.hbarcode=@labcode";
+ where A.hbarcode=@labcode and A.hbarcodestatus='Y'";
dynamicParams.Add("@labcode", labcode);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
if (data1.Rows.Count > 0)
@@ -80,7 +82,7 @@
else
{
mes.code = "300";
- mes.Message = "姝ゆ爣绛炬潯鐮佷笉瀛樺湪!";
+ mes.Message = "姝ゆ爣绛炬潯鐮佷笉瀛樺湪鎴栧け鏁�!";
mes.data = null;
}
}
@@ -118,7 +120,7 @@
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
- else
+ else
{
mes.code = "300";
mes.count = 0;
@@ -137,5 +139,160 @@
}
#endregion
+
+ #region[鍏ュ巶妫�楠�,鎻愪氦]
+ public static ToMessage InFactoryCheckSave(string hbillno, string labcode, string checkstandcode, string check_type, string sampmethod, string partcode, string customercode, string batchno, string qualitystatus, string labqty, string sampleqty, string goodqty, string ngqty, string issyncbatch, string checkitemcont, string username)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ List<ObjectData> obj = new List<ObjectData>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ string datetime = DateTime.Now.ToString(); //鑾峰彇绯荤粺鏃堕棿
+ //鑾峰彇妫�楠岄」鐩俊鎭�
+ JArray arra = (JArray)Newtonsoft.Json.JsonConvert.DeserializeObject(checkitemcont);
+ list.Clear();
+ if (issyncbatch == "Y") //鍚屾鐩稿悓鎵规
+ {
+ //鏌ユ壘鐩稿悓鎵规鏉＄爜(鍔熻兘缂栫爜銆佸崟鎹彿銆佸崟鎹被鍨嬨�佹潯鐮佺被鍨嬨�佺墿鏂欑紪鐮併�佹壒娆″彿銆佹潯鐮佺姸鎬�)
+ sql = @"select hbarcode,hqty from T_BarCodeBill
+ where rightcode=@rightcode and hbillno=@hbillno and hbilltype=@hbilltype and hbarcodetype=@hbarcodetype
+ and hmaterialcode=@hmaterialcode and hbatchno=@hbatchno and hbarcodestatus=@hbarcodestatus";
+ dynamicParams.Add("@rightcode", "2060");
+ dynamicParams.Add("@hbillno", hbillno);
+ dynamicParams.Add("@hbilltype", "1103");
+ dynamicParams.Add("@hbarcodetype", "P");
+ dynamicParams.Add("@hmaterialcode", partcode);
+ dynamicParams.Add("@hbatchno", batchno);
+ dynamicParams.Add("@hbarcodestatus", "Y");
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ for (int i = 0; i < data.Rows.Count; i++)
+ {
+ ObjectData tbj = new ObjectData();
+ tbj.code = data.Rows[i]["hbarcode"].ToString();
+ tbj.name = data.Rows[i]["hqty"].ToString();
+ obj.Add(tbj);
+ }
+ }
+ else
+ {
+ ObjectData tbj = new ObjectData();
+ tbj.code = labcode;
+ tbj.name = labqty;
+ obj.Add(tbj);
+ }
+ }
+ else
+ {
+ ObjectData tbj = new ObjectData();
+ tbj.code = labcode;
+ tbj.name = labqty;
+ obj.Add(tbj);
+ }
+
+ //寰幆鏍囩涓暟
+ for (int i = 1; i <= obj.Count; i++)
+ {
+ //鍐欏叆妫�楠岃褰曚富琛�
+ sql = @"insert into TStepCheckRecord(hbarcode,wo_code,partcode,checkstaned_code,customer_code,check_user,check_type,check_typename,sampmethod,check_result,check_qty,good_qty,ng_qty,lm_user,lm_date)
+ values(@hbarcode,@wo_code,@partcode,@checkstaned_code,@check_user,@check_type,@check_typename,@sampmethod,@check_result,@check_qty,@good_qty,@ng_qty,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ hbarcode = obj[i].code,
+ wo_code = hbillno,
+ partcode = partcode,
+ checkstaned_code = checkstandcode,
+ customer_code=customercode,
+ check_user = username,
+ check_type = check_type,
+ check_typename = "鍏ュ巶妫�楠�",
+ sampmethod = sampmethod,
+ check_result = qualitystatus,
+ check_qty = decimal.Parse(sampleqty),
+ good_qty = decimal.Parse(goodqty),
+ ng_qty = decimal.Parse(ngqty),
+ lm_user = username,
+ lm_date = datetime
+ }
+ });
+ //鑾峰彇涓昏〃鏈�澶D
+ sql = @"select ISNULL(IDENT_CURRENT('TStepCheckRecord')+@num,1) as id";
+ dynamicParams.Add("@num", i);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ //鍐欏叆妫�楠岃褰曞瓙琛�
+ for (int j = 0; j < arra.Count; j++)
+ {
+ sql = @"insert into TStepCheckRecordSub(m_id,checknum,checkitem_seq,checkitem_code,checkitem_name,checkitem_descr,check_value,check_result,lm_user,lm_date)
+ values(@m_id,@checkiem_seq,@checkitem_code,@checkitem_name,@checkitem_descr,@check_result,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
+ checknum = arra[i]["checknum"].ToString(),
+ checkiem_seq = arra[i]["checkiem_seq"].ToString(),
+ checkitem_code = arra[i]["checkitem_code"].ToString(),
+ checkitem_name = arra[i]["checkitem_name"].ToString(),
+ checkitem_descr = arra[i]["checkitem_descr"].ToString(),
+ check_value = arra[i]["check_value"].ToString(),
+ check_result = arra[i]["check_result"].ToString(),
+ lm_user = username,
+ lm_date = datetime
+ }
+ });
+ }
+ }
+ //鍥炲啓鏉＄爜妗ｆ琛ㄦ爣绛捐川妫�鐘舵��
+ sql = @"update T_BarCodeBill set qualitystatus=@qualitystatus where rightcode=@rightcode and hbillno=@hbillno and hbilltype=@hbilltype
+ and hbarcodetype=@hbarcodetype and hmaterialcode=@hmaterialcode and hbatchno=@hbatchno and hbarcodestatus=@hbarcodestatus";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ qualitystatus= qualitystatus,
+ rightcode = "2060",
+ hbillno = hbillno,
+ hbilltype = "1103",
+ hbarcodetype = "P",
+ hmaterialcode = partcode,
+ hbatchno = batchno,
+ hbarcodestatus = "Y"
+ }
+ });
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鎿嶄綔澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3