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

海运出库 危险品 增加 是否海污字段

Browse Source
QDHHYT
dengyu 1 year ago
parent b12c621012
commit eafa83b430
10 changed files with 200 additions and 52 deletions
Show Stats Download Patch File Download Diff File

3
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs
Unescape Escape View File

@ -678,6 +678,7 @@ namespace DSWeb.MvcShipping.Controllers
if (enumValue.FIELDNAME == "DPAGE") head.DPAGE = oldhead.DPAGE;
if (enumValue.FIELDNAME == "DLABEL") head.DLABEL = oldhead.DLABEL;
if (enumValue.FIELDNAME == "LINKMAN") head.LINKMAN = oldhead.LINKMAN;
if (enumValue.FIELDNAME == "DHW") head.DHW = oldhead.DHW;
if (enumValue.FIELDNAME == "VESSELID") head.VESSELID = oldhead.VESSELID;
if (enumValue.FIELDNAME == "ISSUEPLACEID") head.ISSUEPLACEID = oldhead.ISSUEPLACEID;
if (enumValue.FIELDNAME == "HSCODE") head.HSCODE = oldhead.HSCODE;
@ -10772,7 +10773,7 @@ namespace DSWeb.MvcShipping.Controllers
if (ImportFieldData.ISDPAGE) billdata.DPAGE = headData.DPAGE;
if (ImportFieldData.ISDLABEL) billdata.DLABEL = headData.DLABEL;
if (ImportFieldData.ISLINKMAN) billdata.LINKMAN = headData.LINKMAN;
if (ImportFieldData.ISDHW) billdata.DHW = headData.DHW;
var modb = new ModelObjectDB();
DBResult result = modb.Save(billdata);

23
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -81,7 +81,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -218,7 +218,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -370,7 +370,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,B.INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,B.INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,B.REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,ORDEROP,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -474,7 +474,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -608,7 +608,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,A.SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,A.SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,A.ISVOU,A.VOUNO,A.REMARKS REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,A.CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -722,7 +722,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,LANE,A.SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,LANE,A.SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,A.ISVOU,A.VOUNO,A.REMARKS REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,A.CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -809,7 +809,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -882,7 +882,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -945,7 +945,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,B.INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,B.INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,B.REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -1016,7 +1016,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,B.INPUTBY,OP,CUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,B.INPUTBY,OP,CUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,B.REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");
@ -1313,6 +1313,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
data.DPAGE = Convert.ToString(reader["DPAGE"]);//危险品页号
data.DLABEL = Convert.ToString(reader["DLABEL"]);//危险品标签
data.LINKMAN = Convert.ToString(reader["LINKMAN"]);//危险品联系人
data.DHW = Convert.ToString(reader["DHW"]);//危险品 海污
data.VESSELID = Convert.ToString(reader["VESSELID"]);//船舶呼号
data.ISSUEPLACEID = Convert.ToString(reader["ISSUEPLACEID"]);//提单签发地代码
data.HSCODE = Convert.ToString(reader["HSCODE"]);//HS编码
@ -1501,7 +1502,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,COPYNOBILL,");
strSql.Append("NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,BLFRT,PREPARDAT,PREPARDATID,PAYABLEAT,[SERVICE],MARKS,CNTRSEALNO,NOPKGS,[DESCRIPTION],GOODSNAME,");
strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,CNTRNO,CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,");
strSql.Append("TEU,CNTRTOTAL,INPUTBY,OP,CUSTSERVICE,FRCUSTSERVICE,LANE,SALE,CARRIER,FORWARDER,CUSTOMSER,TRUCKER,INVNO,CARGOID,DCLASS,DUNNO,DPAGE,DLABEL,LINKMAN,DHW,");
strSql.Append("REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN,HUMIDITY,BSSOURCE,BSSOURCEDETAIL,CUSTOMSNUM,CONTRACTNO,INSURANCEER,INSURANCENO,INAMOUT,ISVOU,VOUNO,REMARK,STATUS1,");
strSql.Append("STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION,ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,DOC,ORDEROP,PACKINGTYPE,");
strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,");

