diff --git a/UFIDA.U8.Framework.Api.Common/Entity/SysU8FieldDefine.cs b/UFIDA.U8.Framework.Api.Common/Entity/SysU8FieldDefine.cs index 7913ed7..6dba63a 100644 --- a/UFIDA.U8.Framework.Api.Common/Entity/SysU8FieldDefine.cs +++ b/UFIDA.U8.Framework.Api.Common/Entity/SysU8FieldDefine.cs @@ -59,7 +59,7 @@ namespace UFIDA.U8.Framework.Api.Common.Entity [SugarColumn(ColumnName = "iSort", IsNullable = true)] public int? iSort { get; set; } - [SugarColumn(ColumnName = "iSort", IsNullable = true)] + [SugarColumn(ColumnName = "bEnable", IsNullable = true)] public bool? bEnable { get; set; } diff --git a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs index 1cd9fe3..133a238 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs @@ -22,7 +22,7 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST { try { - var co = "USERPCO.USERPCO".GetComObject(); + var co = "USERPCO.VoucherCO".GetComObject(); var errorMsg = ""; @@ -52,10 +52,11 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST var newCode = co.GetNewVouchCode(sVouchType, domHead, ref errorMsg); logInfo.Debug($"获取新单号:{newCode}"); - //if (!string.IsNullOrWhiteSpace(newCode)) - //{ - // object value = domHead.SetDomKeyValue(codeKey, newCode); - //} + + if (!string.IsNullOrWhiteSpace(newCode)) + { + object value = CommonHelper.SetDomKeyValue(domHead, codeKey, newCode); + } } @@ -78,6 +79,8 @@ namespace UFIDA.U8.Framework.Api.ControlObject.ST throw ex; } + baseLogin.Connection.CommitTrans(); + if (!res.bSuccess) { res.message = "新增失败"; diff --git a/UFIDA.U8.Framework.Api/App_Data/API_Meta.db b/UFIDA.U8.Framework.Api/App_Data/API_Meta.db index 10c2ab9..8b049e1 100644 Binary files a/UFIDA.U8.Framework.Api/App_Data/API_Meta.db and b/UFIDA.U8.Framework.Api/App_Data/API_Meta.db differ diff --git a/UFIDA.U8.Framework.Api/App_Data/采购入库单模板.json b/UFIDA.U8.Framework.Api/App_Data/采购入库单模板.json new file mode 100644 index 0000000..45f16f3 --- /dev/null +++ b/UFIDA.U8.Framework.Api/App_Data/采购入库单模板.json @@ -0,0 +1,15 @@ +{ + "ccode": "", //单号 + "ddate": "2022-10-25", //入库日期,日期格式无时间部分 + "cwhcode": "04", //仓库编码 + "cexch_name": "人民币", + "cmaker": "demo", //制单人 + "cmemo": "", //备注 + "body": [ + { + "cinvcode": "F010-80102251", //存货编码 + "iquantity": 10, //数量 + "dmadedate": "2022-10-10", //生产日期,日期格式无时间部分,没有启动保质期管理可以不用录入 + } + ] +} \ No newline at end of file diff --git a/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs b/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs index aa324ee..5a5f629 100644 --- a/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs +++ b/UFIDA.U8.Framework.Api/Controllers/U8/STController.cs @@ -233,6 +233,8 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8 } } + input[voucherInfo.BodyName] = bodyData; + var co = new USERPCO(); var res = await co.Insert(baseLogin, input, voucherInfo.VoucherType, bGetCode, codeKey, bCheck, bBeforCheckStock, bIsRedVouch, sAddedState, bReMote); diff --git a/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj b/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj index f057df1..55d9ec7 100644 --- a/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj +++ b/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj @@ -482,6 +482,7 @@ PreserveNewest + Designer