DS7_HYRD
hanxuntao 1 year ago
commit d263b56915

@ -13,7 +13,9 @@
<add key="UPDATESUBCOMPANY" value="1"/>
<add key="FilePath" value="D:\HXT"/>
<add key="FileType" value="提单COPY"/>
<!--
<add key="ConnectionString" value="Data Source=.;Initial Catalog=dongshengdata_jf;User ID=sa;Password=ds20040201"/>
-->
<!-- rabbitmq地址 -->
<!--
<add key="MQURL" value="amqp://djy_output:123qwe@47.104.207.5:12567/djy.output" />
@ -26,16 +28,23 @@
<add key="ConnectionStringFile" value="Data Source=.;Initial Catalog=dongshengdata_jf;User ID=sa;Password=ds20040201" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
-->
<!--
<!-- invtoD7 69测试 -->
<add key="MQURL" value="amqp://inv_dev:inv123@60.209.125.238:40101" />
<add key="virtualhost" value="inv_customer" />
<add key="ConnectionString" value="Data Source=47.104.224.244;Initial Catalog=SHIPPINGWEB1;User ID=sa;Password=0820Ds2018" />
<add key="ConnectionStringFile" value="Data Source=47.104.224.244;Initial Catalog=SHIPPINGWEB1;User ID=sa;Password=0820Ds2018" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
<!--
<add key="DJYUSERID:9f3b3526-4dd4-4997-b974-1f2adb2793c7" value="Server=47.104.102.13,3433;Database=SHIPPINGWEB_ds;User ID=sa;Password=Ds2019*20040201;Connect Timeout=120000;" />
-->
<!--DJYtoD7_OPSTATUS 大简云向DS7发布业务状态-->
<add key="MQURL" value="amqp://status_resp:djystatusresp2022@60.209.125.238:33666/status_resp"/>
<!--DJYtoD7_OPSTATUS 大简云向DS7发布业务状态
<add key="MQURL" value="amqp://status_resp:djystatusresp2022@60.209.125.238:33666/status_resp"/>
<add key="DJYMQURL" value="amqp://booking_data_resp:djybookingresp2023@47.104.207.5:12567/booking_data_resp"/>
<add key="DGMQURL" value="amqp://djy_booking_new:123qwe@60.209.125.238:12567/djy_booking_new"/>
<add key="DJYCORPID:662145ea-ab74-44e0-9d31-d27369121c3c" value="Server=60.209.125.238,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;"/>
-->
<!--
<add key="DJYUSERID:9f3b3526-4dd4-4997-b974-1f2adb2793c7" value="Server=123.234.225.158,26600;Database=DSWMS_Dev;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" />
<add key="DJYUSERID:a4464cee-7c15-41c2-80b1-1003bcc34350" value="Server=123.234.225.158,26600;Database=DSWMS_Dev;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" />

@ -15,17 +15,20 @@ namespace D7MqClient
/// </summary>
static void Main()
{
ServiceBase[] ServicesToRun;
ServicesToRun = new ServiceBase[]
{
new DsService()
};
ServiceBase.Run(ServicesToRun);
//Application.EnableVisualStyles();
//Application.SetCompatibleTextRenderingDefault(false);
//Application.Run(new testForm1());
#region 正式入口
//ServiceBase[] ServicesToRun;
//ServicesToRun = new ServiceBase[]
//{
// new DsService()
//};
//ServiceBase.Run(ServicesToRun);
#endregion
#region 测试用入口
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new testForm1());
#endregion
}
}
}

@ -3392,6 +3392,7 @@ namespace DSWeb.Common.DB
public string TASKTITLE { get; set; }
public string TASKDESCRIP { get; set; }
public string CREATEUSER { get; set; } = "";
public string CREATER { get; set; } = "";
public string CORPID { get; set; }
public DateTime? CREATETIME { get; set; }
public DateTime? TASKBEGINDATE { get; set; }

@ -1952,6 +1952,8 @@ SELECT @ps_BillNo as N'billno'";
newhead. = updrec.;
newhead. = updrec.;//订舱代理
newhead. = updrec.;
//newhead.三
}
newhead. = string.IsNullOrWhiteSpace(head.mblno) ? updrec. : head.mblno;