15
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -22050,6 +22050,19 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
return filename;
}
/// <summary>
/// 港联捷下货纸
/// </summary>
/// <param name="headData"></param>
/// <param name="usercode"></param>
/// <param name="path"></param>
/// <param name="mblno"></param>
/// <param name="filetype"></param>
/// <param name="filerole"></param>
/// <param name="ftpset"></param>
/// <param name="type"></param>
/// <param name="isbill"></param>
/// <returns></returns>
public static string CreateEdiGLJYARD(List<MsOpSeae> headData, string usercode, string path, string mblno, string filetype, string filerole, CodeFtpSet ftpset, string type, int isbill)
{
string filename = path + "\\" + mblno + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".txt";
@ -22094,7 +22107,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
r.WriteLine("22:" + bill.GOODSNAME + ":" + bill.PKGS.ToString() + ":" + bill.KINDPKGS + ":" + bill.KGS.ToString() + ":" + bill.CBM + ":" + isdg + ":" + bill.DCLASS
+ ":" + bill.DUNNO + "::::" + bill.TEMPSET + ":" + bill.REEFERF + ":" + bill.HUMIDITY + "'");//bill.HSCODE
+ ":" + bill.DUNNO + ":::"+bill.DHW+":" + bill.TEMPSET + ":" + bill.REEFERF + ":" + bill.HUMIDITY + "'");//bill.HSCODE
icount++;

3
DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeae.cs
Unescape Escape View File

@ -1278,6 +1278,9 @@ namespace DSWeb.MvcShipping.Models.MsOpSeae
set { _dlabel = value; }
}
[ModelDB]
public string DHW { get; set; }
private string _linkman = "";
/// <summary>
/// 危险品联系人

1
DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeaeDetail.cs
Unescape Escape View File

@ -1004,6 +1004,7 @@ namespace DSWeb.MvcShipping.Models.MsOpSeae
public bool ISDPAGE { get; set; }
public bool ISDLABEL { get; set; }
public bool ISLINKMAN { get; set; }
public bool ISDHW { get; set; }
public bool ISMNOTIFYPARTY { get; set; }
#endregion

29
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeDuiView.js
Unescape Escape View File

