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

仓储入库的箱号下拉菜单载入条件稍作调整；去掉钉钉审核后件重尺内的非数字字符

Browse Source
DS7_JinGang
ddlucky 2 years ago
parent 1d9dc08487
commit 27d0f0b5e9
4 changed files with 89 additions and 49 deletions
Show Stats Download Patch File Download Diff File

3
DSWeb/Areas/Dispatch/Controllers/WxAppController.cs
Unescape Escape View File

@ -158,7 +158,8 @@ namespace DSWeb.Areas.Dispatch.Controllers
}
}
catch (Exception e) {
log.Debug("wxapp登陆错误：" + e.Message);
BasicDataRefDAL.SaveLog("", e.Message, "wxapp", "登陆错误");
//log.Debug("wxapp登陆错误：" + e.Message);
}
BasicDataRefDAL.SaveLog("", obj.openid, "wxapp", "登录f");
return Json(new { ErrorCode = 500, Message = "发生错误" }, JsonRequestBehavior.AllowGet);

18
DSWeb/Areas/MvcShipping/DAL/WMSNew/WMSNewDAL.cs
Unescape Escape View File

@ -1099,10 +1099,10 @@ namespace DSWeb.MvcShipping.DAL.WMSNewDAL
if (wms.CHARGEUNIT == "吨"|| wms.CHARGEUNIT == "千克")
{
updrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSRKSL = DingWmsin.getValue_decimal("重量");
updrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
updrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
updrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
updrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
@ -1111,16 +1111,16 @@ namespace DSWeb.MvcShipping.DAL.WMSNewDAL
if (wms.CHARGEUNIT == "CBM")
{
updrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("尺码"));
updrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSRKSL = DingWmsin.getValue_decimal("尺码");
updrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
updrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
updrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
updrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
updrec.SHIJICHIMA = Convert.ToDouble(DingWmsin.getValue("尺码"));
}
updrec.GOODSPACK = Convert.ToDecimal(DingWmsin.getValue("件数"));
updrec.GOODSPACK = DingWmsin.getValue_decimal("件数");
updrec.AREANAME = DingWmsin.getValue("库位");
updrec.DODATE = wms.WMSDATE;
@ -1136,8 +1136,8 @@ namespace DSWeb.MvcShipping.DAL.WMSNewDAL
newrec.CLIENTNAME = wms.CUSTOMERNAME;
newrec.DODATE = wms.WMSDATE;
newrec.GOODSNAME = DingWmsin.getValue("品名");
newrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSPACK = Convert.ToDecimal(DingWmsin.getValue("件数"));
newrec.GOODSRKSL = DingWmsin.getValue_decimal("重量");
newrec.GOODSPACK = DingWmsin.getValue_decimal("件数");
newrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
newrec.AREANAME = DingWmsin.getValue("库位");
newrec.CREATETIME = DateTime.Now;

102
DSWeb/Areas/MvcShipping/Helper/DingTalkHelper.cs
Unescape Escape View File