@ -2065,6 +2065,7 @@ namespace DSWeb.Areas.Dispatch.Controllers
var cdc = new Common.DB.CommonDataContext();
var currTaskList = cdc.op_task.Where(x => x.BSNO == headData.gId).ToList();
var currtask = new op_task_md();
if (currTaskList != null && currTaskList.Count > 0)
@ -2085,6 +2086,14 @@ namespace DSWeb.Areas.Dispatch.Controllers
}
else {
//20231107 将油量拼在备注里面
if (!headData.Remark.Contains("油量"))
{
headData.Remark += " 油量:" + headData.FuelQty.ToString();
}
result = DoSave();
if (!result.Success) return result;
@ -2100,11 +2109,11 @@ namespace DSWeb.Areas.Dispatch.Controllers
if (driverList != null && driverList.Count > 0)
{
currtask.CREATEUSER = driverList[0].DrvName;
currtask.CREATER = driverList[0].DrvName;
}
else {
}
cdc.op_task.AddOrUpdate(currtask);
cdc.SaveChanges();

@ -44,6 +44,7 @@ using DSWeb.Common.DB;
using DSWeb.Common.Helper;
using DSWeb.Areas.SysMng.DAL.SysUser;
using DSWeb.Areas.Account.Models.BSNOLB;
using Quartz.Util;
namespace DSWeb.MvcShipping.Controllers
{
@ -3017,13 +3018,60 @@ namespace DSWeb.MvcShipping.Controllers
{
var condition = $" B.bsno='{headid}'";
var head = MsOpSeaiDAL.GetData(condition);
var json = "";
var result = new DBResult();
var dbresult = QY_addWarehouseNotice(head);
if (!BasicDataRefDAL.webconfig("HYRD"))
{
var json = JsonConvert.Serialize(
new { Success = dbresult.Success, Message = dbresult.Message, data = "" });
return new ContentResult() { Content = json };
var dbresult = QY_addWarehouseNotice(head);
json = JsonConvert.Serialize(
new { Success = dbresult.Success, Message = dbresult.Message, data = "" });
return new ContentResult() { Content = json };
}
else {
//鸿亚润达 将opseai.wmsstatus修改
//如无改为 发送至仓储
//如有“发送至仓储”则改为 无
//如有其他 则返回错误
if (string.IsNullOrWhiteSpace(head.WMSSTATUS))
{
head.WMSSTATUS = "发送至仓储";
head.DbOperationType = DbOperationType.DbotUpd;
head.ModelUIStatus = "E";
var modb = new ModelObjectDB();
result = modb.Save(head);
result.OK("已发送至仓储业务");
return BasicDataRefDAL.GetContentResult(result);
}
else {
if (head.WMSSTATUS == "发送至仓储")
{
head.WMSSTATUS = "";
head.DbOperationType = DbOperationType.DbotUpd;
head.ModelUIStatus = "E";
var modb = new ModelObjectDB();
result = modb.Save(head);
result.OK("已取消发送");
return BasicDataRefDAL.GetContentResult(result);
}
else {
var wmsstatus = head.WMSSTATUS;
result.SetErrorInfo($"该业务目前为[{wmsstatus}]状态,无法进行此操作");
}
}
return BasicDataRefDAL.GetContentResult(result);
}
}
public static DBResult QY_addWarehouseNotice(MsOpSeai headData)
{
var result = new DBResult();

@ -66,6 +66,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaiDAL
//strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '' end) as FEESTATUSREF ");
strSql.Append(" from VW_OP_SEAI LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=VW_OP_SEAI.BSNO) ");
strSql.Append(" left join (select bsno, sum(case when[status] = '换单' then 1 else 0 end) CHANGEDOCSTATUS, sum(case when [status] = '海关放行' then 1 else 0 end) CUSTOMSSTATUS");
@ -941,6 +942,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaiDAL
if (reader["CANGDANSTATUS"] != DBNull.Value)
data.CANGDANSTATUS = Convert.ToInt32(reader["CANGDANSTATUS"]);
data.MDESCRIPTION = Convert.ToString(reader["MDESCRIPTION"]);
data.WMSSTATUS = Convert.ToString(reader["WMSSTATUS"]);
#endregion
headList.Add(data);
}

@ -2723,6 +2723,12 @@ namespace DSWeb.MvcShipping.Models.MsOpSeai
/// </summary>
public decimal? OPWMS_IN_COUNT { get; set; }
/// <summary>
/// 20231109 记录是否发送给仓储业务 用于vue版仓储系统当中的查询
/// </summary>
[ModelDB]
public string WMSSTATUS { get; set; }
public MsOpSeai()
{
@ -2743,5 +2749,5 @@ namespace DSWeb.MvcShipping.Models.MsOpSeai
public List<MsOpApplyDetail> GOODSDETAIL { get; set; }
}
//
}
}

