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

20230222-1

Browse Source
临时发布20240103
ddlucky 2 years ago
parent e02ee889c8
commit 37ddb9ae3d
25 changed files with 824 additions and 705 deletions
Show Stats Download Patch File Download Diff File

3
DSWeb/Areas/Account/DAL/Chfee_invoiceapplication/Chfee_InvoiceapplicationDAL.cs
Unescape Escape View File

@ -1659,6 +1659,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
if (string.IsNullOrWhiteSpace(head.PAYCOMPANYID))
{
head.PAYCOMPANYID = SaleCorpList[0];
cdc.ch_fee_invoiceapplication.AddOrUpdate(head);
cdc.SaveChanges();
}

9
DSWeb/Areas/Account/DAL/Chfee_recvapplication/Chfee_RecvapplicationDAL.cs
Unescape Escape View File

@ -956,6 +956,15 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Recvapplication
if (string.IsNullOrWhiteSpace(head.SALECORPID))
{
head.SALECORPID = SaleCorpList[0];
//20230222 增加逻辑 同时设定发票申请的银行信息
var curr = head.CURR;
if (string.IsNullOrWhiteSpace(curr)) curr = "RMB";
var companybanklist = cdc.sys_bank.Where(x => x.LINKID == head.SALECORPID && x.ISSTOP != true && x.CURRENCY == curr).ToList();
if (companybanklist != null && companybanklist.Count > 0) {
head.ACCOUNT = companybanklist[0].GID;
}
cdc.ch_fee_recvapplication.AddOrUpdate(head);
cdc.SaveChanges();
}

16
DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
Unescape Escape View File

@ -6769,6 +6769,22 @@ namespace DSWeb.Areas.CommMng.DAL
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
/// <summary>
/// 海运现结买单的结算日期
/// </summary>
/// <param name="ETD"></param>
/// <returns></returns>
public static string 现结买单结算日期(string ETD)
{
var result = Convert.ToDateTime(ETD).AddDays(14).ToString("yyyy-MM-dd");
return result;
}
public static string 现结买单结算日期_空运(string ETD)
{
var result = Convert.ToDateTime(ETD).AddDays(14).ToString("yyyy-MM-dd");
return result;
}
}

2
DSWeb/Areas/Mobile/Controllers/BookSpaceController.cs
Unescape Escape View File

@ -125,7 +125,7 @@ namespace DSWeb.Areas.Mobile.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD);
}
}

2
DSWeb/Areas/MvcShipping/Controllers/MsAireOrderController.cs
Unescape Escape View File

@ -238,7 +238,7 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期_空运(headData.ETD); ;
}
}

2
DSWeb/Areas/MvcShipping/Controllers/MsOpAireController.cs
Unescape Escape View File

@ -585,7 +585,7 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期_空运(headData.ETD); ;
}
if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE;
}

2
DSWeb/Areas/MvcShipping/Controllers/MsOpAiriController.cs
Unescape Escape View File

@ -498,7 +498,7 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期_空运(headData.ETD); ;
}
if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE;
}

2
DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs
Unescape Escape View File

@ -290,7 +290,7 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ISSUEDATE;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期_空运(headData.ETD); ;
}
}

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

@ -26,6 +26,7 @@ using DSWeb.Areas.SysMng.DAL.SysUser;
using DSWeb.MvcShipping.DAL.MsCodeOpTemplate;
using DSWeb.MvcShipping.DAL.ChMonthCloseDAL;
using DSWeb.MvcShipping.DAL.MsChFeeDAL;
using DSWeb.Areas.CommMng.DAL;
namespace DSWeb.MvcShipping.Controllers
{
@ -426,7 +427,7 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD); ;
}
if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE;
}

2
DSWeb/Areas/MvcShipping/Controllers/MsOpRailwayController.cs
Unescape Escape View File

@ -257,7 +257,7 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.STLDATE;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.STLDATE);
}
if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE;
}

2
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs
Unescape Escape View File

@ -970,7 +970,7 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD);
}
if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE;
}

16
DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs
Unescape Escape View File

