chenjingyong
/
DSWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20230705 入库确认改为可配置，结束值固定为1003

Browse Source
temp
dengyu 1 year ago
parent 4a8100579a
commit bb6cf03809
6 changed files with 118 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
Vol.Vue/config/buttons.js
Unescape Escape View File

@ -213,7 +213,7 @@ let buttons = [{
type: 'success',
index: 7,//显示的位置
onClick: function () {
this.saveandpushStatus("1032");
this.pushStatus("1032");
}
}, {
name: "货转驳回提交",
@ -290,7 +290,7 @@ let buttons = [{
type: 'success',
index: 7,//显示的位置
onClick: function () {
this.saveandpushStatus("1042");
this.pushStatus("1042");
}
}, {
name: "取消提交移库",

56
Vue.Net/VOL.WMS/Services/WMS/Partial/VW_OP_WMS_MOVEService.cs
Unescape Escape View File

@ -23,6 +23,7 @@ using System.Text.RegularExpressions;
using VOL.Core.Services;
using ConvertHelper;
using VOL.Core.Configuration;
using VOL.System.Services;
namespace VOL.WMS.Services
{
@ -486,18 +487,63 @@ namespace VOL.WMS.Services
else
{
if ((CurrStatus == "1000" ) && execution == "1040")
//if ((CurrStatus == "1000" ) && execution == "1040")
//{
// return MakeWMS(head);
//}
//if (CurrStatus == "1040" && execution == "10401")
//{
// return UnMakeWMS(head, execution);
//}
var currBillStatus = CurrStatus;
if (currBillStatus == null) currBillStatus = "1000";
//Logger.PushStatus_PUB("移库", 货转执行, execution);
//var mesbase = "该业务目前不能执行该动作";
//var message = execution + "成功";
var doexecution = execution;
_r = Sys_Task_Progress_IndexService.Instance.DoExecution(ref currBillStatus, ref execution);
if (!_r.Status) return _r;
message = _r.Message;
//20230426 增加出库计划审批的流程控制
//status分为 1000 1700 1701 1799
//Execution 1070推进 10701驳回
//if (CurrStatus == false && execution == "1070")
if (currBillStatus == "1040")
{
//message = "[入库审核]成功";
//审核完成 做
return MakeWMS(head);
}
if (CurrStatus == "1040" && execution == "10401")
else if (CurrStatus == "1030" && (doexecution == "10301"))
{
//message = "[入库审核]成功";
head.REMARK += "\r\n" + reason;
return UnMakeWMS(head, execution);
var result = UnMakeWMS(head, execution);
return result;
}
else
{
//仅推进状态或驳回 但未完结 也不是从完结状态驳回
//仅修改状态
_webResponse.OK(message);
head.BILLSTATUS = currBillStatus;
}
return _r.Error(message);
}

5
Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs
Unescape Escape View File

@ -1104,6 +1104,11 @@ namespace VOL.WMS.Services
wmsbase.GOODSMODEL_DATE_10 = 入库计划明细.GOODSMODEL_DATE_10;
wmsbase.RULEPRICE = 入库计划明细.RULEPRICE;
if (wmsbase.RULEPRICE == null || wmsbase.RULEPRICE == 0) {
if (wmsbase.RULEUNITCOUNT != null && wmsbase.RULEUNITCOUNT > 0 && wmsbase.RULEAMOUNT != null && wmsbase.RULEAMOUNT > 0) {
wmsbase.RULEPRICE = wmsbase.RULEAMOUNT / wmsbase.RULEUNITCOUNT;
}
}
wmsbase.CUSTOMSINSPECTION = 入库计划明细.CUSTOMSINSPECTION;
wmsbase.STOREHOUSEINSPECTION = 入库计划明细.STOREHOUSEINSPECTION;

69
Vue.Net/VOL.WMS/Services/WMSINDO/Partial/VW_OP_WMS_IN_DOService.cs
Unescape Escape View File

@ -29,6 +29,7 @@ using ConvertHelper;
using VOL.Core.Configuration;
using VOL.System.Repositories;
using static System.Windows.Forms.AxHost;
using VOL.System.Services;
namespace VOL.WMS.Services
{
@ -1444,6 +1445,7 @@ namespace VOL.WMS.Services
var mesbase = "该业务目前不能执行该动作";
var message = mesbase;
/*
if (AppSetting.CompanySetting.INDOStep != null ) {
//
if (AppSetting.CompanySetting.INDOStep == 1) {
@ -1471,7 +1473,6 @@ namespace VOL.WMS.Services
}
}
}
if (CurrStatus == "1000" && execution == "1001") {
//20210914 增加判断 如此时没有入库日期的话 返回错误
@ -1481,9 +1482,6 @@ namespace VOL.WMS.Services
入库执行.BILLSTATUS = "1001";
message = "[入库执行]成功";
}
if (CurrStatus == "1001" && execution == "10011")
{
@ -1522,21 +1520,70 @@ namespace VOL.WMS.Services
//message = "[入库审核-撤回]成功";
return OP_WMS_IN_DOService.Instance.UnMakeWMS(入库执行);
}
*/
var currBillStatus = CurrStatus;
if (currBillStatus == null) currBillStatus = "1000";
var doexecution = execution;
_r = Sys_Task_Progress_IndexService.Instance.DoExecution(ref currBillStatus, ref execution);
if (!_r.Status) return _r;
message = _r.Message;
//20230705 入库执行改为可配置 但1003固定为完成
//if (CurrStatus == false && execution == "1070")
if (currBillStatus == "1003")
{
//审核完成 做
入库执行.BILLSTATUS = currBillStatus;
return OP_WMS_IN_DOService.Instance.MakeWMS(入库执行);
}
else if (CurrStatus == "1003" && (currBillStatus != "1003"))
{
入库执行.REMARK += "\r\n" + reason;
入库执行.BILLSTATUS = currBillStatus;
return OP_WMS_IN_DOService.Instance.UnMakeWMS(入库执行);
}
//else if (CurrStatus == "1000" && (doexecution == "10001"))
//{
// 入库执行.REMARK += "\r\n" + reason;
// return OP_WMS_IN_DOService.Instance.UnMakeWMS(入库执行);
if (message == mesbase)
//}
else
{
SaveResult r = new SaveResult(
入库执行, message, false
);
return _r.Error_Data(r, message);
//仅推进状态或驳回 但未完结 也不是从完结状态驳回
//仅修改状态
_webResponse.OK(message);
入库执行.BILLSTATUS = currBillStatus;
}
//return _r.Error(message);
//if (message == mesbase)
//{
// SaveResult r = new SaveResult(
// 入库执行, message, false
// );
// return _r.Error_Data(r, message);
//}
repository.Update(入库执行,true);
//_r.Data = saveModel.MainData;
if(CurrStatus!= 入库执行.BILLSTATUS)
_r.Data = GetHead(WMSDOID,message);
//if(CurrStatus!= 入库执行.BILLSTATUS)
_r.Data = GetHead(WMSDOID,message);
return _r.OK(message, ((SaveResult)_r.Data).data);

1
Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_DOService.cs
Unescape Escape View File

@ -3754,6 +3754,7 @@ namespace VOL.WMS.Services
{
var chfee = new Ch_fee();
chfee = OP_WMS_FEEService.MakeChFee(wmsfee, codefeelist);
chfee.GID = Guid.NewGuid().ToString();
chfee.BSNO = 出库执行.WMSDOID.ToString();
chfee.BXGID = 出库执行.WMSDOID.ToString();
Ch_feeRepository.Instance.Add(chfee, true);

1
Vue.Net/VOL.WebApi/appsettings.json
Unescape Escape View File

@ -64,6 +64,7 @@
//金港
//"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_JGZHWL;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_QDHGTY;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_CS;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//全盛时代

Write Preview
Loading…
Cancel
Save