@ -1109,7 +1109,8 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
}, {
fieldLabel: Zi.LAN.MBLFRT, //'MBLFRT',
name: 'MBLFRT', hidden: true
}, this.comboxBSSTATUSREF, this.comboxFEESTATUSREF, {
}
, this.comboxBSSTATUSREF, this.comboxFEESTATUSREF, {
fieldLabel: Zi.LAN.ACCDATE, //'会计期间',
xtype: 'monthfield',
editable: false,
@ -1183,7 +1184,11 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
}, {
fieldLabel: Zi.LAN.APPLYNO, //'申请放箱号',
name: 'APPLYNO'
},{ xtype: 'hiddenfield' }]
}, {
fieldLabel: '发仓储状态', //'MBLFRT',
name: 'WMSSTATUS',
readOnly: true,
}]
}, {
xtype: 'container',
layout: 'hbox',
@ -5002,28 +5007,39 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
DsOpenMultiEditWin('/MvcContainer/MsOpCtnApply/CostEdit?opener=OPSEAI&APPLYNO=' + APPLYNO);
},
onSendQY: function () {
var headid = this.editRecord.get('BSNO');
Ext.Ajax.request({
waitMsg: Zi.LAN.ZhengZaiChaXunShuJu, //'正在查询主表数据...',
url: '/MvcShipping/MsOpSeai/QY_addWarehouseNotice',
params: {
headid: headid
},
callback: function (options, success, response) {
if (success) {
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
//显示成功
Ext.Msg.show({ title: '发送至仓储系统', msg: "发送成功", icon: Ext.Msg.OK, buttons: Ext.Msg.OK });
if (this.opStatus == 'add') {
MsgTip("提示", "需要先保存业务", 1000);
return;
} else {
_this = this;
var headid = this.editRecord.get('BSNO');
Ext.Ajax.request({
waitMsg: Zi.LAN.ZhengZaiChaXunShuJu, //'正在查询主表数据...',
url: '/MvcShipping/MsOpSeai/QY_addWarehouseNotice',
params: {
headid: headid
},
callback: function (options, success, response) {
if (success) {
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
//显示成功
Ext.Msg.show({ title: '发送至仓储系统', msg: "发送成功:" + jsonresult.Message, icon: Ext.Msg.OK, buttons: Ext.Msg.OK });
condition = "BSNO='" + headid + "'";
this.LoadData(this.opStatus, condition);
} else {
Ext.Msg.show({ title: '发送至仓储系统', msg: "发送失败:" + jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.ERROR });
}
} else {
Ext.Msg.show({ title: '发送至仓储系统', msg: "发送失败:" + jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.ERROR });
Ext.Msg.show({ title: '发送至仓储系统', msg: "发送失败", icon: Ext.Msg.ERROR, buttons: Ext.Msg.ERROR });
}
} else {
Ext.Msg.show({ title: '发送至仓储系统', msg: "发送失败", icon: Ext.Msg.ERROR, buttons: Ext.Msg.ERROR });
}
},
scope: this
});
},
scope: this
});
}
},
onaddYXClick: function () {

@ -1111,7 +1111,14 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, {
header: Zi.LAN.OPWMS_IN_COUNT,
width: 100
}
,
{
sortable: true,
id: '',
dataIndex: 'WMSSTATUS',
header: Zi.LAN.WMSSTATUS,
width: 100
}
];
this.Pagenum = Ext.create('Ext.form.field.Number', {

@ -257,7 +257,8 @@
{ name: 'CUSTOMSSTATUS', type: 'int' },
{ name: 'CANGDANSTATUS', type: 'int' },
{ name: 'DEST_RTCNT_TIME', type: 'string' },
{ name: 'OPWMS_IN_COUNT', type: 'string' }
{ name: 'OPWMS_IN_COUNT', type: 'string' },
{ name: 'WMSSTATUS', type: 'string' }
]
});

@ -423,10 +423,16 @@ Zi.LAN.QueshiYaoShanChu2 = "票业务吗?";
Zi.LAN.OPWMS_IN_COUNT = "入库数量";
Zi.LAN.DeleteSuccess = "删除成功";
Zi.LAN.DeleteErro = "删除错误";
<<<<<<< HEAD
Zi.LAN.INPUTBYREF = "提交人";
Zi.LAN.ISIMP = "已引入";
Zi.LAN.INPUTTIME = "提交时间";
Zi.LAN.SEAICUSTNO = "现委托编号";
=======
Zi.LAN.WMSSTATUS = "发仓储状态";
>>>>>>> 7dc7203277d3d5cdf3af19ccd8a50e40586ecb34
//#endregion
//Zi.LAN. = "";