@ -2314,15 +2314,7 @@ namespace DSWeb.MvcShipping.Controllers
{
if (_p.BLSTATUS == "提单签出" || _p.BLSTATUS == "扣单")
{
/*
result.Success = false;
result.Message = "只有录入状态的提单才能申请签入";
var jsonRespose = new JsonResponse
{
Success = result.Success,
Message = result.Message,
Data = null
};*/
}
else
{
@ -2400,12 +2392,12 @@ namespace DSWeb.MvcShipping.Controllers
var bsnoStr = "'" + string.Join("','", _L.Select(s => s.BSNO)) + "'";
var _b_head = MsOp_BLISSUEDAL.CanCheckOut(bsnoStr);
if (_b_head.Success && (bool)_b_head.Data == false)
if (!_b_head.Success )
{
jsonRespose = new JsonResponse
{
Success = result.Success,
Message = result.Message,
Success = _b_head.Success,
Message = _b_head.Message,
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}

2
DSWeb/Areas/MvcShipping/Controllers/MsSeaeOrderController.cs
Unescape Escape View File

@ -319,7 +319,7 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD);
}
}

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

@ -2144,6 +2144,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
}
}
//if (headData.ORDERNO != "" && headData.ORDERNO != null)
//{
// var ct = MsOpSeaeDAL.GetRdCount("BSNO<>'" + headData.BSNO + "' AND ORDERNO='" + headData.ORDERNO + "' and CORPID='" + Convert.ToString(Session["COMPANYID"]) + "'");
@ -2165,7 +2168,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD);
}
if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE;
}
@ -2247,7 +2250,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
}
}
if (!string.IsNullOrWhiteSpace(headData.TRADETERM))
{
errorstr += $"贸易条款必须正确填写;";
}
headData.BSSOURCE = headData.BSSOURCE.Trim();

29
DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs
Unescape Escape View File