@ -31,6 +31,7 @@ using sun.tools.jar.resources;
using System.Data.Entity.Migrations;
using AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models;
using NPOI.SS.Formula.Functions;
using System.Text.RegularExpressions;
namespace DSWeb.Areas.MvcShipping.Helper
{
@ -959,10 +960,10 @@ namespace DSWeb.Areas.MvcShipping.Helper
if (wms.CHARGEUNIT == "吨" || wms.CHARGEUNIT == "千克")
{
updrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSRKSL = DingWmsin.getValue_decimal("重量");
updrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
updrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
updrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
updrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
@ -971,16 +972,16 @@ namespace DSWeb.Areas.MvcShipping.Helper
if (wms.CHARGEUNIT == "CBM")
{
updrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("尺码"));
updrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSRKSL = DingWmsin.getValue_decimal("尺码");
updrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
updrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
updrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
updrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
updrec.SHIJICHIMA = Convert.ToDouble(DingWmsin.getValue("尺码"));
}
updrec.GOODSPACK = Convert.ToDecimal(DingWmsin.getValue("件数"));
updrec.GOODSPACK = DingWmsin.getValue_decimal("件数");
updrec.AREANAME = DingWmsin.getValue("库位");
updrec.DODATE = wms.WMSDATE;
@ -999,10 +1000,10 @@ namespace DSWeb.Areas.MvcShipping.Helper
if (wms.CHARGEUNIT == "吨" || wms.CHARGEUNIT == "千克")
{
newrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSRKSL = DingWmsin.getValue_decimal("重量");
newrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
newrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
newrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
newrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
@ -1011,16 +1012,16 @@ namespace DSWeb.Areas.MvcShipping.Helper
if (wms.CHARGEUNIT == "CBM")
{
newrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("尺码"));
newrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSRKSL = DingWmsin.getValue_decimal("尺码");
newrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
newrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
newrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
newrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
newrec.SHIJICHIMA = Convert.ToDouble(DingWmsin.getValue("尺码"));
}
newrec.GOODSPACK = Convert.ToDecimal(DingWmsin.getValue("件数"));
newrec.GOODSPACK = DingWmsin.getValue_decimal("件数");
newrec.AREANAME = DingWmsin.getValue("库位");
newrec.CREATETIME = DateTime.Now;
newrec.CHARGEUNIT = wms.CHARGEUNIT;
@ -1285,6 +1286,28 @@ namespace DSWeb.Areas.MvcShipping.Helper
}
return result;
}
public decimal getValue_decimal(string fieldname)
{
var resultstr = "";
var result = 0M;
if (rowValue.Exists(x => x.label == fieldname))
{
resultstr = rowValue.First(x => x.label == fieldname).value;
}
//return result;
//提取带有小数点的数字，该方式会将所有带有小数的数字拼接在一起，如："ABC#123.56@AS8.9测试"提取出来就是123.568.9
var result2 = Regex.Replace(resultstr, @"[^\d.\d]", "");
//如果是数字，则转换为decimal类型
if (Regex.IsMatch(result2, @"^[+-]?\d*[.]?\d*$"))
{
result = decimal.Parse(result2);
}
return result;
}
}
public class rowValue
{
@ -1578,28 +1601,28 @@ namespace DSWeb.Areas.MvcShipping.Helper
if (wms.CHARGEUNIT == "吨" || wms.CHARGEUNIT == "千克")
{
updrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSRKSL = DingWmsin.getValue_decimal("重量");
updrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
updrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
updrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
updrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue_decimal("重量"));
updrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
updrec.SHIJICHIMA = Convert.ToDouble(DingWmsin.getValue("尺码"));
updrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue_decimal("尺码"));
updrec.SHIJICHIMA = Convert.ToDouble(DingWmsin.getValue_decimal("尺码"));
}
if (wms.CHARGEUNIT == "CBM")
{
updrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("尺码"));
updrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSRKSL = DingWmsin.getValue_decimal("尺码");
updrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
updrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
updrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
updrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
updrec.SHIJICHIMA = Convert.ToDouble(DingWmsin.getValue("尺码"));
}
updrec.GOODSPACK = Convert.ToDecimal(DingWmsin.getValue("件数"));
updrec.GOODSPACK = DingWmsin.getValue_decimal("件数");
updrec.AREANAME = DingWmsin.getValue("库位");
updrec.DODATE = wms.WMSDATE;
@ -1613,6 +1636,8 @@ namespace DSWeb.Areas.MvcShipping.Helper
if(车队infoclient!=null && !string.IsNullOrWhiteSpace( 车队infoclient.SHORTNAME))
updrec.CHEDUIID = 车队infoclient.GID;
updrec.DODATE = wms.WMSDATE;
updwmsinlist.Add(updrec);
}
else
@ -1628,10 +1653,10 @@ namespace DSWeb.Areas.MvcShipping.Helper
if (wms.CHARGEUNIT == "吨" || wms.CHARGEUNIT == "千克")
{
newrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSRKSL = DingWmsin.getValue_decimal("重量");
newrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
newrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
newrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
newrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
@ -1640,16 +1665,16 @@ namespace DSWeb.Areas.MvcShipping.Helper
if (wms.CHARGEUNIT == "CBM")
{
newrec.GOODSRKSL = Convert.ToDecimal(DingWmsin.getValue("尺码"));
newrec.GOODSSTOCK = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSRKSL = DingWmsin.getValue_decimal("尺码");
newrec.GOODSSTOCK = DingWmsin.getValue_decimal("重量");
newrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
newrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
newrec.SHIJIZHONGLIANG = Convert.ToDouble(DingWmsin.getValue("重量"));
newrec.CHIMA1 = Convert.ToDouble(DingWmsin.getValue("尺码"));
newrec.SHIJICHIMA = Convert.ToDouble(DingWmsin.getValue("尺码"));
}
newrec.GOODSPACK = Convert.ToDecimal(DingWmsin.getValue("件数"));
newrec.GOODSPACK = DingWmsin.getValue_decimal("件数");
newrec.AREANAME = DingWmsin.getValue("库位");
newrec.CREATETIME = DateTime.Now;
newrec.CHARGEUNIT = wms.CHARGEUNIT;
@ -1786,10 +1811,11 @@ namespace DSWeb.Areas.MvcShipping.Helper
// //var cust=cdc.info_client.Where(x=>x.SHORTNAME==item.value || x.DESCRIPTION==item.value)
//}
//if (item.name == "入库日期")
//{
// wms.WMSDATE = Convert.ToDateTime(item.value);
//}
if (item.name == "出库日期")
{
wms_out.DODATE = Convert.ToDateTime(item.value);
cdc.wms_out.AddOrUpdate(wms_out);
}
@ -1819,15 +1845,15 @@ namespace DSWeb.Areas.MvcShipping.Helper
if (wms_out.CHARGEUNIT == "吨" || wms_out.CHARGEUNIT == "千克")
{
updrec.GOODSPFSL = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSPFSL = DingWmsin.getValue_decimal("重量");
updrec.GOODSKGS = Convert.ToDecimal(DingWmsin.getValue("重量"));
updrec.GOODSKGS = DingWmsin.getValue_decimal("重量");
}
if (wms_out.CHARGEUNIT == "CBM")
{
updrec.GOODSPFSL = Convert.ToDecimal(DingWmsin.getValue("尺码"));
updrec.GOODSPFSL = DingWmsin.getValue_decimal("尺码");
updrec.GOODSKGS =0;
}

15
DSWeb/Areas/MvcShipping/Viewsjs/WMSNew/WMSNewINEdit.js
Unescape Escape View File

@ -3072,6 +3072,9 @@ Ext.extend(Shipping.WMSNewINEdit, Ext.Panel, {
},
WMSINAfterEdit: function (editor, e, eOpts) {
var data = this.formEdit.getForm().getValues();
if (!BLNO && data.BLNO) BLNO = data.BLNO;
if (COMPANYID == "" || DEPTGID == "") {
alert("登录信息不全，请退出重新登录");
returen;
@ -3378,7 +3381,11 @@ Ext.extend(Shipping.WMSNewINEdit, Ext.Panel, {
}
},
WMSINBeforeEdit: function (editor, e, eOpts) {
WMSINBeforeEdit: function (editor, e, eOpts, a, b, c, d) {
var data = this.formEdit.getForm().getValues();
if (!BLNO && data.BLNO) BLNO = data.BLNO;
//需要自己实现里面的事件
if (COMPANYID == "" || DEPTGID == "") {
alert("登录信息不全，请退出重新登录");
@ -3389,7 +3396,13 @@ Ext.extend(Shipping.WMSNewINEdit, Ext.Panel, {
var codeGoodsId = e.record.data.GOODSNAMEID;
this.storeGoodsDetailsList.load({ params: { codegoodsid: codeGoodsId }});
}
if (e.field === 'CNTRNO') {//箱号
//如果箱号为空 且箱型不为空 载入箱号store
if (!e.record.data.CNTRNO && e.record.data.CTNALL) {
this.storeCNTRNO.load({ params: { mblno: BLNO, ctnall: e.record.data.CTNALL } });
}
}
},
InitData: function () {

Write Preview
Loading…
Cancel
Save