From cbeb997178132c5c71d57b5011847f7d6e21930a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 08 十一月 2024 15:58:55 +0800
Subject: [PATCH] 1.入库记录删除 2.畅捷通T+反写产成品入库单(直接写表) 3.erp同步基础资料和订单改为根据配置取T+或者T8 4.通用基础资料仓库资料放出erpid 5.生产入库查询信息接口调整字段(T+和T8共用)
---
VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 25 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
index 17a2d83..dba19a6 100644
--- a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
@@ -4028,31 +4028,31 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select A.inbarcode,E.saleOrderid,isnull(E.saleOrderCode,'') as saleOrderCode,E.saleOrderDetailId,E.woid as mpoid,M.m_po,E.sbid,M.id as wo_id,A.wo_code,E.materiel_id,P.partcode,P.partname,P.partspec,E.unitid,E.unitcode,E.unitname,
- A.step_code,T.stepname,M.wkshp_code,O.torg_name as wkshp_name,K.code as stockcode,k.name as stockname,
- E.saleOrderqty,E.qty,M.plan_qty,A.good_qty,isnull(A.inhouseqty,0) as inhouseqty,A.good_qty-isnull(A.inhouseqty,0) as stinhouseqty,M.lm_date,A.style
- from TK_Wrk_Record A
- inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
- inner join TK_Wrk_Man M on S.wo_code=M.wo_code
- inner join TMateriel_Info P on M.materiel_code=P.partcode
- left join TKimp_Ewo E on M.m_po=E.wo and M.sourceid= E.id
- left join TSecStck K on P.idwarehouse=K.code
- left join TStep T on A.step_code=T.stepcode
- left join TOrganization O on M.wkshp_code=O.torg_code
- where A.style='B' and A.inbarcode<>'' and S.isend='Y' and A.good_qty>0
- union all
- select A.inbarcode,E.saleOrderid,isnull(E.saleOrderCode,'') as saleOrderCode,E.saleOrderDetailId,E.woid as mpoid,M.m_po,E.sbid,M.id as wo_id,A.wo_code,E.materiel_id,P.partcode,P.partname,P.partspec,E.unitid,E.unitcode,E.unitname,
- A.step_code,T.stepname,M.wkshp_code,O.torg_name as wkshp_name,K.code as stockcode,k.name as stockname,
- E.saleOrderqty,E.qty,M.plan_qty,A.sqty as sqty,isnull(A.inhouseqty,0) as inhouseqty,A.sqty-isnull(A.inhouseqty,0) as stinhouseqty,M.lm_date,A.style
- from TK_Wrk_OutRecord A
- inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
- inner join TK_Wrk_Man M on S.wo_code=M.wo_code
- inner join TMateriel_Info P on M.materiel_code=P.partcode
- left join TKimp_Ewo E on M.m_po=E.wo and M.sourceid= E.id
- left join TSecStck K on P.idwarehouse=K.code
- left join TStep T on A.step_code=T.stepcode
- left join TOrganization O on M.wkshp_code=O.torg_code
- where A.style='S' and A.inbarcode<>'' and S.isend='Y' and A.sqty>0
+ select A.inbarcode,E.saleOrderid,isnull(E.saleOrderCode,'') as saleOrderCode,E.saleOrderDetailId,E.woid as mpoid,M.m_po,E.sbid,M.id as wo_id,A.wo_code,E.materiel_id,P.partcode,P.partname,P.partspec,E.unitid,E.unitcode,E.unitname,
+ A.step_code,T.stepname,M.wkshp_code,O.torg_name as wkshp_name,COALESCE(K.noid, E.stck_id) as stockid,COALESCE(K.code, E.stck_code) as stockcode,k.name as stockname,E.dept_id,E.dept_code,
+ E.saleOrderqty,E.qty,M.plan_qty,A.good_qty,isnull(A.inhouseqty,0) as inhouseqty,A.good_qty-isnull(A.inhouseqty,0) as stinhouseqty,M.lm_date,A.style,E.voucherdate
+ from TK_Wrk_Record A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
+ inner join TK_Wrk_Man M on S.wo_code=M.wo_code
+ inner join TMateriel_Info P on M.materiel_code=P.partcode
+ left join TKimp_Ewo E on M.m_po=E.wo and M.sourceid= E.id
+ left join TSecStck K on COALESCE(P.idwarehouse, E.stck_code)=K.code
+ left join TStep T on A.step_code=T.stepcode
+ left join TOrganization O on M.wkshp_code=O.torg_code
+ where A.style='B' and A.inbarcode<>'' and S.isend='Y' and A.good_qty>0
+ union all
+ select A.inbarcode,E.saleOrderid,isnull(E.saleOrderCode,'') as saleOrderCode,E.saleOrderDetailId,E.woid as mpoid,M.m_po,E.sbid,M.id as wo_id,A.wo_code,E.materiel_id,P.partcode,P.partname,P.partspec,E.unitid,E.unitcode,E.unitname,
+ A.step_code,T.stepname,M.wkshp_code,O.torg_name as wkshp_name,COALESCE(K.noid, E.stck_id) as stockid,COALESCE(K.code, E.stck_code) as stockcode,k.name as stockname,E.dept_id,E.dept_code,
+ E.saleOrderqty,E.qty,M.plan_qty,A.sqty as sqty,isnull(A.inhouseqty,0) as inhouseqty,A.sqty-isnull(A.inhouseqty,0) as stinhouseqty,M.lm_date,A.style,E.voucherdate
+ from TK_Wrk_OutRecord A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
+ inner join TK_Wrk_Man M on S.wo_code=M.wo_code
+ inner join TMateriel_Info P on M.materiel_code=P.partcode
+ left join TKimp_Ewo E on M.m_po=E.wo and M.sourceid= E.id
+ left join TSecStck K on COALESCE(P.idwarehouse, E.stck_code)=K.code
+ left join TStep T on A.step_code=T.stepcode
+ left join TOrganization O on M.wkshp_code=O.torg_code
+ where A.style='S' and A.inbarcode<>'' and S.isend='Y' and A.sqty>0
) as AA where AA.good_qty>AA.inhouseqty " + search;
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
@@ -4358,5 +4358,52 @@
return mes;
}
#endregion
+
+ #region[鐣呮嵎閫歍+鐢熶骇鍏ュ簱鎻愪氦-瀛樺偍杩囩▼鐗�(閫傜敤鍚屼竴鍙版湇鍔″櫒锛屽悓涓�涓暟鎹簱)]
+ public static ToMessage TProductInHouseOrderSpSeave(InReptModel data, User us)
+ {
+ var sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //瀛樺偍杩囩▼鍚�
+ sql = @"h_p_IFCLD_TCloudInProductOrder";
+ dynamicParams.Add("@RecordMin", dbType: DbType.Object, value: data.TableData[0]);
+ dynamicParams.Add("@RecordSub", dbType: DbType.Object, value: data.TableData[1]);
+ dynamicParams.Add("@rightcode", data.rightcode);
+ dynamicParams.Add("@incbit", data.incbit);
+ dynamicParams.Add("@username", us.usercode);
+ // 娣诲姞杈撳嚭鍙傛暟
+ dynamicParams.Add("@StatusCode", dbType: DbType.Int32, direction: ParameterDirection.Output);
+ dynamicParams.Add("@Message", dbType: DbType.String, size: 255, direction: ParameterDirection.Output);
+ bool a = DapperHelper.IsProcedure(sql, dynamicParams);
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var statusCode = dynamicParams.Get<int>("@StatusCode");
+ var message = dynamicParams.Get<string>("@Message");
+ if (a)
+ {
+ mes.code = statusCode.ToString();
+ mes.count = 0;
+ mes.message = message;
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = statusCode.ToString();
+ mes.count = 0;
+ mes.message = message;
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
--
Gitblit v1.9.3