@ -987,7 +987,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
else if (visiblerange == "1")
{
//str = " (ob.SALECORPID='" + companyid + "' or (select companyid from vw_user where showname=ob.OPNAME)='" + companyid + "' or (select companyid from vw_user where showname=ob.AUDITOR)='" + companyid + "' ) ";
str = " (ob.SALECORPID='" + companyid + "' or exists(select 1 from vw_user where companyid='" + companyid + "' and showname in(ob.OPNAME,ob.AUDITOR,ob.SALE)) ";
str = " (ob.SALECORPID='" + companyid + "' or exists(select 1 from vw_user where companyid='" + companyid + "' and showname in(ob.OPNAME,ob.AUDITOR,ob.SALE))) ";
}
VSSQL = VSSQL.Trim();
if (!string.IsNullOrEmpty(VSSQL))
@ -1623,6 +1623,23 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
//var WorkFlowName = "MsOp_BLISSUE_IN";
Database db = DatabaseFactory.CreateDatabase();
var result = new DBResult();
//20230221 增加判断 如果ussuetype=swb的，不进行扣单操作
foreach (var _bill in _List)
{
if (_bill.ISSUETYPE == "SWB" && _bill.BLISSUESTATUS!="扣单") {
result.Success = false;
result.Message = $"签单方式SWB的业务[{_bill.CUSTNO}]不能扣单";
}
if (string.IsNullOrWhiteSpace(_bill.ISSUETYPE))
{
result.Success = false;
result.Message = $"签单方式未指定的业务[{_bill.CUSTNO}]不能扣单";
}
}
using (var conn = db.CreateConnection())
{
conn.Open();
@ -1633,6 +1650,8 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
foreach (var _bill in _List)
{
var cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS='扣单' where GID=@GID and BLSTATUS ='签出' ");
if (_bill.BLSTATUS == "扣单")
{
@ -3527,18 +3546,20 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
var result = new DBResult();
result.OK();
//判断标准 该客户的全部其他业务 是否存在 BLISSUESTATUS<>'提单签出' 的
//判断标准 该客户的全部其他业务 是否存在 BLISSUESTATUS<>'提单签出' 且其下属明细中没有箱号长度11位的箱号 的
var recordcount = 0;
var bsnostr ="'"+ string.Join("','", headList.Select(s => s.BSNO))+ "'";
var 其他未签出业务List = GetDataList($" b.CUSTOMERNAME='{headList[0].CUSTOMERNAME}' and b.BLISSUESTATUS<>'提单签出' and b.BSNO not in({bsnostr})", 0, 9, out recordcount);
var 其他未签出业务List = GetDataList($" b.CUSTOMERNAME='{headList[0].CUSTOMERNAME}' and b.BLISSUESTATUS<>'提单签出' and exists(select 1 from op_ctn where BSNO=b.BSNO and len(CNTRNO)=11) and b.BSNO not in({bsnostr})", 0, 9, out recordcount);
if (recordcount > 0)
{
result.OK("", false);
}
else {
else
{
result.OK("", true);
}
return result;
}

50
DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs
Unescape Escape View File

@ -88,7 +88,22 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
}
strSql.Append(@") as num , * from(select ");
GetDataListBuilder(ref strSql);
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where " + strCondition);
}
//
strSql.Append(@")as t2 )as t ");
strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit)); //
var isNoForward = MsBaseInfoDAL.MsBaseInfoDAL.GetUserModuleEnable("modMsNoForward", userid);
return SetData(strSql,"",isNoForward);
}
public static void GetDataListBuilder(ref StringBuilder strSql) {
strSql.Append(" ORDNO,BSNO,ORSTATUS,ORREASON,BSDATE,CUSTOMERNAME,ORDTYPE,SHIPPERID,CONSIGNEEID,NOTIFYPARTYID,YARD");
strSql.Append(",SHIPPER,CONSIGNEE,NOTIFYPARTY,VESSEL,VOYNO,ETD,PlACERECEIPT,PlACERECEIPTID,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE");
strSql.Append(",PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,ISSUEPLACEID,BLFRT");
@ -113,17 +128,6 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
strSql.Append(" from crm_seaeorder B");
strSql.Append(" left join (select t3.* from (select *,row_number() over (partition by EDICODE order by portid asc) as rownum from code_disport) t3 where t3.rownum = 1 ) cd on B.DESTINATIONID = cd.EDICODE ");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where " + strCondition);
}
//
strSql.Append(@")as t2 )as t ");
strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit)); //
var isNoForward = MsBaseInfoDAL.MsBaseInfoDAL.GetUserModuleEnable("modMsNoForward", userid);
return SetData(strSql,"",isNoForward);
}
public static int getTotalCount(string strCondition, string userid, string usercode, string companyid)
@ -188,28 +192,10 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
}
//
var strSql = new StringBuilder();
strSql.Append("SELECT ORDNO,BSNO,ORSTATUS,ORREASON,BSDATE,CUSTOMERNAME,ORDTYPE,SHIPPERID,CONSIGNEEID,NOTIFYPARTYID,YARD");
strSql.Append(",SHIPPER,CONSIGNEE,NOTIFYPARTY,VESSEL,VOYNO,ETD,PlACERECEIPT,PlACERECEIPTID,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE");
strSql.Append(",PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,NOBILL,ISSUETYPE,ISSUEDATE,ISSUEPLACE,ISSUEPLACEID,BLFRT");
strSql.Append(",PREPARDAT,PAYABLEAT,[SERVICE],MARKS,NOPKGS,[DESCRIPTION],GOODSNAME,GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS");
strSql.Append(",KGS,CBM,TOTALNO,CNTRTOTAL,INPUTBY,INVNO,CARGOID,HSCODE,DCLASS,DUNNO,REEFERF,TEMPID,TEMPSET,TEMPMAX,TEMPMIN");
strSql.Append(",CUSTOMSNUM,REMARK,STATUS1,STATUS2,STATUS3,STATUS4,STATUS5,ISFUMIGATION,ISSTORAGE,ISLAND,ISCUSTOMS,ISINSPECTION");
strSql.Append(",ISBOOKING,ISAGENT,ISHBLNO,SERVICE9,SERVICE10,STLNAME,STLDATE,OCEANFEE,ISUSD,ISCOMMISSIONBACK,CARRIER,CARRIERATTN");
strSql.Append(",CARRIERTEL,CARRIEREMAIL,FORWARDER,FORWARDERATTN,FORWARDERTEL,FORWARDEREMAIL,SALE,PACKINGTYPE,BLTYPE,OP,FRCUSTSERVICE");
strSql.Append(",CUSTSERVICE,doc,AUDITOPERATOR,AUDITDATE,DPAGE,DLABEL,LINKMAN,BILLNUM,AGENTID,AGENT,TRANSPORT");
strSql.Append(",(CASE ORSTATUS WHEN '8' THEN '确认订舱' WHEN '0' THEN '审核通过' WHEN '1' THEN '提交审核' WHEN '2' THEN '驳回' WHEN '4' THEN '退舱' else '录入状态' end) as ORSTATUSREF ");
strSql.Append(",(SELECT CUSTNO FROM V_OP_BILL V WHERE V.BSNO=B.BSNO) as CUSTNO ");
strSql.Append(",(SELECT MBLNO FROM V_OP_BILL V WHERE V.BSNO=B.BSNO) as MBLNOREF,MBLNO,SALEDEPT,BSSOURCE,BSSOURCEDETAIL,(select top 1 sale from info_client where SHORTNAME=B.CUSTOMERNAME) DEFSALE ");
strSql.Append(",dbo.F_GetBillCrmFeeStatus(B.BSNO,1) DRFEESTATUS");
strSql.Append(",dbo.F_GetBillCrmFeeStatus(B.BSNO,2) CRFEESTATUS");
strSql.Append(",'' SenderMobile,'' SenderEmail,CONTRACTNO,'' AMSSHIPPER,'' AMSCONSIGNEE,'' AMSNOTIFYPARTY,CONFIRMOP,CONFIRMDATE,OPERATOR,OPERATORTEL,FBP,DESTFBP,MAXWEIGHT,PLANPROFIT,OPERATOREMAIL,LANE,SERVICECONTRACTNO ");
strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP");
strSql.Append(",B.AUDITOPERATOR2,B.ETD2,B.ISSUETYPE2,B.STLNAME2,B.TIDANLEIXING,B.SUBMITDATE ,TRADETERM,DIANSHANGORDERNO,BCNO ");
strSql.Append("SELECT ");
GetDataListBuilder(ref strSql);
strSql.Append(",(select DESCRIPTION from info_client where shortname=B.customername) CUSTOMERFULLNAME ");
strSql.Append(",(select top 1 CUSTOMERNAME from crm_seaeorder_fen where MASTERNO = b.BSNO order by ordno) FEN_CUSTOMERNAME");
strSql.Append(",B.ISEI,B.TEU");
strSql.Append(" from crm_seaeorder B");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where " + strCondition);

