From a667d4159bb3f1ba909b94d5b5dd7c6eb28e7197 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 07 四月 2023 09:48:30 +0800
Subject: [PATCH] 1.添加质检方案基础资料 2.采购到货接口调整 3.入厂检验扫描标签添加标签判断 4.ERP订单下达生成工单接口修改 5.编码规则接口修改 6.采购退货查询采购订单接口开发、订单查找物料接口开发
---
VueWebApi/DLL/DAL/AppQualityManagementDAL.cs | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs b/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
index 7c8bb60..c6821f0 100644
--- a/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/AppQualityManagementDAL.cs
@@ -41,11 +41,23 @@
mes.data = null;
return mes;
}
+ //鍒ゆ柇鏉＄爜鏄惁闇�瑕佹楠�
+ sql = @"select * from TMateriel_Info where partcode=@partcode and is_incheck='N'";
+ dynamicParams.Add("@partcode", data0.Rows[0]["hmaterialcode"].ToString());
+ var data_0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data_0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "姝ゆ爣绛炬潯鐮佸厤妫�!";
+ mes.data = null;
+ return mes;
+ }
//鍒ゆ柇鏉＄爜鏄惁妫�楠�
sql = @"select * from TStepCheckRecord where hbarcode=@labcode and check_type='InCheck'";
dynamicParams.Add("@labcode", labcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data0.Rows.Count > 0)
+ if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
@@ -67,7 +79,7 @@
//鑾峰彇缁戝畾鐨勫叆鍘傝川妫�鏂规銆佹娊鏍锋柟寮忋�佹牱鏈暟
sql = @"select code as checkstandcode,name as checkstandname,sampmethod,sampscare
from TStepCheckStandard
- where PATINDEX('%;' + RTRIM(@partcode) + ';%',';' + suitpart + ';')>0 or PATINDEX('%;' + RTRIM(@stocktype_code) + ';%',';' + suitpart + ';')>0
+ where (PATINDEX('%,' + RTRIM(@partcode) + ',%',',' + suitpart + ',')>0 or PATINDEX('%,' + RTRIM(@stocktype_code) + ',%',',' + suitpart + ',')>0)
and checktype='InCheck'";
dynamicParams.Add("@partcode", data1.Rows[0]["partcode"].ToString());//鐗╂枡缂栫爜
dynamicParams.Add("@stocktype_code", data1.Rows[0]["stocktype_code"].ToString());//瀛樿揣绫诲瀷缂栫爜
@@ -194,11 +206,11 @@
}
//寰幆鏍囩涓暟
- for (int i = 1; i <= obj.Count; i++)
+ for (int i = 0; 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)";
+ values(@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)";
list.Add(new
{
str = sql,
@@ -223,26 +235,26 @@
});
//鑾峰彇涓昏〃鏈�澶D
sql = @"select ISNULL(IDENT_CURRENT('TStepCheckRecord')+@num,1) as id";
- dynamicParams.Add("@num", i);
+ dynamicParams.Add("@num", i+1);
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)";
+ values(@m_id,@checknum,@checkiem_seq,@checkitem_code,@checkitem_name,@checkitem_descr,@check_value,@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(),
+ checknum = arra[j]["checknum"].ToString(),
+ checkiem_seq = arra[j]["checkiem_seq"].ToString(),
+ checkitem_code = arra[j]["checkitem_code"].ToString(),
+ checkitem_name = arra[j]["checkitem_name"].ToString(),
+ checkitem_descr = arra[j]["checkitem_descr"].ToString(),
+ check_value = arra[j]["check_value"].ToString(),
+ check_result = arra[j]["check_result"].ToString(),
lm_user = username,
lm_date = datetime
}
--
Gitblit v1.9.3