diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
index 969aef8e..9e9df487 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
@@ -31,7 +31,11 @@ export default {
-
+
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
index e03d66d6..07222ad5 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js
@@ -1,16 +1,29 @@
import html from "html";
+import { reactive, ref } from "vue";
export default {
- template: html`
+ template: html`
-
{{item.title}}
+
+
+
+
{{item.title}}
-
+
-
-
{{val}}
+
+
+
+
+
{{row[item.dataKey]}}
+
+
+
+
+
+
+ 确定
+
+ `,
styles: html` `,
setup() {
const fileList = ref([]);
@@ -154,45 +163,11 @@ export default {
}
await post(url, formData, method);
};
- const formInline = reactive({
- oldInvBillNum: "",
- invBillNum: "",
- settleDate: "",
- invGroupNum: "",
- lu: "",
- pn: "",
- qty: null,
- groupNum: "",
- });
//create
const invoiceValue = ref([]);
- const submitForm = () => {
- const newFormInline = { ...formInline };
- invoiceValue.value.push(newFormInline);
- Object.keys(formInline).forEach((key) => {
- delete formInline[key];
- });
- innerVisible.value = false;
- };
- //delete
- const selectedRows = ref([]);
- const deleteRow = async () => {
- const indexes = selectedRows.value.map((row) => invoiceValue.value.indexOf(row));
- indexes.forEach((index) => {
- invoiceValue.value.splice(index, 10000000000);
- });
- selectedRows.value = [];
- };
- const innerVisible = ref(false);
- const openImport = ref(false);
+ const addDialogVisible = ref(false);
+ const importDialogVisible = ref(false);
const dialogVisible = ref(false);
- const handleClose = (done) => {
- ElMessageBox.confirm("确认关闭")
- .then(() => {
- done();
- })
- .catch(() => {});
- };
const config = useConfig();
const drawer = ref(false);
const loading = ref(false);
@@ -213,6 +188,28 @@ export default {
loading.value = false;
};
const columns1 = [
+ {
+ dataKey: "version",
+ title: "期间",
+ },
+ {
+ dataKey: "invbillNum",
+ title: "发票号",
+ },
+ {
+ dataKey: "invGroupNum",
+ title: "发票分组号",
+ },
+ {
+ dataKey: "settleGroupNum",
+ title: "结算分组号",
+ },
+ {
+ dataKey: "amt",
+ title: "金额",
+ },
+ ];
+ const columns2 = [
{
key: "version",
dataKey: "version",
@@ -247,15 +244,11 @@ export default {
title: "业务分类",
},
];
- const columns2 = [
+ const columns3 = [
{
dataKey: "version",
title: "期间",
},
- {
- dataKey: "invbillNum",
- title: "发票号",
- },
{
dataKey: "invGroupNum",
title: "发票分组号",
@@ -265,32 +258,127 @@ export default {
title: "结算分组号",
},
{
- dataKey: "amt",
- title: "金额",
+ dataKey: "lu",
+ title: "可结算分组号",
+ },
+ {
+ dataKey: "lu1",
+ title: "不可结算分组号",
},
];
- const columns3 = [
+ const columns4 = [
{
- dataKey: "version",
- title: "期间",
+ dataKey: "oldInvBillNum",
+ title: "作废发票号",
+ },
+ {
+ dataKey: "invBillNum",
+ title: "发票号",
+ },
+ {
+ dataKey: "settleDate",
+ title: "下线日期",
},
{
dataKey: "invGroupNum",
title: "发票分组号",
},
{
- dataKey: "settleGroupNum",
- title: "结算分组号",
+ dataKey: "lu",
+ title: "零件号",
},
{
- dataKey: "lu",
- title: "可结算分组号",
+ dataKey: "pn",
+ title: "标识号",
},
{
- dataKey: "lu1",
- title: "不可结算分组号",
+ dataKey: "qty",
+ title: "数量",
+ },
+ {
+ dataKey: "groupNum",
+ title: "结算分组",
},
];
+ const columns5 = columns4.filter((o) => o.dataKey !== "oldInvBillNum" && o.dataKey !== "invGroupNum");
+ columns5.unshift({
+ input: "selection",
+ });
+ //
+ const setupRef = ref(1);
+ const adjListRef = ref(null);
+ const adjList = ref([]);
+ const showSetupDialog = () => {
+ adjList.value = [];
+ for (let i = 0; i < 100; i++) {
+ adjList.value.push({ invBillNum: i });
+ }
+ setupRef.value = 1;
+ dialogVisible.value = true;
+ };
+ const deleteAdj = () => {
+ const list = adjListRef.value.getSelection();
+ list.forEach((o) => adjList.value.splice(o, 1));
+ adjListRef.value.clearSelection();
+ };
+ const adjSchema = {
+ type: "object",
+ properties: {
+ invBillNum: {
+ type: "string",
+ title: "发票号",
+ rules: [{ required: true }],
+ },
+ settleDate: {
+ type: "string",
+ title: "下线日期",
+ input: "datetime",
+ rules: [{ required: true }],
+ },
+ lu: {
+ type: "string",
+ title: "零件号",
+ rules: [{ required: true }],
+ },
+ pn: {
+ type: "string",
+ title: "标识号",
+ rules: [{ required: true }],
+ },
+ qty: {
+ type: "string",
+ title: "数量",
+ input: "number",
+ rules: [{ required: true }],
+ },
+ groupNum: {
+ type: "string",
+ title: "结算分组",
+ rules: [{ required: true }],
+ },
+ },
+ };
+ const defaultAdjModel = schemaToModel(adjSchema);
+ const adjModel = ref(Object.assign({}, defaultAdjModel));
+ const addAdjFormRef = ref(null);
+ const addAdj = () => {
+ adjModel.value = Object.assign({}, defaultAdjModel);
+ addDialogVisible.value = true;
+ };
+ const submitAdj = async () => {
+ try {
+ const valid = await addAdjFormRef.value.validate();
+ if (valid) {
+ adjList.value.unshift(JSON.parse(JSON.stringify(adjModel.value)));
+ addDialogVisible.value = false;
+ }
+ } catch (error) {
+ console.log(error);
+ }
+ };
+ const importAdj = async () => {
+ importDialogVisible.value = true;
+ };
return {
config,
onCommand,
@@ -300,17 +388,26 @@ export default {
columns1,
columns2,
columns3,
- innerVisible,
+ columns4,
+ columns4,
+ columns5,
+ addDialogVisible,
dialogVisible,
- handleClose,
prop,
- formInline,
- submitForm,
invoiceValue,
- deleteRow,
- selectedRows,
- openImport,
+ importDialogVisible,
openImportHandler,
+ setupRef,
+ showSetupDialog,
+ adjList,
+ adjListRef,
+ deleteAdj,
+ addAdj,
+ submitAdj,
+ addAdjFormRef,
+ adjSchema,
+ adjModel,
+ importAdj,
};
},
};
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
index 1fbedb52..3b7c8ad9 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
@@ -229,7 +229,7 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
o.factory == data.factory &&
o.Configcode == data.Configcode);
- var log = new VmiLog
+ var log = new VmiLog(GuidGenerator.Create())
{
LogType = logType,
ChangedType = VmiType.In,
@@ -308,7 +308,7 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
o.OrderNum == data.OrderNum &&
o.factory == data.factory &&
o.Configcode == data.Configcode);
- var log = new VmiLog
+ var log = new VmiLog(GuidGenerator.Create())
{
LogType = logType,
ChangedType = VmiType.Out,
@@ -415,8 +415,12 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
[HttpPost]
public async Task BalanceExport(RequestDto input)
{
- var entities = await _balanceRepository.WhereIf(input.Filters?.Count != 0, input.Filters.ToLambda())
- .ToListAsync().ConfigureAwait(false);
+ IQueryable query = _balanceRepository.WhereIf(input.Filters?.Count != 0, input.Filters.ToLambda());
+ if (!string.IsNullOrEmpty(input.Sorting))
+ {
+ query = DynamicQueryableExtensions.OrderBy(query, input.Sorting);
+ }
+ var entities = await query.ToListAsync().ConfigureAwait(false);
var fileName = $"库存余额_{DateTime.Now.ToString("yyyy-MM-dd_HH:mm:ss")}.xlsx";
var content = this.GetContent(entities, "库存备份");
await _fileContainer.SaveAsync(fileName, content, true).ConfigureAwait(false);
@@ -424,34 +428,54 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
}
///
- /// 补货数据导出
+ /// 库存事务查询
///
+ ///
+ ///
[HttpPost]
- public async Task ReplenishedExportAsync(RequestDto input)
+ public async Task> Log(LogRequestDto input)
{
- var entities = await _logRepository.WhereIf(input.Filters?.Count != 0, input.Filters.ToLambda())
- .ToListAsync().ConfigureAwait(false);
- var fileName = $"补货数据_{DateTime.Now.ToString("yyyy-MM-dd_HH:mm:ss")}.xlsx";
- var content = this.GetContent(entities, "补货数据_");
+ var entities = await _logRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false);
+ var totalCount = await _logRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
+ return new PagedResultDto(totalCount, entities);
+ //return QueryLogFromTSDb(input);
+ }
+
+ ///
+ /// 库存事务导出
+ ///
+ [HttpPost]
+ public async Task LogExport(RequestDto input)
+ {
+ IQueryable query = _logRepository.WhereIf(input.Filters?.Count != 0, input.Filters.ToLambda());
+ if (!string.IsNullOrEmpty(input.Sorting))
+ {
+ query = DynamicQueryableExtensions.OrderBy(query, input.Sorting);
+ }
+ var entities = await query.ToListAsync().ConfigureAwait(false);
+ var fileName = $"库存事务_{DateTime.Now.ToString("yyyy-MM-dd_HH:mm:ss")}.xlsx";
+ var content = this.GetContent(entities, "库存事务_");
await _fileContainer.SaveAsync(fileName, content, true).ConfigureAwait(false);
return fileName;
}
///
- /// 库存事务查询
+ /// 补货数据导出
///
- ///
- ///
[HttpPost]
- public async Task> Log(LogRequestDto input)
+ public async Task ReplenishedExportAsync(RequestDto input)
{
- var query = _logRepository.WhereIf(input.Filters?.Count != 0, input.Filters.ToLambda())
- .WhereIf(input.LogTypes?.Count != 0, o => input.LogTypes.Contains(o.LogType));
- var totalCount = await query.CountAsync().ConfigureAwait(false);
- query = string.IsNullOrEmpty(input.Sorting) ? query : DynamicQueryableExtensions.OrderBy(query, input.Sorting);
- var entities = query.Skip(input.SkipCount).Take(input.MaxResultCount).ToList();
- return new PagedResultDto(totalCount, entities);
- //return QueryLogFromTSDb(input);
+ IQueryable query = _logRepository.WhereIf(input.Filters?.Count != 0, input.Filters.ToLambda());
+ query = query.Where(o => o.IsReplenished.HasValue && o.IsReplenished.Value == true);
+ if (!string.IsNullOrEmpty(input.Sorting))
+ {
+ query = DynamicQueryableExtensions.OrderBy(query, input.Sorting);
+ }
+ var entities = await query.ToListAsync().ConfigureAwait(false);
+ var fileName = $"补货数据_{DateTime.Now.ToString("yyyy-MM-dd_HH:mm:ss")}.xlsx";
+ var content = this.GetContent(entities, "补货数据_");
+ await _fileContainer.SaveAsync(fileName, content, true).ConfigureAwait(false);
+ return fileName;
}
private PagedResultDto QueryLogFromTSDb(RequestDto input)
@@ -547,7 +571,7 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
{
log.LogType = VmiLogType.Type600;
log.ChangedType = VmiType.Out;
- log.Qty=-log.Qty;
+ log.Qty = -log.Qty;
await this.Out(VmiLogType.Type600, null, log).ConfigureAwait(false);
}
}