3
DSWeb/Areas/MvcShipping/DAL/code_vesselModelDal/code_vessel.cs
Unescape Escape View File

@ -11,6 +11,7 @@ using System.Text;
using DSWeb.Areas.MvcShipping.Models.MsCodeVesselSetModel;
using DSWeb.MvcShipping.DAL.MsInfoClient;
using DSWeb.MvcShipping.DAL.MsOpSeaeDAL;
using DSWeb.Areas.CommMng.DAL;
namespace DSWeb.Areas.MvcShipping.DAL.code_vesselModelDal
{
@ -260,7 +261,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.code_vesselModelDal
if (_dmb.STLNAME == "")
{
STLNAME = "现结买单";
STLDATE = headData.ETD;
STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD);
}
var cmdupdate = db.GetSqlStringCommand(@"update op_seae set ETD='" + headData.ETD + "',ATD='" + headData.ATD + "',STLNAME='" + STLNAME + "',STLDATE='" + STLDATE + "' where BSNO='" + enumValue.BSNO + "'");
db.ExecuteNonQuery(cmdupdate, tran);

1
DSWeb/Areas/MvcShipping/Views/MsRptOpBsList/Index.aspx
Unescape Escape View File

@ -14,6 +14,7 @@
<%-- <script type="text/javascript" src="../../../../Views/../TruckMng/Scripts/ExtjsEx/exportexcel/export-all.js"></script>--%>
<script type="text/javascript" src="../../../../Views/../TruckMng/Scripts/ExtjsEx/gridToExcel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DsComm.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/TimePickerField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimePicker.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeField.js"></script>

