dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

诚锐钉钉审批，入库流程取消车辆信息列表，在入库信息加车队和车牌号

Browse Source
DS7_JinGang
ddlucky 2 years ago
parent 67a7f137c8
commit ff878d2261
3 changed files with 85 additions and 47 deletions
Show Stats Download Patch File Download Diff File

9
DSWeb/Areas/CommMng/Controllers/WorkFlowController.cs
Unescape Escape View File

@ -326,6 +326,7 @@ namespace DSWeb.Areas.CommMng.Controllers
public string Test_DingdingCallback(string text)
{
var result = "";
try {
var _r = new DBResult();
var appname = MsSysParamSetDAL.GetSysParamValue("DingTalkAppName");
@ -371,8 +372,14 @@ namespace DSWeb.Areas.CommMng.Controllers
var data = Newtonsoft.Json.JsonConvert.SerializeObject(_r);
return data;
}
catch(Exception ex)
{
return data;
return ex.Message;
}
}
public class CallBackInfo

54
DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs
Unescape Escape View File

@ -23,6 +23,7 @@ using DSWeb.MvcShipping.DAL.WMSStock;
using System.Configuration;
using DSWeb.Areas.MvcShipping.Helper;
using NPOI.HSSF.Record;
using Quartz.Util;
namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
{
@ -1898,6 +1899,8 @@ namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
Database db = DatabaseFactory.CreateDatabase();
gids = "'" + gids.Trim().Replace(",", "','") + "'";
//20230128 改为
if (ConfigurationManager.AppSettings["DingTalkAuditWMSIN"] == "true")
{//向钉钉发送出库审批流程
@ -1914,41 +1917,52 @@ namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
strSql.Append(" ,ol.PROPVALUE");
strSql.Append(" from wms_out o inner join wms_out_detail d on o.bsno = d.outbsno ");
strSql.Append(" left join OP_LOGICINFO ol on ol.BSNO=o.bsno ");
strSql.Append(" where o.gid in ('" + gids + "') and o.ISLOCK=0");
strSql.Append(" where o.gid in (" + gids + ") and o.ISLOCK=0");
//var 需要发送给钉钉出库审核流程的业务编号List = new List<string>();
var outbsnodic = new Dictionary<string, string>();
using (IDataReader reader = db.ExecuteReader(CommandType.Text, strSql.ToString()))
{
while (reader.Read())
{
var outbsno = Convert.ToString(reader["OUTNO"]);
var instanceId = Convert.ToString(reader["PROPVALUE"]);
if (!string.IsNullOrWhiteSpace(instanceId)) continue;
var _r = DingTalkHelper.Send_WMSOUT(strUserID, outbsno);
if (!_r.Success)
if(!outbsnodic.ContainsKey(outbsno))
{
_r0.SetErrorInfo(_r.Message);
var instanceId = Convert.ToString(reader["PROPVALUE"]);
outbsnodic.Add(outbsno, instanceId);
}
}
}
//仅用于测试解析读取钉钉审批实例内容
//result = TestReadDingtalkInstanceinfo();
if (!_r0.Success)
{
result.Success = false;
result.Message = "发送钉钉审批失败:" + _r0.Message;
return result;
}
else
{
//增加一条钉钉审批记录
}
foreach(var item in outbsnodic)
{
//if (!string.IsNullOrWhiteSpace(item.Value)) continue;
var _r = DingTalkHelper.Send_WMSOUT(strUserID, item.Key);
if (!_r.Success)
{
_r0.SetErrorInfo(_r.Message);
}
//仅用于测试解析读取钉钉审批实例内容
//result = TestReadDingtalkInstanceinfo();
if (!_r0.Success)
{
result.Success = false;
result.Message = "发送钉钉审批失败:" + _r0.Message;
return result;
}
else
{
//增加一条钉钉审批记录
}
}
result.SetErrorInfo("钉钉提交成功");
return result;
}
else {
@ -1992,7 +2006,7 @@ namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
strSql.Append(" o.TRUCKNAME as TRUCKNAME_OUT,isnull(d.GOODSOUTFEEAP,0) AS GOODSOUTFEEAP_OUT,");
strSql.Append(" isnull(d.ARFEE,0) AS ARFEE_OUT,isnull(d.ARFEE_2,0) AS ARFEE_2_OUT,d.GID OUTDEGID");
strSql.Append(" from wms_out o inner join wms_out_detail d on o.bsno = d.outbsno ");
strSql.Append(" where o.gid in ('" + gids + "') and o.ISLOCK=0");
strSql.Append(" where o.gid in (" + gids + ") and o.ISLOCK=0");
using (IDataReader reader = db.ExecuteReader(CommandType.Text, strSql.ToString()))
{

69
DSWeb/Areas/MvcShipping/Helper/DingTalkHelper.cs
Unescape Escape View File

@ -509,6 +509,7 @@ namespace DSWeb.Areas.MvcShipping.Helper
foreach (var item in wmsinList)
{
var 车队 = 车队list.First(x => x.GID == item.CHEDUIID).SHORTNAME;
var newrk = new List<DingTalkFormField>
{
new DingTalkFormField("提单号", item.BLNO),
@ -517,7 +518,9 @@ namespace DSWeb.Areas.MvcShipping.Helper
new DingTalkFormField("重量", item.GOODSRKSL.ToString()),
new DingTalkFormField("件数", item.GOODSPACK.ToString()),
new DingTalkFormField("尺码", item.CHIMA1.ToString()),
new DingTalkFormField("库位", item.AREANAME.ToString())
new DingTalkFormField("库位", item.AREANAME.ToString()),
new DingTalkFormField("车队", 车队),
new DingTalkFormField("车牌号", item.TRUCKNO.ToString())
};
入库信息list.Add(newrk);
@ -545,7 +548,9 @@ namespace DSWeb.Areas.MvcShipping.Helper
var 入库信息 = new DingTalkFormField("入库信息", JsonConvert.SerializeObject(入库信息list));
var 车队信息 = new DingTalkFormField("车队信息", JsonConvert.SerializeObject(车队信息list));
//20230130 取消入库审核的车队信息
//var 车队信息 = new DingTalkFormField("车队信息", JsonConvert.SerializeObject(车队信息list));
body.formComponentValues = new List<DingTalkFormField>
{
@ -553,8 +558,7 @@ namespace DSWeb.Areas.MvcShipping.Helper
//增加字段内容
new DingTalkFormField("客户名称", wms.CUSTOMERNAME),
new DingTalkFormField("入库日期", ((DateTime)wms.WMSDATE).ToString("yyyy-MM-dd")),
入库信息,
车队信息
入库信息
};
jsonObj = body;
@ -1590,6 +1594,16 @@ namespace DSWeb.Areas.MvcShipping.Helper
updrec.AREANAME = DingWmsin.getValue("库位");
updrec.DODATE = wms.WMSDATE;
//if(string.IsNullOrWhiteSpace(DingWmsin.getValue("车牌号")))
updrec.TRUCKNO = DingWmsin.getValue("车牌号");
var 车队name= DingWmsin.getValue("车队");
var 车队infoclient = cdc.info_client.FirstOrDefault(x => x.SHORTNAME == 车队name);
if(车队infoclient!=null && string.IsNullOrWhiteSpace( 车队infoclient.SHORTNAME))
updrec.CHEDUIID = 车队infoclient.SHORTNAME;
updwmsinlist.Add(updrec);
}
else
@ -1631,27 +1645,36 @@ namespace DSWeb.Areas.MvcShipping.Helper
newrec.CREATETIME = DateTime.Now;
newrec.CHARGEUNIT = wms.CHARGEUNIT;
newrec.CORPID = wms.CORPID;
newrec.TRUCKNO = DingWmsin.getValue("车牌号");
var 车队name = DingWmsin.getValue("车队");
var 车队infoclient = cdc.info_client.FirstOrDefault(x => x.SHORTNAME == 车队name);
if (车队infoclient != null && string.IsNullOrWhiteSpace(车队infoclient.SHORTNAME))
newrec.CHEDUIID = 车队infoclient.SHORTNAME;
newwmsinlist.Add(newrec);
}
}
}
}
if (item.name == "车队信息")
{
var 车队信息list = FormComponentValues.GetRowValues(item.value);
if (车队信息list != null && 车队信息list.Count > 0)
{
var 车队name = 车队信息list[0].getValue("车队");
var 车队 = cdc.info_client.FirstOrDefault(x => x.SHORTNAME == 车队name);
if (车队 != null && 车队.SHORTNAME != null && 车队.SHORTNAME != "")
{
车辆信息.CHEDUIID = 车队.GID;
车辆信息.TRUCKNO = 车队信息list[0].getValue("车牌号");
}
}
//if (item.name == "车队信息")
//{
// var 车队信息list = FormComponentValues.GetRowValues(item.value);
// if (车队信息list != null && 车队信息list.Count > 0)
// {
// var 车队name = 车队信息list[0].getValue("车队");
// var 车队 = cdc.info_client.FirstOrDefault(x => x.SHORTNAME == 车队name);
// if (车队 != null && 车队.SHORTNAME != null && 车队.SHORTNAME != "")
// {
// 车辆信息.CHEDUIID = 车队.GID;
// 车辆信息.TRUCKNO = 车队信息list[0].getValue("车牌号");
// }
// }
}
//}
}
cdc.wms.AddOrUpdate(wms);
if (updwmsinlist != null && updwmsinlist.Count > 0)
@ -1814,18 +1837,12 @@ namespace DSWeb.Areas.MvcShipping.Helper
}
}
if (item.name == "车队信息")
if (item.name == "车辆信息")
{
var 车队信息list = FormComponentValues.GetRowValues(item.value);
if (车队信息list != null && 车队信息list.Count > 0)
{
var 车队name = 车队信息list[0].getValue("车队");
var 车队 = cdc.info_client.FirstOrDefault(x => x.SHORTNAME == 车队name);
if (车队 != null && 车队.SHORTNAME != null && 车队.SHORTNAME != "")
{
车辆信息.CHEDUIID = 车队.GID;
车辆信息.TRUCKNO = 车队信息list[0].getValue("车牌号");
}
车辆信息.TRUCKNO = 车队信息list[0].getValue("车牌号");
}
}

Write Preview
Loading…
Cancel
Save