@ -460,6 +460,11 @@ Ext.extend(Shipping.MsOpSeaeDuiView, Ext.Panel, {
flex: 1,
labelWidth: 90,
name: 'LINKMAN'
}, {
fieldLabel: '是否海污',
flex: 1,
labelWidth: 70,
name: 'DHW'
}]
}]
});
@ -594,6 +599,11 @@ Ext.extend(Shipping.MsOpSeaeDuiView, Ext.Panel, {
flex: 1,
labelWidth: 90,
name: 'LINKMAN'
}, {
fieldLabel: '是否海污',
flex: 1,
labelWidth: 70,
name: 'DHW'
}]
}]
});
@ -674,6 +684,7 @@ Ext.extend(Shipping.MsOpSeaeDuiView, Ext.Panel, {
me.formEdit.getForm().findField('DPAGE').setValue(me.formCargoShow.getForm().findField('DPAGE').getValue())
me.formEdit.getForm().findField('DLABEL').setValue(me.formCargoShow.getForm().findField('DLABEL').getValue())
me.formEdit.getForm().findField('LINKMAN').setValue(me.formCargoShow.getForm().findField('LINKMAN').getValue())
me.formEdit.getForm().findField('DHW').setValue(me.formCargoShow.getForm().findField('DHW').getValue())
me.formEdit.getForm().findField('REEFERF').setValue(me.formCargoShow.getForm().findField('REEFERF').getValue())
me.formEdit.getForm().findField('TEMPSET').setValue(me.formCargoShow.getForm().findField('TEMPSET').getValue())
me.formEdit.getForm().findField('TEMPID').setValue(me.formCargoShow.getForm().findField('TEMPID').getValue())
@ -1704,6 +1715,17 @@ Ext.extend(Shipping.MsOpSeaeDuiView, Ext.Panel, {
inputValue: true,
xtype: 'checkboxfield',
name: 'ISLINKMAN'
}, {
fieldLabel: '是否海污',
labelWidth: 80,
name: 'DHW'
}, {
fieldLabel: "", //'是否多品名',
labelWidth: 0,
flex: 0.1,
inputValue: true,
xtype: 'checkboxfield',
name: 'ISDHW'
}]
}, {
xtype: 'container',
@ -2045,12 +2067,17 @@ Ext.extend(Shipping.MsOpSeaeDuiView, Ext.Panel, {
if (headfield != NaN && headfield != null) headfield.setFieldStyle({ background: '#FFB6C1' });
this.formEditExcel.getForm().findField('ISDLABEL').setValue(true);
}
if (BILLDATA.LINKMAN != EXCELDATA.LINKMAN && EXCELDATA.LINKMAN != '') {
var headfield = this.formEditExcel.getForm().findField('LINKMAN');
if (headfield != NaN && headfield != null) headfield.setFieldStyle({ background: '#FFB6C1' });
this.formEditExcel.getForm().findField('ISLINKMAN').setValue(true);
}
if (BILLDATA.DHW != EXCELDATA.DHW && EXCELDATA.DHW != '') {
var headfield = this.formEditExcel.getForm().findField('DHW');
if (headfield != NaN && headfield != null) headfield.setFieldStyle({ background: '#FFB6C1' });
this.formEditExcel.getForm().findField('ISDHW').setValue(true);
}
this.formEditExcel.getForm().findField('ISCTN').setValue(true);
this.formEditExcel.getForm().findField('ISMNOTIFYPARTY').setValue(true);
this.storeCtnList.loadData(CTNDATA)

172
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
Unescape Escape View File

@ -1725,6 +1725,32 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
});
this.StoreDHW = Ext.create('Ext.data.Store', {
fields: ['ID', 'NAME']
});
this.StoreDHW.add({ "ID": "1", "NAME": "是" });
this.StoreDHW.add({ "ID": "0", "NAME": "否" });
this.StoreDHW.add({ "ID": "", "NAME": ""});
this.comboxDHW = Ext.create('DsExt.ux.RefTableCombox', {
store: this.StoreDHW,
fieldLabel: Zi.LAN.DHW,
forceSelection: true,
name: 'DHW',
valueField: 'ID',
displayField: 'NAME'
});
this.comboxDHW2 = Ext.create('DsExt.ux.RefTableCombox', {
store: this.StoreDHW,
fieldLabel: Zi.LAN.DHW,
forceSelection: true,
name: 'DHW',
valueField: 'ID',
displayField: 'NAME'
});
//明细表表格
this.gridListCellEditing = Ext.create('Ext.grid.plugin.CellEditing', {
clicksToEdit: 1
@ -2176,11 +2202,17 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
},
scope: this
}, '-', {
text: Zi.LAN.updatectntruck, //'展开集装箱',
text: Zi.LAN.updatectntruck, //'同步车队',
handler: function (button, event) {
this.onUpDetailTruckClick(button, event);
},
scope: this
}, '-', {
text: Zi.LAN.setPackage, //'批量设置包装',
handler: function (button, event) {
this.onsetPackageClick( 1);
},
scope: this
}],
columns: this.ctncolumns
@ -2238,7 +2270,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
flex: 1,
labelWidth: 90,
name: 'LINKMAN'
}]
}, this.comboxDHW]
}]
});
@ -3158,43 +3190,64 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
layout: "border",
region: 'center',
hidden: true,
height: 60,
width: 1200,
height: 168,
width: 720,
// frame: true,
items: [{
items: [
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
layout: 'anchor',
defaults: {
anchor: '96%'
anchor: '100%'
},
items: [{
fieldLabel: Zi.LAN.DCLASS, //'危险品等级',
flex: 1,
labelWidth: 70,
name: 'DCLASS'
}, {
fieldLabel: Zi.LAN.DUNNO, //'危险品编号',
flex: 1,
labelWidth: 70,
name: 'DUNNO'
}, {
fieldLabel: Zi.LAN.DPAGE, //'危险品页号',
flex: 1,
labelWidth: 70,
name: 'DPAGE'
}, {
fieldLabel: Zi.LAN.DLABEL, //'危险品标签',
flex: 1,
labelWidth: 70,
name: 'DLABEL'
}, {
fieldLabel: Zi.LAN.LINKMAN, //'危险品联系人',
flex: 1,
labelWidth: 90,
name: 'LINKMAN'
}]
}]
items: [
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
defaults: {
anchor: '96%'
},
items: [{
fieldLabel: Zi.LAN.DCLASS, //'危险品等级',
flex: 1,
labelWidth: 70,
name: 'DCLASS'
}, {
fieldLabel: Zi.LAN.DUNNO, //'危险品编号',
flex: 1,
labelWidth: 70,
name: 'DUNNO'
}, {
fieldLabel: Zi.LAN.DPAGE, //'危险品页号',
flex: 1,
labelWidth: 70,
name: 'DPAGE'
}]
},
{
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
defaults: {
anchor: '96%'
},
items: [{
fieldLabel: Zi.LAN.DLABEL, //'危险品标签',
flex: 1,
labelWidth: 70,
name: 'DLABEL'
}, {
fieldLabel: Zi.LAN.LINKMAN, //'危险品联系人',
flex: 1,
labelWidth: 82,
name: 'LINKMAN'
}, this.comboxDHW2]
}
]
}
]
});
@ -3318,6 +3371,7 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
me.formEdit.getForm().findField('DPAGE').setValue(me.formCargoShow.getForm().findField('DPAGE').getValue())
me.formEdit.getForm().findField('DLABEL').setValue(me.formCargoShow.getForm().findField('DLABEL').getValue())
me.formEdit.getForm().findField('LINKMAN').setValue(me.formCargoShow.getForm().findField('LINKMAN').getValue())
me.formEdit.getForm().findField('DHW').setValue(me.formCargoShow.getForm().findField('DHW').getValue())
me.formEdit.getForm().findField('REEFERF').setValue(me.formCargoShow.getForm().findField('REEFERF').getValue())
me.formEdit.getForm().findField('TEMPSET').setValue(me.formCargoShow.getForm().findField('TEMPSET').getValue())
me.formEdit.getForm().findField('TEMPID').setValue(me.formCargoShow.getForm().findField('TEMPID').getValue())
@ -3375,12 +3429,12 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
if (combo.value == 'R') {
this.panelBodyDr2.setVisible(false);
this.panelBodyRf2.setVisible(true);
this.winCargoShow.setWidth(700);
this.winCargoShow.setWidth(740);
this.winCargoShow.show();
} else if (combo.value == 'D') {
this.panelBodyDr2.setVisible(true);
this.panelBodyRf2.setVisible(false);
this.winCargoShow.setWidth(1200);
this.winCargoShow.setWidth(740);
// this.winCargoShow.width = 1200;
this.winCargoShow.show();
} else {
@ -11905,11 +11959,17 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
}],
scope: this
}, '-', {
text: Zi.LAN.updatectntruck, //'展开集装箱',
text: Zi.LAN.updatectntruck, //'同步车队',
handler: function (button, event) {
this.onUpDetailTruckClick(button, event);
},
scope: this
}, '-', {
text: Zi.LAN.setPackage, //'批量设置包装',
handler: function (button, event) {
this.onsetPackageClick(2);
},
scope: this
}, {
text: Zi.LAN.btnprintctn, //'预览打印',
tooltip: Zi.LAN.btnprintctn, //'预览打印',
@ -14649,6 +14709,44 @@ DFF42726-A0BA-4264-BFDF-2500A35E89C7 isVehiclesDispatcher 是否派车调度人
};
},
onsetPackageClick: function (type) {
//获取选中的集装箱行 取得包装字段值 将
//var TRUCKER = this.formEdit.getForm().findField('TRUCKER').getValue();
//for (i = 0; i < this.storeBodyList.getCount(); i += 1) {
// var memberyf = this.storeBodyList.getAt(i);
// memberyf.set("TRUCKER", TRUCKER);
// // memberyf.commit();
//};
var BSSTATUS = this.formHead.getForm().findField('BSSTATUSREF').getValue();
if (BSSTATUS == '锁定') {
Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.YeWuYiSuoDingBuYunXuShanChu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'业务已锁定，不允许操作!'
return;
}
if (type == 1)
var selectedRecords = this.gridList.selModel.getSelection();
else
var selectedRecords = this.gridListshow.selModel.getSelection();
if (selectedRecords.length == 0) {
Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'请先选择要操作的业务!!'
return;
} else {
var rec = selectedRecords[0].data;
for (i = 0; i < this.storeBodyList.getCount(); i += 1) {
var memberyf = this.storeBodyList.getAt(i);
memberyf.set("KINDPKGS", rec.KINDPKGS);
// memberyf.commit();
};
}
},
onaddyarddataClick: function () {

1
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js
Unescape Escape View File

@ -177,6 +177,7 @@
{ name: 'DPAGE', type: 'string' },
{ name: 'DLABEL', type: 'string' },
{ name: 'LINKMAN', type: 'string' },
{ name: 'DHW', type: 'string' },
{ name: 'VESSELID', type: 'string' },
{ name: 'HSCODE', type: 'string' },
{ name: 'TRANSTATUS', type: 'string' },

2
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js
Unescape Escape View File

@ -269,6 +269,7 @@ Zi.LAN.KINDPKGS = "PACKAGE"; //"件数包装";
Zi.LAN.KINGTAREWEIGHT = "第一层包装皮重";
Zi.LAN.LANE = "LINE"; //"航线";
Zi.LAN.LINKMAN = "危险品联系人";
Zi.LAN.DHW = "是否海污";
Zi.LAN.LoadExcel = "请选择EXCEL文件";
Zi.LAN.LoadExcel2 = "选择文件";
Zi.LAN.MAERSKEDI = "马士基EDI";
@ -605,6 +606,7 @@ Zi.LAN.PORTSTATUS = '码头';
Zi.LAN.EXPSTATUS = '出运';
Zi.LAN.HGYDSTATUS = '运抵';
Zi.LAN.updatectntruck = '同步车队';
Zi.LAN.setPackage = '批量设置包装';
Zi.LAN.ISGAIQIAN = '是否改签';
Zi.LAN.TRUCKSTATUS = '派车';
Zi.LAN.ImportMSCBill = 'MSC EXCEL导入';

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js
Unescape Escape View File

@ -202,6 +202,7 @@ Zi.LAN.KINDPKGS = "件数包装";
Zi.LAN.KINGTAREWEIGHT = "第一层包装皮重";
Zi.LAN.LANE = "航线";
Zi.LAN.LINKMAN = "危险品联系人";
Zi.LAN.DHW = "是否海污";
Zi.LAN.LoadExcel = "请选择EXCEL文件";
Zi.LAN.MAERSKEDI = "马士基 EDI";
Zi.LAN.MANIFESTSTATUS = "舱单状态";
@ -621,7 +622,7 @@ Zi.LAN.PORTSTATUS = '码头';
Zi.LAN.EXPSTATUS = '出运';
Zi.LAN.HGYDSTATUS = '运抵';
Zi.LAN.updatectntruck = '同步车队';
Zi.LAN.setPackage = '批量设置包装';
Zi.LAN.CheckRuleNames = '规则名称';

Write Preview
Loading…
Cancel
Save