1
DSWeb/Areas/MvcShipping/Views/MsRptOpProfit/Index.aspx
Unescape Escape View File

@ -24,6 +24,7 @@
<%-- <script type="text/javascript" src="../../../../Views/../TruckMng/Scripts/ExtjsEx/exportexcel/export-all.js"></script>--%>
<script type="text/javascript" src="../../../../Views/../TruckMng/Scripts/ExtjsEx/gridToExcel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DsComm.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/TimePickerField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimePicker.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeField.js"></script>

1
DSWeb/Areas/MvcShipping/Views/MsRptOpProfitMonth/Index.aspx
Unescape Escape View File

@ -23,6 +23,7 @@
<%-- <script type="text/javascript" src="../../../../Views/../TruckMng/Scripts/ExtjsEx/exportexcel/export-all.js"></script>--%>
<script type="text/javascript" src="../../../../Views/../TruckMng/Scripts/ExtjsEx/gridToExcel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DsComm.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/TimePickerField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimePicker.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeField.js"></script>

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

@ -30,9 +30,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
redAlertFields: [],
mainWin: null,
showField: null,
BULIAO:false,
initUIComponents: function () {
_this = this;
this.serialNo = 0;
//this.bodyDel = [];
this.itemindex = 1;
@ -2931,6 +2932,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
store: this.storeISSUETYPE,
forceSelection: true,
name: 'ISSUETYPE',
id: 'ISSUETYPE',
valueField: 'BLTYPE',
displayField: 'BLTYPE',
listeners: {
@ -7908,6 +7910,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.QingXianBaoCunYeWu, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });//'请先保存业务信息后再打开其他模块！'
} else {
if (record.data.NAME == 'modSeaeAllFee') {
//20230221 如果没有柜号没有提单号 不允许打开费用模块
var paneltabitems = new Shipping.SeaeFee({
id: 'pnl' + record.data.NAME,
layout: "border",
@ -7918,6 +7921,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
title: record.data.DESCRIPTION
});
} else if (record.data.NAME == 'modSeaeAmendFee') {
var paneltabitems = new Shipping.SeaeAmendFee({
id: 'pnl' + record.data.NAME,
layout: "border",
@ -8059,6 +8063,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
}, this);
//SERVICE9 补料
//#endregion
//#region 直发舱单
@ -12787,9 +12794,10 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
var checkboxSingleItem = "{boxLabel:'" + memberyf.data.SERVICENAME + "',inputValue:true,name:'" + memberyf.data.OPField + "',id:'" + memberyf.data.OPField + "'";
checkboxSingleItem += "}";
} else {
var checkboxSingleItem = ",{boxLabel:'" + memberyf.data.SERVICENAME + "',inputValue:true,name:'" + memberyf.data.OPField + "',id:'" + memberyf.data.OPField + "'";
var checkboxSingleItem = ",{boxLabel:'" + memberyf.data.SERVICENAME + "',inputValue:true,name:'" + memberyf.data.OPField + "',id:'" + memberyf.data.OPField + "',listeners : { change: function(el, checked) { if (checked) { _this.ServiceChecked(\"" + memberyf.data.SERVICENAME + "\") }else{ _this.ServiceChecked(\"" + memberyf.data.SERVICENAME + "\",false)} }}"; //
checkboxSingleItem += "}";
}
checkboxitems += checkboxSingleItem;
};
checkboxitems += "]";
@ -12955,7 +12963,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
this.LoadPeriod(this.opStatus);
} else {
}
else {
Ext.Ajax.request({
@ -13030,6 +13039,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
this.SetTOTALNO(data.NOPKGS);
}
this.SetServiceCheck(data);
} else {
Ext.MessageBox.alert('请求出现错误,请重试', response.responseText);
}
@ -13480,6 +13491,12 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
//#region 保存 保存方法
Save: function (type) {
// if (type=='0'||type=='1') {
if (!this.CheckBuliao()) {
//alert(outmsg);
return;
}
if (1 == 2) {
this.doSave(type);
} else {
@ -21363,8 +21380,58 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
ShowOPUSERINFO(bsno);
}
, SetCanEdit() {
//根据当前数据状态 设定按钮的状态
//, SetCanEdit() {
// //根据当前数据状态 设定按钮的状态
//}
, ServiceChecked(SERVICENAME, checked = true) {
//alert(SERVICENAME);
//SERVICENAME=补料 签单方式和柜号改为必填
if (SERVICENAME == "补料") {
//签单方式
var 签单方式 = Ext.getCmp("ISSUETYPE");
签单方式.allowBlank = !checked;
this.BULIAO = checked;
}
}
, SetServiceCheck(data) {
//alert(data.SERVICE9);
//if (!data.SERVICE9) {
//签单方式
var 签单方式 = Ext.getCmp("ISSUETYPE");
签单方式.allowBlank = !data.SERVICE9;
this.BULIAO = data.SERVICE9;
//}
}
, CheckBuliao() {
var 补料 = Ext.getCmp("SERVICE9");
//alert(补料.value); 返回 true
if (补料.value == true) {
return this.CheckHaveCNTRNO();
} else {
return true;
}
}
, CheckHaveCNTRNO() {
var _result = true;
if (this.storeBodyList.length == 0) {
Ext.Msg.show({ title: Zi.LAN.JingGao, msg: "已补料的业务，必须有正确长度的箱号", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });//'已是最后一票'
return false;
}
//遍历箱信息 看看试否有箱号长度不等于11 如有则返回false；
for (var i = 0; i < this.storeBodyList.getCount(); i += 1) {
var member = this.storeBodyList.getAt(i);
var CNTRNO = member.data.CNTRNO + "";
if (CNTRNO.length != 11) {
Ext.Msg.show({ title: Zi.LAN.JingGao, msg: "已补料的业务，必须有正确长度的箱号", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });//'已是最后一票'
return false;
}
}
return _result;
}
});

4
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
Unescape Escape View File

@ -14448,7 +14448,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
_this = this;
_this = this;
Ext.Ajax.request({
waitMsg: Zi.LAN.ZhengZaiCaoZuoShuJu,
url: '/MvcShipping/MsOp_BLISSUE/CanCheckOut',
@ -14506,7 +14506,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
_html = _html + "</span><br></br>";
Ext.getCmp("FDINFO").update(_html);
} else {
//return;
return;
}
} else {
return;

14
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js
Unescape Escape View File

@ -4200,11 +4200,18 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
var selections = this.gridList.getSelectionModel().getSelection();
var bodyList = [];
var _bsno = "";
var _linkgid = "";
for (i = 0; i < selections.length; i += 1) {
var member = selections[i];
bodyList.push(member);
};
if (bodyList.length > 0) {
_bsno = bodyList[0].data.BSNO;
_linkgid = bodyList[0].data.GID;
}
var jsonBody = ConvertRecordsToJsonAll(bodyList);
if (jsonBody == '') {
@ -4223,6 +4230,13 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
//this.winQCShow.close();
//Ext.getCmp("REASON").setValue("");
this.onRefreshClick();
this.storeLog.load({
params: {
condition: " (BSNO='" + _linkgid + "' or BSNO in(select linkgid from op_blissuelist_detail where BSNO='" + _bsno + "'))"
}
});
}
},
failure: function (response, options) {

6
DSWeb/Areas/TruckMng/Controllers/MsOpTruckBulkController.cs
Unescape Escape View File

@ -248,7 +248,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD);
}
}
if (headData.ORDERNO != "") {
@ -488,7 +488,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD);
}
}
@ -662,7 +662,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
if (_dmb.STLNAME == "")
{
headData.STLNAME = "现结买单";
headData.STLDATE = headData.ETD;
headData.STLDATE = BasicDataRefDAL.现结买单结算日期(headData.ETD);
}
}

4
DSWeb/Web.config
Unescape Escape View File

@ -95,8 +95,8 @@
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=0211;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=0211;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 测试库0 CHJY admin 123456
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

Write Preview
Loading…
Cancel
Save