@ -424,6 +424,7 @@ Zi.LAN.QueshiYaoShanChu2 = "票业务吗?";
Zi.LAN.OPWMS_IN_COUNT = "入库数量";
Zi.LAN.DeleteSuccess = "删除成功";
Zi.LAN.DeleteErro = "删除错误";
<<<<<<< HEAD
Zi.LAN.INPUTBYREF = "提交人";
Zi.LAN.ISIMP = "已引入";
Zi.LAN.INPUTTIME = "提交时间";
@ -433,6 +434,10 @@ Zi.LAN.ENTERISIMP = "确定引入";
Zi.LAN.FRETA = "从开船日期";
Zi.LAN.TOETA = "到开船日期";
Zi.LAN.YYRXT = "已引入系统,确认要覆盖以前业务吗?";
=======
Zi.LAN.WMSSTATUS = "发仓储状态";
>>>>>>> 7dc7203277d3d5cdf3af19ccd8a50e40586ecb34
//#endregion
//Zi.LAN. = "";

@ -3407,12 +3407,21 @@ string swcn = "2020030084935", string swpw = "8a5889ea8e53b257e2a3ba053979ee64"
reqObj.Add("etps_category", etps_category);//
var t_str = reqObj.ToString(Newtonsoft.Json.Formatting.None);
var useurl = "";
if (withdoc)
rtn = DSWeb.Areas.MvcShipping.Comm.WebRequestHelper.DoPost(_IURL_2, t_str, 180000);
{
useurl = _IURL_2;
//rtn = DSWeb.Areas.MvcShipping.Comm.WebRequestHelper.DoPost(_IURL_2, t_str, 180000);
}
if (!withdoc)
rtn = DSWeb.Areas.MvcShipping.Comm.WebRequestHelper.DoPost(_IURL_2_Nodoc, t_str, 180000);
{
useurl = _IURL_2_Nodoc;
//rtn = DSWeb.Areas.MvcShipping.Comm.WebRequestHelper.DoPost(_IURL_2_Nodoc, t_str, 180000);
}
rtn = DSWeb.Areas.MvcShipping.Comm.WebRequestHelper.DoPost(useurl, t_str, 180000);
BasicDataRefDAL.SaveLog("_IURL=" + _IURL + ";t_str=" + t_str + ";rtn=" + rtn, "单一窗口", "读取单一窗口", "二步申报");
BasicDataRefDAL.SaveLog("_IURL=" + useurl + ";t_str=" + t_str + ";rtn=" + rtn, "单一窗口", "读取单一窗口", "二步申报");
return rtn;
@ -3537,9 +3546,18 @@ string swcn = "2020030084935", string swpw = "8a5889ea8e53b257e2a3ba053979ee64"
var PortReturn = new DecHead_WebModel();
if (_status == "1")
{
//rtn = getPortStr(CUSTOMNO, MBLNO, ies, "0");
//rtn = formatresult(rtn);
PortReturn = Newtonsoft.Json.JsonConvert.DeserializeObject<DecHead_WebModel>(rtn);
if (PortReturn.message[0].ok == false)
{
return Json(new { status = false, message = PortReturn.message[0].data.message });
}
}
else {
var _r = Newtonsoft.Json.JsonConvert.DeserializeObject<DecHead_statusmessage>(rtn);

@ -2360,6 +2360,8 @@ namespace DSWeb.SoftMng.Model{
/// 用来
/// </summary>
public string ies { get; set; }
}
public class DecHead_status
@ -2384,7 +2386,7 @@ namespace DSWeb.SoftMng.Model{
/// </summary>
public class MessageModel
{
public string ok { get; set; }
public bool ok { get; set; } = true;
public string errorCode { get; set; }
public string mygType { get; set; }
public DecHead_data data { get; set; }
@ -2403,6 +2405,7 @@ namespace DSWeb.SoftMng.Model{
public class DecHead_data
{
//public string preDecHeadVo { get; set; }
public string message { get; set; }
public preDecHeadVo getdata() {
if (preDecHeadVo != null) return preDecHeadVo;
@ -2613,17 +2616,28 @@ namespace DSWeb.SoftMng.Model{
//危险品信息
if (string.IsNullOrWhiteSpace(noDangFlag))
{
DecList.NoDangFlag = 0;
}else
if (Convert.ToInt32(noDangFlag)==0)
{
DecList.NoDangFlag = 0;
}
else
{
DecList.NoDangFlag = Convert.ToInt32(noDangFlag);
DecList.Uncode = unCode;
DecList.DangName = dangName;
DecList.DangPackType = Convert.ToInt32(packType);
DecList.DangPackSpec = packSpec;
DecList.DangPackSpec_Text = packSpec;
try
{
DecList.NoDangFlag = Convert.ToInt32(noDangFlag);
DecList.Uncode = unCode;
DecList.DangName = dangName;
DecList.DangPackType = Convert.ToInt32(packType);
DecList.DangPackSpec = packSpec;
DecList.DangPackSpec_Text = packSpec;
}
catch (Exception e) {
}
}
DecList.cusSupvDmd = cusSupvDmd;

Loading…
Cancel
Save