放单通知状态改未可放单

临时发布20240103
ddlucky 2 years ago
parent e87213e2c2
commit 5ecbb60cb5

@ -582,7 +582,7 @@ namespace DSWeb.MvcShipping.Controllers
/// <summary>
/// 保存放单通知
/// 保存放单通知 可放单
/// </summary>
/// <param name="start"></param>
/// <param name="limit"></param>
@ -1809,7 +1809,7 @@ namespace DSWeb.MvcShipping.Controllers
var jsonRespose = new JsonResponse();
foreach (var item in dataList)
{
var ACTNAME = T_ALL_DA.GetStrSQL("ACTNAME", "SELECT ACTNAME FROM WorkLog WHERE (ACTNAME='放单通知' or ACTNAME='取消放单通知' or ACTNAME='驳回放单通知') AND BSNO='" + item.GID + "' order by OPDATE desc ");
var ACTNAME = T_ALL_DA.GetStrSQL("ACTNAME", "SELECT ACTNAME FROM WorkLog WHERE (ACTNAME='放单通知' or ACTNAME='取消放单' or ACTNAME='驳回放单') AND BSNO='" + item.GID + "' order by OPDATE desc ");
if (ACTNAME!= "放单通知")
{
result.Success = false;
@ -2363,13 +2363,13 @@ namespace DSWeb.MvcShipping.Controllers
/// <summary>
/// 执行 放单通知
/// 执行 放单通知 可放单
/// </summary>
/// <param name="USERID"></param>
/// <param name="data"></param>
/// <param name="REASON"></param>
/// <returns></returns>
public ContentResult FDTZ ( string USERID, string data, string REASON ) //放单通知
public ContentResult FDTZ ( string USERID, string data, string REASON ) //放单通知 可放单
{
var _r1 = SaveList_P(data);
@ -2441,7 +2441,7 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
public ContentResult PLFDTZ(string USERID, string data) //放单通知
public ContentResult PLFDTZ(string USERID, string data) //放单通知 可放单
{
bool BLISSUENONO = false;
var BLISSUENONOPARAM = MsSysParamSetDAL.GetData("PARAMNAME='BLISSUENONO'");
@ -2486,7 +2486,7 @@ namespace DSWeb.MvcShipping.Controllers
else
{
if (_p.BLSTATUS == "扣单" || _p.BLSTATUS == "放单通知" || _p.BLSTATUS == "提单签出")
if (_p.BLSTATUS == "扣单" || _p.BLSTATUS == "放单" || _p.BLSTATUS == "提单签出") //放单通知
{
}
else
@ -2529,7 +2529,7 @@ namespace DSWeb.MvcShipping.Controllers
}
public ContentResult UNFDTZ(string USERID, string data) //取消放单通知
public ContentResult UNFDTZ(string USERID, string data) //取消放单通知 可放单
{
var _r1 = SaveList_P(data);
@ -2569,7 +2569,7 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
public ContentResult FDTZBACK(string USERID, string data) //取消放单通知
public ContentResult FDTZBACK(string USERID, string data) //取消放单通知 可放单
{
var _r1 = SaveList_P(data);
@ -2753,7 +2753,7 @@ namespace DSWeb.MvcShipping.Controllers
}
#endregion
#region 取消放单通知
#region 取消放单通知 放单通知改为‘可放单’
public ContentResult GGTD(string data,string status) //状态更改
{

@ -1167,7 +1167,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
//if (WorkResult.Success == true)
//{
var cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS=(case when (select count(1) from worklog where BSNO=@GID and actname='放单通知')>0 then '放单通知' "
var cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS=(case when (select count(1) from worklog where BSNO=@GID and actname='放单通知')>0 then '放单' "
+ " else '' end),QRDATE='' where GID=@GID and BLSTATUS ='提单签入' ");
cmdupdate.Parameters.Clear();
@ -1659,7 +1659,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
if (_bill.BLSTATUS == "扣单")
{
cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS="
+ " (case when (select count(1) from worklog where BSNO=@GID and actname='放单通知')>0 then '放单通知' "
+ " (case when (select count(1) from worklog where BSNO=@GID and actname='放单通知')>0 then '放单' "
+ " else case when (select count(1) from worklog where BSNO=@GID and actname='提单签入')>0 then '提单签入' "
+ " else '' end end) where GID=@GID ");
}
@ -1753,7 +1753,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
if (_bill.BLSTATUS == "扣单")
{
cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS="
+ " (case when (select count(1) from worklog where BSNO=@GID and actname='放单通知')>0 then '放单通知' "
+ " (case when (select count(1) from worklog where BSNO=@GID and actname='放单通知')>0 then '放单' "
+ " else case when (select count(1) from worklog where BSNO=@GID and actname='提单签入')>0 then '提单签入' "
+ " else '' end end) where GID=@GID ");
}
@ -1840,21 +1840,24 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
foreach (var _bill in _List)
{
var ACTNAME = "";
var BLSTATUSNAME = "";
if (_bill.())
{
ACTNAME = "已放货";
BLSTATUSNAME= "已放货";
}
else
{
ACTNAME = "放单通知";
ACTNAME = "可放单";
BLSTATUSNAME = "放单通知";
}
var cmdupdate = db.GetSqlStringCommand($"update op_blissue set BLSTATUS='{ACTNAME}' where GID=@GID "
+ $" update op_seae set BLISSUESTATUS='{ACTNAME}' where BSNO=@BSNO "
+ $" update op_aire set BLISSUESTATUS='{ACTNAME}' where BSNO=@BSNO "
+ $" update op_airi set BLISSUESTATUS='{ACTNAME}' where BSNO=@BSNO "
+ $" update op_seae_billmanage set BLISSUESTATUS='{ACTNAME}' where AS_ID=@BSNO3 "
+ $" update op_seai set BLISSUESTATUS='{ACTNAME}' where BSNO=@BSNO2 ");
var cmdupdate = db.GetSqlStringCommand($"update op_blissue set BLSTATUS='{BLSTATUSNAME}' where GID=@GID "
+ $" update op_seae set BLISSUESTATUS='{BLSTATUSNAME}' where BSNO=@BSNO "
+ $" update op_aire set BLISSUESTATUS='{BLSTATUSNAME}' where BSNO=@BSNO "
+ $" update op_airi set BLISSUESTATUS='{BLSTATUSNAME}' where BSNO=@BSNO "
+ $" update op_seae_billmanage set BLISSUESTATUS='{BLSTATUSNAME}' where AS_ID=@BSNO3 "
+ $" update op_seai set BLISSUESTATUS='{BLSTATUSNAME}' where BSNO=@BSNO2 ");
cmdupdate.Parameters.Clear();
//db.AddInParameter(cmdupdate, "@AUDITDATE", DbType.String, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
db.AddInParameter(cmdupdate, "@GID", DbType.String, _bill.GID);
@ -2038,7 +2041,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
//if (WorkResult.Success == true)
//{
var cmdupdate = db.GetSqlStringCommand("update op_blissue set BLSTATUS="
+ " (case when (select count(1) from worklog where BSNO=@GID and actname='放单通知')>0 then '放单通知' "
+ " (case when (select count(1) from worklog where BSNO=@GID and actname='放单通知')>0 then '放单' "
+ " else case when (select count(1) from worklog where BSNO=@GID and actname='提单签入')>0 then '提单签入' "
+ " else '' end end),QCDATE='' where GID=@GID ");

@ -951,7 +951,7 @@ namespace DSWeb.MvcShipping.Models.MsOp_BLISSUE
{
public const string = "提单签入";
public const string = "扣单";
public const string = "放单通知";
public const string = "放单";
public const string = "提单签出";
public const string = "已放货";
@ -973,7 +973,7 @@ namespace DSWeb.MvcShipping.Models.MsOp_BLISSUE
}
/// <summary>
/// 不需要执行放单通知动作
/// 不需要执行放单通知动作 可放单
/// </summary>
/// <param name="BLSTATUS"></param>
/// <returns></returns>

@ -1902,7 +1902,7 @@ Ext.extend(Shipping.MsAireOrderIndex, Ext.Panel, {
//#endregion
//#region 放单通知
//#region 放单通知 可放单
//this.gridList.addListener('itemcontextmenu', this.itemcontextmenu);

@ -1474,7 +1474,7 @@ Ext.extend(Shipping.MsOpAireIndex, Ext.Panel, {
//#endregion
//#region 放单通知
//#region 放单通知 可放单
//this.gridList.addListener('itemcontextmenu', this.itemcontextmenu);

@ -14292,7 +14292,7 @@ Ext.extend(Shipping.MsOpSeaeFeeIndex, Ext.Panel, {
_this = this;
for (var i = 0; i < selections.length; i++) {
var rec = selections[i];
if (rec.data.BLISSUESTATUS != '放单通知') {
if (rec.data.BLISSUESTATUS != '放单') {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '提单号:' + rec.data.MBLNO + ',只有已放单通知的正本提单,才允许取消放单通知!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}

@ -7996,7 +7996,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
//#endregion
//#region 放单通知
//#region 放单通知 可放单
//this.gridList.addListener('itemcontextmenu', this.itemcontextmenu);
@ -14625,7 +14625,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
_this = this;
for (var i = 0; i < selections.length; i++) {
var rec = selections[i];
if (rec.data.BLISSUESTATUS != '放单通知') {
if (rec.data.BLISSUESTATUS != '放单') {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '提单号:' + rec.data.MBLNO + ',只有已放单通知的正本提单,才允许取消放单通知!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}

@ -1875,7 +1875,7 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext });
}, this);
//#region 放单通知
//#region 放单通知 可放单
//this.gridList.addListener('itemcontextmenu', this.itemcontextmenu);
this.formReason = Ext.widget('form', {

@ -2700,7 +2700,7 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, {
//#endregion
//#region 放单通知
//#region 放单通知 可放单
//this.gridList.addListener('itemcontextmenu', this.itemcontextmenu);

@ -176,7 +176,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
meta.tdCls = 'feestatus_refer';
} else if (value == '扣单') {
meta.tdCls = 'feestatus_nopass';
} else if (value == '放单通知') {
} else if (value == '放单') {
meta.tdCls = 'feestatus_refer';
}
return value;
@ -817,7 +817,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
this.storeBLSTATUS.add({ "FSTATUS": "1", "NAME": "未签入" });
this.storeBLSTATUS.add({ "FSTATUS": "2", "NAME": "签入未签出" });
this.storeBLSTATUS.add({ "FSTATUS": "状态更改", "NAME": "状态更改" });
this.storeBLSTATUS.add({ "FSTATUS": "放单通知", "NAME": "放单通知" });
this.storeBLSTATUS.add({ "FSTATUS": "放单", "NAME": "放单" });
this.storeBLSTATUS.add({ "FSTATUS": "更改提单", "NAME": "更改提单" });
this.storeBLSTATUS.add({ "FSTATUS": "提单签出", "NAME": "提单签出" });
this.storeBLSTATUS.add({ "FSTATUS": "已放货", "NAME": "已放货" });
@ -3104,7 +3104,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
// sql = sql + getAndConSql(sql, RB, " ((B.ISSUETYPE='正本' or B.ISSUETYPE='SEAWAY' or B.ISSUETYPE='海运单') and (isnull(ob.BLSTATUS,'')='' or ob.BLSTATUS='换签(背书)' or (select COUNT(*) from worklog where bsno=ob.GID and ACTNAME='提单签入')<=0) ) ");
} else
if (RB == '1') {//可签出
sql = sql + getAndConSql(sql, RB, " ( ( isnull(ob.BLSTATUS,'')='放单通知' or (isnull(ob.BLSTATUS,'')='提单签入' and (select COUNT(*) from worklog where bsno=ob.GID and ACTNAME='放单通知')>0 ) ) or (sp.BLSTATUS='审核通过' and isnull(ob.BLSTATUS,'')<>'提单签出') ) ");
sql = sql + getAndConSql(sql, RB, " ( ( isnull(ob.BLSTATUS,'')='放单' or (isnull(ob.BLSTATUS,'')='提单签入' and (select COUNT(*) from worklog where bsno=ob.GID and ACTNAME='放单')>0 ) ) or (sp.BLSTATUS='审核通过' and isnull(ob.BLSTATUS,'')<>'提单签出') ) ");
} else
if (RB == '2') {//已扣单
sql = sql + getAndConSql(sql, RB, " (select COUNT(*) from worklog where bsno=ob.GID and ACTNAME='扣单')<>(select COUNT(*) from worklog where bsno=ob.GID and ACTNAME='取消扣单') ");
@ -3548,7 +3548,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
if (member.data.BLSTATUS == "") {
//bodyList.push(member);
} else
if (member.data.BLSTATUS == "提单签入" || member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "提单签入" || member.data.BLSTATUS == "放单") {
//alert("不能重复签入。");
bodyList.push(member);
} else
@ -3642,7 +3642,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
for (i = 0; i < selections.length; i += 1) {
var member = selections[i];
if (member.data.BLSTATUS == "" || member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "" || member.data.BLSTATUS == "放单") {
//bodyList.push(member);
} else
if (member.data.BLSTATUS == "提单签入") {
@ -3695,7 +3695,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
for (i = 0; i < selections.length; i += 1) {
var member = selections[i];
if (member.data.BLSTATUS == "" || member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "" || member.data.BLSTATUS == "放单") {
//bodyList.push(member);
} else
if (member.data.BLSTATUS == "提单签入") {
@ -3749,7 +3749,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
var bodyList = [];
for (i = 0; i < selections.length; i += 1) {
var member = selections[i];
if (member.data.BLSTATUS == "提单签入" || member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "提单签入" || member.data.BLSTATUS == "放单") {
bodyList.push(member);
};
}
@ -3834,7 +3834,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
var bodyList = [];
for (i = 0; i < selections.length; i += 1) {
var member = selections[i];
if (member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "放单") {
bodyList.push(member);
};
}
@ -3900,7 +3900,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
else {
if ((member.data.BLSTATUS == "" && (member.data.ISSUETYPE == "正本" || (member.data.ISSUETYPE != "正本" && member.data.ISSUETYPE != "")))
|| member.data.BLSTATUS == "放单通知" || member.data.BLSTATUS == "提单签入" || member.data.BLSTATUS == "状态更改" || member.data.ISGAIQIAN == "1") {
|| member.data.BLSTATUS == "放单" || member.data.BLSTATUS == "提单签入" || member.data.BLSTATUS == "状态更改" || member.data.ISGAIQIAN == "1") {
if (this.QCMUSTQR == 1 && member.data.QRDATE == '') {
Ext.Msg.show({ title: '提示', msg: "必须先签入才能签出!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });

@ -1720,7 +1720,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
} else
if (RB == '1') {//可签出
sql = sql + getAndConSql(sql, RB, " ( (B.ISSUETYPE='正本' and isnull(ob.BLSTATUS,'') in ('提单签入','放单通知','驳回放单通知')) or (B.ISSUETYPE in('电放','seawaybill','SEAWAY','海运单') and isnull(ob.BLSTATUS,'') in ('','提单签入','放单通知') )) ");
sql = sql + getAndConSql(sql, RB, " ( (B.ISSUETYPE='正本' and isnull(ob.BLSTATUS,'') in ('提单签入','放单','驳回放单通知')) or (B.ISSUETYPE in('电放','seawaybill','SEAWAY','海运单') and isnull(ob.BLSTATUS,'') in ('','提单签入','放单') )) ");
} else
if (RB == '2') {//已扣单
sql = sql + getAndConSql(sql, RB, " (select COUNT(*) from worklog where bsno=ob.GID and ACTNAME='扣单')<>(select COUNT(*) from worklog where bsno=ob.GID and ACTNAME='取消扣单') ");
@ -1729,7 +1729,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
sql = sql + getAndConSql(sql, RB, " isnull(ob.BLSTATUS,'')='提单签出' ");
} else
if (RB == '4') {//已通知放单
sql = sql + getAndConSql(sql, RB, " isnull(ob.BLSTATUS,'')='放单通知' ");
sql = sql + getAndConSql(sql, RB, " isnull(ob.BLSTATUS,'')='放单' ");
}
@ -2366,7 +2366,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
if (member.data.BLSTATUS == "") {
//bodyList.push(member);
} else
if (member.data.BLSTATUS == "提单签入" || member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "提单签入" || member.data.BLSTATUS == "放单") {
//alert("不能重复签入。");
bodyList.push(member);
} else
@ -2460,7 +2460,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
for (i = 0; i < selections.length; i += 1) {
var member = selections[i];
if (member.data.BLSTATUS == "" || member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "" || member.data.BLSTATUS == "放单") {
//bodyList.push(member);
} else
if (member.data.BLSTATUS == "提单签入") {
@ -2513,7 +2513,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
for (i = 0; i < selections.length; i += 1) {
var member = selections[i];
if (member.data.BLSTATUS == "" || member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "" || member.data.BLSTATUS == "放单") {
//bodyList.push(member);
} else
if (member.data.BLSTATUS == "提单签入") {
@ -2652,7 +2652,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
var bodyList = [];
for (i = 0; i < selections.length; i += 1) {
var member = selections[i];
if (member.data.BLSTATUS == "放单通知") {
if (member.data.BLSTATUS == "放单") {
bodyList.push(member);
};
}
@ -2718,7 +2718,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
else {
if ((member.data.BLSTATUS == "" && (member.data.ISSUETYPE == "正本" || (member.data.ISSUETYPE != "正本" && member.data.ISSUETYPE != "")))
|| member.data.BLSTATUS == "放单通知" || member.data.BLSTATUS == "提单签入") {
|| member.data.BLSTATUS == "放单" || member.data.BLSTATUS == "提单签入") {
if (CUSTOMERNAME == "") {
CUSTOMERNAME = member.data.CUSTOMERNAME;

@ -1408,7 +1408,7 @@ Ext.extend(Shipping.MsOp_BLISSUESPEdit, Ext.Panel, {
meta.tdCls = 'feestatus_refer';
} else if (value == '扣单') {
meta.tdCls = 'feestatus_nopass';
} else if (value == '放单通知') {
} else if (value == '放单') {
meta.tdCls = 'feestatus_refer';
}
return value;
@ -2898,7 +2898,7 @@ Ext.extend(Shipping.MsOp_BLISSUESPEdit, Ext.Panel, {
getCondition_Add: function () {
var form = this.formSearch_SP.getForm();
var sql = " not exists (select 1 from op_blissueList_Detail ob1 where ob1.bsno=B.bsno) and isnull(ob.BLSTATUS,'') <>'提单签出' and isnull(ob.BLSTATUS,'') <>'已放货' and isnull(ob.BLSTATUS,'') <>'放单通知' ";
var sql = " not exists (select 1 from op_blissueList_Detail ob1 where ob1.bsno=B.bsno) and isnull(ob.BLSTATUS,'') <>'提单签出' and isnull(ob.BLSTATUS,'') <>'已放货' and isnull(ob.BLSTATUS,'') <>'放单' ";
var MBLNO = form.findField('MBLNO').getValue();
sql = sql + getAndConSql(sql, MBLNO, " (isnull(b.CUSTNO,'')+' '+isnull(b.MBLNO,'')+' '+isnull(b.HBLNO,'') like '%" + MBLNO + "%') ");

Loading…
Cancel
Save