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

1

Browse Source
DS7_JinGang
hanxuntao 2 years ago
parent bd27bbba1b
commit a26fcd9ebf
5 changed files with 73 additions and 10 deletions
Show Stats Download Patch File Download Diff File

36
D7MqClient/D7MqClient/JFtoDjyBackNo.cs
Unescape Escape View File

@ -97,7 +97,7 @@ namespace D7MqClient
logger.Debug($"执行语句1：{strSql.ToString()}");
if (_count == 1 && UPDATESUBCOMPANY == "1")
{
var BsNo = GetBsNo(dbcon, CUSTNO);
var BsNo = GetBsNo(dbcon,"CUSTNO='"+CUSTNO+"'");
var strSql3 = new StringBuilder();
strSql3.Append("exec ExeUpdateSubOpSeae '" + BsNo + "' ");
SqlCommand cmd3 = new SqlCommand(strSql3.ToString(), dbcon);
@ -148,24 +148,48 @@ namespace D7MqClient
var strSql2 = new StringBuilder();
strSql2.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where BSNO='" + BSNO + "' AND ISNULL(MBLNO,'')=''");
SqlCommand cmd2 = new SqlCommand(strSql2.ToString(), dbcon);
cmd2.ExecuteNonQuery();
var _count=cmd2.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql2.ToString()}");
if (_count == 1 && UPDATESUBCOMPANY == "1")
{
var strSql3 = new StringBuilder();
strSql3.Append("exec ExeUpdateSubOpSeae '" + BSNO + "' ");
SqlCommand cmd3 = new SqlCommand(strSql3.ToString(), dbcon);
cmd3.ExecuteNonQuery();
}
}
if (!string.IsNullOrEmpty(CUSTNO))
{
var strSql = new StringBuilder();
strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where (CUSTNO='" + CUSTNO + "' OR IRCODE='" + CUSTNO + "') AND (ISNULL(MBLNO,'')='' or MBLNO LIKE '%*') ");
SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
cmd.ExecuteNonQuery();
var _count=cmd.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql.ToString()}");
if (_count == 1 && UPDATESUBCOMPANY == "1")
{
var BsNo = GetBsNo(dbcon, "CUSTNO='"+CUSTNO+"'");
var strSql3 = new StringBuilder();
strSql3.Append("exec ExeUpdateSubOpSeae '" + BsNo + "' ");
SqlCommand cmd3 = new SqlCommand(strSql3.ToString(), dbcon);
cmd3.ExecuteNonQuery();
}
}
if (!string.IsNullOrEmpty(IRCODE))
{
var strSql = new StringBuilder();
strSql.Append("update op_seae set MBLNO='" + feeback.FeedbackData.MBLNO + "' where IRCODE='" + IRCODE + "' AND (ISNULL(MBLNO,'')='' or MBLNO LIKE '%*') ");
SqlCommand cmd = new SqlCommand(strSql.ToString(), dbcon);
cmd.ExecuteNonQuery();
var _count=cmd.ExecuteNonQuery();
logger.Debug($"执行语句1：{strSql.ToString()}");
if (_count == 1 && UPDATESUBCOMPANY == "1")
{
var BsNo = GetBsNo(dbcon, "IRCODE='" + IRCODE + "'");
var strSql3 = new StringBuilder();
strSql3.Append("exec ExeUpdateSubOpSeae '" + BsNo + "' ");
SqlCommand cmd3 = new SqlCommand(strSql3.ToString(), dbcon);
cmd3.ExecuteNonQuery();
}
}
}
else
@ -220,11 +244,11 @@ namespace D7MqClient
};
model.BasicConsume(CompanyQueueName, true, consumer);
}
static public string GetBsNo(SqlConnection dbcon, string mblno)
static public string GetBsNo(SqlConnection dbcon, string constr)
{
string bsno = "";
var strSql = new StringBuilder();
strSql.Append("select BSNO from t_op_seae where CUSTNO='" + mblno + "'");
strSql.Append("select BSNO from t_op_seae where "+ constr);
SqlDataAdapter adapter = new SqlDataAdapter(strSql.ToString(), dbcon);
DataTable table = new DataTable();
adapter.Fill(table);

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

@ -1495,6 +1495,7 @@ namespace DSWeb.MvcShipping.Controllers
headData.CUSTNO = "";
headData.BSNO = "topseae" + Guid.NewGuid().ToString();
headData.MASTERNO = headData.BSNO;
headData.IRCODE = "";
if (bodyList != null)
{

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

@ -3071,7 +3071,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strCNTRTOTAL = strCNTRTOTAL.Trim().Substring(0, strCNTRTOTAL.Trim().Length - 1);
}
}
str = "update op_seae_billmanage set CNTRTOTAL='" + strCNTRTOTAL + "',CNTRSEALNO='" + strCNTRNO + "' where AS_ID='" + strBSNO + "'";
str = "update op_seae_billmanage set CNTRTOTAL='" + strCNTRTOTAL + "' where AS_ID='" + strBSNO + "'";
bool bl = T_ALL_DA.GetExecuteSqlCommand(str);
}
@ -3193,6 +3193,13 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
var NEWBSNO = new BSNOLB();
NEWBSNO.BSNO = bsno;
BSNOLIST.Add(NEWBSNO);
var UPDATESUBDATAAFTERSI = MsSysParamSetDAL.GetData("PARAMNAME='UPDATESUBDATAAFTERSI'");
if (UPDATESUBDATAAFTERSI.PARAMVALUE == "1")
{
var cmdCancel = db.GetSqlStringCommand("exec ExeCancelSubOpSeae '" + bsno + "'");
db.ExecuteNonQuery(cmdCancel, tran);
}
}
else {
var cmdUpdate = db.GetSqlStringCommand("update op_seae set iscancel='" + type + "' where bsno='" + bsno + "'");

36
DSWeb/Areas/MvcShipping/Viewsjs/MsFeeTemplate/FeeTemplateAdd.js
Unescape Escape View File

@ -548,14 +548,44 @@ Ext.extend(Shipping.FeeTemplateAdd, Ext.Panel, {
var memberyf = this.storeBodyChFee.getAt(i);
var record = null;
var records = DsStoreQueryBy(this.StoreFeeUnit, 'UNIT', memberyf.data.Unit);
var aUNIT = memberyf.data.Unit;
var quantity = 1;
// var feeType = memberyf.data.FeeType;
if (((memberyf.data.ISCTN && (records.getCount() > 0)) || (!memberyf.data.ISCTN))) {
if (records.getCount() > 0) {
var data = records.getAt(0).data;
var quantity = data.QUANTITY;
quantity = data.QUANTITY;
} else {
var quantity = 1;
if (memberyf.data.Unit == '箱型') {
var Unitrecords = DsStoreQueryLikeBy(this.StoreFeeUnit, 'UNIT', 1, '2');
if (Unitrecords.getCount() > 0) {
var ffdata = Unitrecords.getAt(0).data;
aUNIT = ffdata.UNIT;
} else {
var Unitrecords = DsStoreQueryLikeBy(this.StoreFeeUnit, 'UNIT', 1, '4');
if (Unitrecords.getCount() > 0) {
var ffdata = Unitrecords.getAt(0).data;
aUNIT = ffdata.UNIT;
}
}
if (aUNIT!= '') {
var Unitrecords = DsStoreQueryBy(this.StoreFeeUnit, 'UNIT', aUNIT);
if (Unitrecords.getCount() > 0) {
var Unitdata = Unitrecords.getAt(0).data;
quantity = Unitdata.QUANTITY;
}
}
} else {
}
}
var taxrate = memberyf.data.TaxRate;
// var taxrate = 0;
@ -675,7 +705,7 @@ Ext.extend(Shipping.FeeTemplateAdd, Ext.Panel, {
CustomerType: custtype,
CustomerName: custname,
CustomerFullName: custfullname,
Unit: memberyf.data.Unit,
Unit: aUNIT,
UnitPrice: memberyf.data.UnitPrice,
TaxUnitPrice: TaxUnitPrice,
Quantity: quantity,

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

@ -6300,6 +6300,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
this.StoreSalesRepCode.add({ "ID": "CN099", "NAME": "CN099 | HELEN ZHANG" });
this.StoreSalesRepCode.add({ "ID": "CN100", "NAME": "CN100 | LEOREN" });
this.StoreSalesRepCode.add({ "ID": "CN302", "NAME": "CN302 | MELL" });
this.comboxSalesRepCode = Ext.create('DsExt.ux.RefTableCombox', {
store: this.StoreSalesRepCode,
fieldLabel: Zi.LAN.SalesRepCode, //"太平销售Edi代码",

Write Preview
Loading…
Cancel
Save