diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
index 56fa4244..b6c7a003 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
@@ -812,6 +812,39 @@ export default {
}
return postData;
}
+ const action = async (method, confirMmessage = "确认操作吗?", successMessage = "操作成功", reload = true) => {
+ try {
+ await ElMessageBox.confirm(confirMmessage, "提示", {
+ type: "warning",
+ });
+ tableLoading.value = true;
+ let result = null;
+ if (method.constructor.name == "AsyncFunction") {
+ result = await method();
+ } else {
+ result = method();
+ }
+ if (!result.errors) {
+ await ElMessage({
+ type: "info",
+ message: successMessage,
+ });
+ if (reload) {
+ pageModel.pageIndex = 1;
+ await load();
+ }
+ }
+ } catch (error) {
+ if (error === "cancel") {
+ ElMessage({
+ type: "info",
+ message: "操作取消",
+ });
+ }
+ } finally {
+ tableLoading.value = false;
+ }
+ };
onMounted(async () => {
if (route.meta.children?.length) {
for (const item of route.meta.children) {
@@ -833,6 +866,7 @@ export default {
});
return {
load,
+ action,
config,
queryModel,
buildQuery,
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
index 2cbfcc14..43951e3c 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
@@ -36,6 +36,98 @@ const businessType = {
{ value: 8, label: "印度件" },
],
};
-export default businessType;
-export { version, state, state2, state3 };
+const transType = {
+ title: "事务类型",
+ type: "string",
+ input: "select",
+ options: [
+ { value: -1, label: "退货" },
+ { value: 1, label: "发货" },
+ ],
+};
+
+const deliverBillType = {
+ title: "发运主类型",
+ type: "string",
+ input: "select",
+ options: [
+ { value: 0, label: "无" },
+ { value: 1, label: "JIS件" },
+ { value: 2, label: "JIT直供件" },
+ { value: 3, label: "印度件" },
+ { value: 4, label: "北汽4S备件" },
+ ],
+};
+
+const deliverSubBillType = {
+ title: "发运子类型",
+ type: "string",
+ input: "select",
+ options: [
+ { value: 0, label: "无" },
+ { value: 1, label: "保险杠BBAC" },
+ { value: 2, label: "保险杠HBPO" },
+ { value: 3, label: "买单件保险杠BBAC" },
+ { value: 4, label: "买单件保险杠HBPO" },
+ { value: 5, label: "买单件小件BBAC" },
+ { value: 6, label: "买单件小件HBPO" },
+ { value: 7, label: "小件BBAC" },
+ { value: 8, label: "小件HBPO" },
+ { value: 9, label: "JIT直供件BBAC" },
+ { value: 10, label: "JIT直供件HBPO" },
+ { value: 11, label: "印度件BBAC" },
+ { value: 12, label: "北汽4S备件BBAC" },
+ ],
+};
+
+const proType = {
+ title: "业务类型",
+ type: "string",
+ input: "select",
+ options: [
+ { value: 0, label: "无" },
+ { value: 1, label: "Jit发货" },
+ { value: 2, label: "Jit补发订单" },
+ { value: 3, label: "Jit备件" },
+ { value: 4, label: "Jit买单件" },
+ { value: 5, label: "Jit匹配件" },
+ { value: 6, label: "Jis发货" },
+ { value: 7, label: "Jis备件" },
+ { value: 8, label: "Jis买单件" },
+ { value: 9, label: "Jis匹配件" },
+ { value: 10, label: "Jis补发订单" },
+ { value: 11, label: "Jis退货" },
+ { value: 12, label: "Jis备件退货" },
+ { value: 13, label: "Jis买单件退货" },
+ { value: 14, label: "Jis匹配件退货" },
+ { value: 15, label: "Jis补发订单退货" },
+ { value: 16, label: "Jit退货" },
+ { value: 17, label: "Jit备件退货" },
+ { value: 18, label: "Jit买单件退货" },
+ { value: 19, label: "Jit匹配件退货" },
+ { value: 20, label: "Jit补发订单退货" },
+ { value: 21, label: "北汽4S发货" },
+ { value: 22, label: "HBPO发货" },
+ { value: 23, label: "直供件发货" },
+ { value: 24, label: "印度件发货" },
+ { value: 25, label: "北汽4S退货" },
+ { value: 26, label: "HBPO退货" },
+ { value: 27, label: "直供件退货" },
+ { value: 28, label: "印度件退货" },
+ ],
+};
+
+const billState = {
+ title: "状态",
+ type: "string",
+ input: "select",
+ options: [
+ { value: 0, label: "新建" },
+ { value: 1, label: "部分执行" },
+ { value: 2, label: "完成" },
+ ],
+};
+
+export default businessType;
+export { version, state, state2, state3, transType, deliverBillType, deliverSubBillType, proType, billState };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/fa-yun.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/fa-yun.js
index dca0e093..4e91019a 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/fa-yun.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/fa-yun.js
@@ -1,92 +1,155 @@
-const schema = {
- title: "JIS发运数据",
+import { version, transType, deliverBillType, deliverSubBillType, proType, billState } from "../_options.js";
+
+const schema1 = {
+ title: "发运数据",
type: "object",
properties: {
- wmsBillNum: {
- title: "发货单号",
+ version,
+ shippingDate: {
+ title: "发货时间",
type: "string",
+ input: "datetime",
},
- num: {
- title: "单据编号",
+ wmsBillNum: {
+ title: "WMS发货单号",
type: "string",
},
- billTime: {
- title: "发货时间",
+ lu: {
+ title: "客户零件号",
type: "string",
- input: "datetime",
},
- oper: {
- title: "发货人",
+ factoryPartCode: {
+ title: "厂内零件号",
type: "string",
},
- orderNum: {
- title: "排序单号",
+ pn: {
+ title: "生产号",
type: "string",
},
- seq: {
- title: "订单序号",
- type: "string",
+ // 已废除
+ // keyCode: {
+ // hidden: true,
+ // },
+ qty: {
+ type: "number",
+ title: "数量",
},
- realCode: {
- title: "实际生产码",
+ jisNum: {
+ title: "JIT订单号",
type: "string",
},
vinCode: {
- title: "订单生产码",
+ title: "JIT排序生产码",
type: "string",
},
codeType: {
- title: "生产码类型",
- type: "string",
- },
- realPartCode: {
- title: "实际零件号",
+ title: "JIT排序生产码类型",
type: "string",
},
partCode: {
title: "零件号",
type: "string",
},
+ realPartCode: {
+ title: "真实零件号",
+ type: "string",
+ },
batch: {
title: "批次",
type: "string",
},
- mesConfigCode: {
- title: "MES配置码",
+ custPartCode: {
+ title: "客户零件号",
type: "string",
},
- fromLoc: {
- title: "来源库位",
+ seq: {
+ title: "订单序号",
type: "string",
},
- toLoc: {
- title: "目标库位",
+ assembleData: {
+ title: "订单时间",
type: "string",
+ input: "datetime",
},
- refVinCode: {
- title: "参照订单生产码",
+ deliverCode: {
+ title: "发货条码",
type: "string",
},
- billCharacter: {
- title: "单据性质",
+ billNum: {
+ title: "发货单号",
type: "string",
},
- refBillNum: {
- title: "发货关联单号",
+ billTime: {
+ title: "发货时间",
type: "string",
+ input: "datetime",
},
- erpToLoc: {
- title: "Erp目标库位",
+ oper: {
+ title: "发货人",
+ type: "string",
+ },
+ factory: {
+ title: "工厂",
+ type: "string",
+ },
+ mesConfigCode: {
+ title: "MES配置码",
+ type: "string",
+ },
+ toLoc: {
+ title: "目标库位",
+ type: "string",
+ },
+ // 已废除
+ // billType: {
+ // },
+ // 已废除
+ // subBillType: {,
+ // },
+ transType,
+ deliverBillType,
+ deliverSubBillType,
+ billCharacter: {
+ title: "单据性质",
type: "string",
},
origiCode: {
title: "原生产码",
type: "string",
},
+ partDesc: {
+ title: "描述",
+ type: "string",
+ },
remark: {
title: "备注",
type: "string",
},
+ proType,
+ orderNum: {
+ title: "JIS排序单号",
+ type: "string",
+ },
+ realCode: {
+ title: "JIS实际生产码",
+ type: "string",
+ },
+ fromLoc: {
+ title: "来源库位",
+ type: "string",
+ },
+ refVinCode: {
+ title: "参照订单生产码",
+ type: "string",
+ },
+ refBillNum: {
+ title: "发货关联单号",
+ type: "string",
+ },
+ erpToLoc: {
+ title: "Erp目标库位",
+ type: "string",
+ },
uniqueCode: {
title: "塑件唯一码",
type: "string",
@@ -99,27 +162,167 @@ const schema = {
title: "虚拟小总成",
type: "string",
},
- deliverCode: {
- title: "发货条码",
+ state: billState,
+ createTime: {
+ title: "创建时间",
+ type: "string",
+ input: "datetime",
+ },
+ isHaveEdiData: {
+ title: "是否有EDI数据",
+ type: "boolean",
+ },
+ },
+};
+
+const schema2 = {
+ title: "发运数据",
+ type: "object",
+ properties: {
+ assembleData: {
+ title: "订单时间",
+ type: "string",
+ input: "datetime",
+ },
+ batch: {
+ title: "批次",
+ type: "string",
+ },
+ billNum: {
+ title: "发货单号",
+ type: "string",
+ },
+ billTime: {
+ title: "发货时间",
+ type: "string",
+ input: "datetime",
+ },
+ custId: {
+ title: "客户",
+ type: "string",
+ },
+ // 已废除
+ // billType: {
+ // },
+ createTime: {
+ title: "创建时间",
+ type: "string",
+ input: "datetime",
+ },
+ custPartCode: {
+ title: "客户零件号",
+ type: "string",
+ },
+ deliverBillType,
+ deliverSubBillType,
+ deliveryHose: {
+ title: "发货仓库",
+ type: "string",
+ },
+ deliveryIndex: {
+ title: "交付索引",
+ type: "string",
+ },
+ dnBillNum: {
+ title: "DN单据号",
+ type: "string",
+ },
+ dnBillTime: {
+ title: "DN单据时间",
+ type: "string",
+ input: "datetime",
+ },
+ dnOper: {
+ title: "DN单添加人",
type: "string",
},
- position: {
- title: "客户位置",
+ factoryPartCode: {
+ title: "厂内零件号",
+ type: "string",
+ },
+ fromErpLocCode: {
+ title: "来源ERP库存",
+ type: "string",
+ },
+ fromHose: {
+ title: "来源仓库",
+ type: "string",
+ },
+ fromLocCode: {
+ title: "来源库位",
+ type: "string",
+ },
+ // keyCode: {
+ // title: "组合键值",
+ // type: "string",
+ // },
+ lu: {
+ title: "客户零件号",
+ type: "string",
+ },
+ oper: {
+ title: "发货人",
+ type: "string",
+ },
+ partCode: {
+ title: "零件号",
+ type: "string",
+ },
+ pn: {
+ title: "生产号",
+ type: "string",
+ },
+ proType,
+ qty: {
+ title: "数量",
+ type: "number",
+ },
+ remark: {
+ title: "备注",
+ type: "string",
+ },
+ shippingDate: {
+ title: "发货时间",
+ type: "string",
+ input: "datetime",
+ },
+ state: billState,
+ //subBillType,
+ toErpLocCode: {
+ title: "目标Erp库位",
+ type: "string",
+ },
+ toHose: {
+ title: "目标仓库",
+ type: "string",
+ },
+ toLocCode: {
+ title: "目标库位",
+ type: "string",
+ },
+ transType,
+ version,
+ wmsBillNum: {
+ title: "WMS发货单号",
type: "string",
},
},
};
export default function (businessType) {
+ let schema = null;
let service = null;
let syncService = null;
if (businessType === "JisBBAC") {
+ schema = schema1;
service = "bbac_se_detail_service";
syncService = "bbacse-sync/invoke";
} else if (businessType === "JisHBPO") {
+ schema = schema1;
service = "hbpo_se_detail_service";
syncService = "hbpose-sync/invoke";
} else {
+ schema = schema2;
service = "pub_se_detail_service";
syncService = "hand-se-sync/sync";
}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
index 9113a338..bf68968d 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
@@ -11,7 +11,7 @@ export default [
createButton("create", "title=新建&isTop=true"),
createButton("update", "title=编辑"),
createButton("delete", "title=删除&disabled=o=>o.userName==='admin'"),
- createButton("%s/reset-password", "title=重置密码&method=PUT"),
+ createButton("reset-password", "title=重置密码&method=PUT"),
],
},
{
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/role.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/role.js
index dc0ca43c..38225c35 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/role.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/role.js
@@ -1,17 +1,2 @@
-import AppList from "../../components/list/index.js";
-import html from "html";
-import useConfig from "../../models/base-data/role.js";
-
-export default {
- components: { AppList },
- template: html``,
- setup() {
- // 变量定义
- const config = useConfig();
- // 函数定义
- const onCommand = (item, rows) => {
- console.log(item.path, item, rows);
- };
- return { config, onCommand };
- },
-};
+import useList from "../_list.js";
+export default useList("base-data/role");
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js
index 38c44650..f7a38935 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/user.js
@@ -2,45 +2,24 @@ import AppList from "../../components/list/index.js";
import html from "html";
import useConfig from "../../models/base-data/user.js";
import request from "../../request/index.js";
-import { format } from "../../utils/index.js";
-import { ElMessage, ElMessageBox } from "element-plus";
+import { ref } from "vue";
export default {
components: { AppList },
- template: html``,
+ template: html``,
setup() {
+ const appListRef = ref(null);
const config = useConfig();
const onCommand = async (item, rows) => {
- console.log(item.path, item, rows);
- if (item.path === "%s/reset-password") {
- const url = format(item.path, rows[0].id);
- await request(`base/user/${url}`, null, { method: item.meta.method });
- try {
- await ElMessageBox.confirm(format("是否重置用户%s密码", rows[0].userName), "提示", {
- type: "warning",
- });
- await ElMessage({
- type: "info",
- message: "密码已经成功重置为123456",
- });
- const url = `${config.baseUrl}/${item.path}`;
- await request(
- url,
- rows.map((o) => o.id),
- { method: "POST" }
- );
- console.log(context);
- await load();
- } catch (error) {
- if (error === "cancel") {
- ElMessage({
- type: "info",
- message: "操作取消",
- });
- }
- }
+ if (item.path === "reset-password") {
+ const url = `base/user/${rows[0].id}/${item.path}`;
+ await appListRef.value.action(
+ async () => await request(url, null, { method: item.meta.method }),
+ `是否重置用户${rows[0].userName}密码`,
+ `${rows[0].userName}密码已经重置为123456`
+ );
}
};
- return { config, onCommand };
+ return { appListRef, config, onCommand };
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
index 31caae39..86df3ca5 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js
@@ -50,7 +50,7 @@ export default {
-
+
新建
@@ -60,27 +60,25 @@ export default {
-
+
-
-
-
- 新建
- 导入
- 删除
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
导入调整明细
@@ -139,10 +137,11 @@ export default {
.el-dialog__body {
height: calc(100% - 120px);
}
+ /*
.re-open .el-scrollbar,
.re-open .el-scrollbar__view {
height: calc(100% - 120px);
- }
+ } */
`,
props: ["modelValue", "data", "isBusiness"],
emit: ["update:modelValue"],
@@ -281,6 +280,24 @@ export default {
...columns4.properties,
},
};
+ const setup2columns = {
+ lu: {
+ type: "string",
+ title: "零件号",
+ },
+ price: {
+ type: "number",
+ title: "单价",
+ },
+ qty: {
+ type: "number",
+ title: "数量",
+ },
+ amt: {
+ type: "number",
+ title: "金额",
+ },
+ };
delete columns5.properties["oldInvBillNum"];
delete columns5.properties["invGroupNum"];
//显示重开发票对话框
@@ -291,6 +308,8 @@ export default {
const adjListRef = ref(null);
const addDialogVisible = ref(false);
const importDialogVisible = ref(false);
+ const setup2table1Ref = ref(null);
+ const setup2table2Ref = ref(null);
const showSetupDialog = () => {
//重开发票号
//invBillNum=
@@ -361,6 +380,9 @@ export default {
if (valid) {
adjList.value.unshift(adjModel.value);
addDialogVisible.value = false;
+ nextTick(() => {
+ scrollRef.value.update();
+ });
}
} catch (error) {
console.log(error);
@@ -406,6 +428,9 @@ export default {
if (!result.errors) {
adjList.value = result.data;
importDialogVisible.value = false;
+ nextTick(() => {
+ scrollRef.value.update();
+ });
}
}
} catch (error) {
@@ -417,21 +442,28 @@ export default {
const next = async () => {
if (setupRef.value === 1) {
try {
- // const url = "settleaccount/adj_service/check-import";
- // const result = await request(url, adjList.value, { method: "POST" });
- // if (!result.errors) {
- // if (result.data?.code === 200) {
- // setupRef.value += 1;
- // } else if (result.data?.code === 400 && result.data.fileName) {
- // window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
- // }
- // }
setupRef.value += 1;
+ //处理高亮
+ nextTick(() => {
+ console.log(setup2table1Ref.value);
+ console.log(setup2table2Ref.value);
+ });
} catch (e) {
console.log(e);
}
+ } else if (setupRef.value === 2) {
+ // const url = "settleaccount/adj_service/check-import";
+ // const result = await request(url, adjList.value, { method: "POST" });
+ // if (!result.errors) {
+ // if (result.data?.code === 200) {
+ // setupRef.value += 1;
+ // } else if (result.data?.code === 400 && result.data.fileName) {
+ // window.open(getUrl(`settleaccount/getblobfile/download/${result.data.fileName}`));
+ // }
+ // }
+ setupRef.value += 1;
} else {
- setupRef += 1;
+ setupRef.value += 1;
}
};
const submitReOpen = async () => {};
@@ -460,6 +492,7 @@ export default {
columns3,
columns4,
columns5,
+ setup2columns,
showSetupDialog,
setupRef,
setupDialogVisable,
@@ -480,6 +513,8 @@ export default {
importAdj,
scrollRef,
next,
+ setup2table1Ref,
+ setup2table2Ref,
};
},
};
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
index 200d955c..0738520f 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs
@@ -257,6 +257,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
[Display(Name = "价格结束日期")]
public DateTime EndDate { get; set; }
+
+ public Dictionary ExtraProperties { get; set; }
+
+
+
+
+
+
}
public class INVOICE_WAIT_DETAIL_REQ_DTO : RequestInputBase
{
@@ -403,6 +411,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
[Display(Name = "扩展字段2")]
public string Extend2 { get; set; }
+ public Dictionary ExtraProperties { get; set; }
+
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs
index a98f2ca9..12d2d490 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs
@@ -207,11 +207,9 @@ public class ADJ_SERVICE : BASE_SERVICE
switch (inv.BusinessType)
{
case EnumBusinessType.MaiDanJianHBPO:
-
break;
case EnumBusinessType.MaiDanJianBBAC:
-
break;
case EnumBusinessType.ZhiGongJianBBAC:
var errors1 = _pubRepository.Where(p => pnlist.Contains(p.PN));
@@ -257,30 +255,11 @@ public class ADJ_SERVICE : BASE_SERVICE
errorList.Add(new ERR_EXP_DTO() { Message = $"不能结算数据中存在发货单{p.PN}数据,不能导入调整表" });
}
-
break;
}
}
- //ExportImporter _exportImporter = new ExportImporter();
- //var result = await _exportImporter.UploadExcelImport(files, _excelImportService);
- //if (result.Count == 0)
- //{
- // throw new BusinessException("8989", "导入数据记录为0条");
- //}
- // var invs= p_list.Select(p => p.InvBillNum).ToList();//所有发票号
- //var deletels = _repository.Where(p =>invs.Contains(p.OldInvBillNum) ).ToList();//所有关联发票号的调整表
- // var invlist= _invRepository.Where(p => invs.Contains(p.InvbillNum)).ToList();//所有旧发票
- // var dlists= deletels.Where(p=>string.IsNullOrEmpty(p.InvBillNum)).ToList();//所有新发票号不为空的调整记录
- //foreach (var itm in dlists)
- //{
- // errorList.Add(new ERR_EXP_DTO() { ItemCode = $"{itm.LU}", Message = $"客户零件号{itm.LU}标识号{itm.PN}下线日期{itm.SettleDate}记录已经被重新开票,新发票号为:{itm.InvBillNum}" });
- //}
- //var first = deletels.FirstOrDefault();
- //if (!string.IsNullOrEmpty(first.InvBillNum))
- //{
- // throw new BusinessException("8989", $"调整记录已经生成新发票号:{first.InvBillNum}");
- //}
+
var entityList = ObjectMapper.Map, List>(p_list);
var codelist = entityList.Select(p => p.LU).ToList();
var errors = await _baseDomainService.CheckBase(codelist, new BASE_CONF() { IsRelationShip = true });
@@ -302,32 +281,7 @@ public class ADJ_SERVICE : BASE_SERVICE
return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, fileName = await ExportErrorReportAsync(errorList) });
}
- //var query = from itm in entityList
- // join itm1 in invlist
- // on itm.InvBillNum equals itm1.InvbillNum
- // select new PUB_ADJ_DETAIL(
- // id: GuidGenerator.Create(),
- // keyCode: itm.PN + itm.LU,
- // version: itm.Version,
- // settleBillNum: itm.SettleBillNum,
- // lU: itm.LU,
- // pN: itm.PN,
- // site: itm.Site,
- // qty: itm.Qty,
- // extend1: string.Empty,
- // price: 0,
- // invGroupNum: itm1.InvGroupNum,
- // settleDate: itm.SettleDate,
- // businessType: itm1.BusinessType,
- // groupNum: itm.GroupNum,
- // oldinv: itm.InvBillNum,
- // inv: string.Empty,
- // partcode:itm.PartCode
-
-
- // );
- //await _repository.DbContext.BulkDeleteAsync(deletels);//删除发票下所有调整明细
- //await _repository.DbContext.BulkInsertAsync(query.ToList());
+
return new JsonResult(new { Code = 200, Message = "校验成功" }); ;
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
index a70d8c25..dc2197d6 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs
@@ -49,15 +49,19 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var detailist = _detailRepository.Where(p => p_list.Contains(p.BillNum)).ToList();
- //List customConditionList = new List();
- ////customConditionList.Add(new CustomCondition() { Name = "Version", Value = input.Version });
- ////customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = input.MaterialCode });
- ////customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup });
- ////customConditionList.Add(new CustomCondition() { Name = "State", Value = string.IsNullOrEmpty(input.State) ? string.Empty : input.State });
- //var _taskid = await _service.ExportEnqueueAsync("出库单合计汇总输出", ExportExtentsion.Excel, input.Version, string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup, CurrentUser, typeof(WmsOutputSumExportService), customConditionList, (rs) =>
- //{
- //});
- //return _taskid;
+ List customConditionList = new List();
+
+ //var billList = property.Where(p => p.Name == "BillNumList").FirstOrDefault().Value;
+ //var type = property.Where(p => p.Name == "Type").FirstOrDefault().Value;
+
+ customConditionList.Add(new CustomCondition() { Name = "BillNumList", Value =string.Join(",",p_list) });
+ customConditionList.Add(new CustomCondition() { Name = "Type", Value = EnumBusinessType.JisBBAC.ToString() });
+ //customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup });
+ //customConditionList.Add(new CustomCondition() { Name = "State", Value = string.IsNullOrEmpty(input.State) ? string.Empty : input.State });
+ var _taskid = await _service.ExportEnqueueAsync("BBAC待扣减任务", ExportExtentsion.Excel, DateTime.Now.ToString("yyyyMM"), string.Empty, CurrentUser, typeof(PendingDeductionService), customConditionList, (rs) =>
+ {
+ });
+ return _taskid;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
index 6152ac6d..90c89eb6 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
@@ -180,17 +180,20 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var adj = invdetail.ADJ_DETAIL;
var classDisplayName = typeof(INVOICE_GRP_DTO).GetCustomAttribute()?.Name ?? typeof(INVOICE_GRP_DTO).Name;
string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx";
- var result = _excel
- .Append(dtoDetails,"发票表")
- .SeparateBySheet()
- .Append(m, "发票和结算分组关系")
- .SeparateBySheet()
- .Append(not, "对应未结结算分组")
- .SeparateBySheet()
- .Append(detail, "发票明细")
- .SeparateBySheet()
- .Append(adj,"发票调整单")
- .ExportAppendDataAsByteArray();
+
+ foreach (var itm in entities)
+ {
+ var invlist = detail.Where(p => p.InvbillNum == itm.InvbillNum).ToList();
+ var mgroup =m.Where(p => p.InvbillNum == itm.InvbillNum).ToList();
+ var adjp = adj.Where(p => p.InvBillNum == itm.InvbillNum).ToList();
+ _excel.Append(invlist, "发票号" + itm.InvbillNum).SeparateBySheet();
+ _excel.Append(mgroup, "发票结算分组对应" + itm.InvbillNum).SeparateBySheet();
+ _excel.Append(adj, "发票调整数据" + itm.InvbillNum).SeparateBySheet();
+ }
+ _excel.Append(not, "发票分组未结对应结算分组");
+
+
+ var result = _excel.ExportAppendDataAsByteArray();
result.ShouldNotBeNull();
//保存导出文件到服务器存成二进制
await _excelImportService.SaveBlobAsync(
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
index 3cbfc5f9..f5f1e24a 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
@@ -115,7 +115,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
ContractDocID = "no",
BeginDate = p.BeginTime,
EndDate = p.EndTime,
- PartCode=d.PartCode//客户零件号
+ PartCode=d.PartCode,//客户零件号
+ PoNum=""
+
};
var dtos = q.ToList();
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
index bd12b190..b5df5fe5 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
@@ -49,10 +49,20 @@ public class PendingDeductionService : ITransientDependency, IExportJob
{
var billList = property.Where(p => p.Name == "BillNumList").FirstOrDefault().Value;
var type = property.Where(p => p.Name == "Type").FirstOrDefault().Value;
-
var list=billList.Split(",");
- if (type == "BBACJIS")
+
+ // ///
+ //[Display(Name = "JisBBAC")]
+ // JisBBAC = 1,
+ /////
+ ///// JisHBPO
+ /////
+ //[Display(Name = "JisHBPO")]
+ // JisHBPO = 2,
+
+
+ if (type == "JisBBAC")
{
var jisdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan==false);
var mdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan ==true);
@@ -108,10 +118,9 @@ public class PendingDeductionService : ITransientDependency, IExportJob
}
}
}
- else if (type == "HBPOJIS")
+ else if (type == "JisHBPO")
{
var detailist = _hbpoRepository.Where(p => list.Contains(p.BillNum)).ToList();
-
if (detailist != null && detailist.Count > 0)
{
foreach (var itm in detailist)
@@ -143,6 +152,50 @@ public class PendingDeductionService : ITransientDependency, IExportJob
{
var detailist = _hbpoRepository.Where(p => list.Contains(p.BillNum)).ToList();
+ switch (type)
+ {
+ case "ZhiGongJianBBAC":
+
+
+
+
+
+ break;
+ case "ZhiGongJianHBPO":
+
+
+
+
+ break;
+ case "MaiDanJianBBAC":
+
+
+
+
+ break;
+ case "MaiDanJianHBPO":
+
+
+
+
+ break;
+ case "BeiJian":
+
+
+
+
+
+ break;
+ case "YinDuJian":
+
+
+
+
+
+
+
+ break;
+ }
if (detailist != null && detailist.Count > 0)
{
foreach (var itm in detailist)
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationModule.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationModule.cs
index fb8b1d93..6085eb0f 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationModule.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationModule.cs
@@ -13,6 +13,8 @@ using Volo.Abp.RabbitMQ;
using System;
using TaskJob.Interfaces;
using Win.Sfs.SettleAccount.Entities.BQ.Syncs;
+using SettleAccount.Job.Services.Report;
+using SettleAccount.Job.Services;
namespace Win.Sfs.SettleAccount
{
@@ -47,30 +49,216 @@ namespace Win.Sfs.SettleAccount
ConfigureJson(context);
//context.Services.AddTransient(typeof(INormalEfCoreRepository<,>),
- // typeof(SettleAccountNormalEfCoreRepository<,>));
+ //typeof(SettleAccountNormalEfCoreRepository<,>));
+
context.Services.AddTransient(implementationFactory =>
{
Func accesor = key =>
{
+ if (key.Equals(typeof(PubSaSeCompareExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
+ if (key.Equals(typeof(JisBBACEdiSeCompareExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
+ if (key.Equals(typeof(JisHBPOEdiSeCompareExportService).FullName))
+ {
+ return implementationFactory.GetService();
+ }
if (key.Equals(typeof(PendingDeductionService).FullName))
{
return implementationFactory.GetService();
}
+
+
+
+
+ //if (key.Equals(typeof(InvoiceSettledDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(UnSettledExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(fisUnsettledDiffReport).FullName))
+ //{//ERP总成开票报表
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(PriceQtyDifferenceExportService).FullName))
+ //{//量差和价差分析报表
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(SettledPartAndErpPartPriceDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(SecMatchBaseExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+
+ //if (key.Equals(typeof(SettleFisDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+
+ ////大众看板结算与交货核对明细表(有条码)
+ //if (key.Equals(typeof(SettleKBWithCodeExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ ////大众备件结算核对明细表
+ //if (key.Equals(typeof(SettleSparePartExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ ////大众备件未结明细
+ //if (key.Equals(typeof(SettleUnSparePartExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ ////大众备件90天核对明细
+ //if (key.Equals(typeof(SettleSparePart90ExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(InvoiceSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(UnInvoiceSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(UnSettleDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+
+ //if (key.Equals(typeof(SettleDoorPanelExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(UnsettledDetailReportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(SettleKBWithOutCodeExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(SharePartUnSettledExport).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ ////红旗、一汽轿车结算报表
+ //if (key.Equals(typeof(HQFSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(HQFSharePartSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(HQMSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(HQMSharePartSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(HQHSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ ////红旗结算未结明细
+ //if (key.Equals(typeof(HQHUnSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ ////红旗未结核对
+ //if (key.Equals(typeof(HQFactoryUnSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(HQHSharePartSettledDetailDiffExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ ////红旗、轿车发运报表
+ //if (key.Equals(typeof(HQMShippingExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(HQHShippingExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(HQFShippingExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(WmsOutputSumExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ ////大众看板未结输出
+ //if (key.Equals(typeof(KanBanUnSettledExport).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(FisUpdateExportService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+ //if (key.Equals(typeof(FisOutputService).FullName))
+ //{
+ // return implementationFactory.GetService();
+ //}
+
+
+
+
else
{
throw new ArgumentException($"Not Support key:{key}");
}
- };
- return accesor;
+
+
+ }; return accesor;
});
+ //context.Services.AddTransient(implementationFactory =>
+ //{
+ // Func accesor = key =>
+ // {
+ // if (key.Equals(typeof(PendingDeductionService).FullName))
+ // {
+ // return implementationFactory.GetService();
+ // }
+ // else
+ // {
+ // throw new ArgumentException($"Not Support key:{key}");
+ // }
+
+ // };
+ // return accesor;
+ //});
+
+
+
+
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs
index e7df840f..322e92c6 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/INVOICE_NOT_SETTLE.cs
@@ -14,6 +14,10 @@ public class INVOICE_NOT_SETTLE : FullAuditedAggregateRoot
[Display(Name = "发票分组号")]
public string InvGroupNum { get; set; } = null!;
+ [Display(Name = "发票号")]
+ public string InvBillNum { get; set; } = null!;
+
+
[Display(Name = "结算分组号")]
public string SettleGroupNum { get; set; } = null!;
@@ -35,7 +39,7 @@ public class INVOICE_NOT_SETTLE : FullAuditedAggregateRoot
- public INVOICE_NOT_SETTLE(Guid guid, int version, string invGroupNum, string settleGroupNum, string lU, string lU1, string extend1, string extend2,decimal qty)
+ public INVOICE_NOT_SETTLE(Guid guid, int version, string invGroupNum, string settleGroupNum, string lU, string lU1, string extend1, string extend2,decimal qty,string p_invbillnum)
{
Id = guid;
Version = version;
@@ -46,6 +50,7 @@ public class INVOICE_NOT_SETTLE : FullAuditedAggregateRoot
Extend1 = extend1;
Extend2 = extend2;
Qty = qty;
+ InvBillNum = p_invbillnum;
}
public INVOICE_NOT_SETTLE()
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
index f97ba14c..f1a6b967 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
@@ -14,6 +14,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Security.Policy;
using System.Text;
+using System.Text.Json;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Auditing;
@@ -21,6 +22,7 @@ using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Domain.Services;
+using Volo.Abp.Json;
using Win.Sfs.SettleAccount.Bases;
using Win.Sfs.SettleAccount.Entities.BQ.Temp;
using Win.Sfs.SettleAccount.Entities.Prices;
@@ -1348,7 +1350,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var innotls = new List();
if (p_notlist != null && p_notlist.Count > 0)
{
- var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
+ var groupnum = itm.Value;
+ var notls = p_notlist.Where(p=>groupnum.Contains(p.GroupNum)).GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
foreach (var nitm in notls)
{
innotls.Add(new INVOICE_NOT_SETTLE(
@@ -1360,7 +1363,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
lU1: nitm.LU,
extend1: string.Empty,
extend2: string.Empty,
- qty: nitm.Qty
+ qty: nitm.Qty,
+ p_invbillnum:itm.Key
));
}
if (innotls.Count > 0)
@@ -1812,7 +1816,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var innotls = new List();
if (p_notlist != null && p_notlist.Count > 0)
{
- var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
+ var notls = p_notlist.Where(p=>ls.Contains(p.GroupNum)).GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
foreach (var nitm in notls)
{
innotls.Add(new INVOICE_NOT_SETTLE(
@@ -1824,7 +1828,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
lU1: nitm.LU,
extend1: string.Empty,
extend2: string.Empty,
- qty: nitm.Qty
+ qty: nitm.Qty,
+ p_invbillnum:key
+
));
}
if (innotls.Count > 0)
@@ -2060,7 +2066,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var query = from inv1 in invdetails
join dto1 in dtos on
- new { inv1.LU, inv1.PN } equals new { dto1.LU, dto1.PN }
+ new { inv1.LU,inv1.PartCode, inv1.PN } equals new { dto1.LU,dto1.PartCode, dto1.PN }
select new
{
PartCode = inv1.PartCode,
@@ -2103,6 +2109,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
groupList.AddRange(mapList);
}
List _entityDetailList = new List();
+ //var txt= JsonSerializer.Serialize(query.ToList());
+
foreach (var detail in query.ToList())
{
@@ -2123,12 +2131,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
partcode: detail.PartCode);
entity.SetProperty("DeliveryNumber", detail.DeliveryIndexNumber);//交货号
entity.SetProperty("VendorCode", detail.VendorCode);//供应商代码
- entity.SetProperty("VendorName", detail.VendorName);//供应商名称
- entity.SetProperty("PurchaseOrderNumber", "");//采购订单号
- entity.SetProperty("DeliveryIndexNumber", "");//交付索引号
- entity.SetProperty("PartName", "");//零件名称
+ entity.SetProperty("VendorName", detail.VendorName);//供应商名称
+ entity.SetProperty("PurchaseOrderNumber", "");//采购订单号
+ entity.SetProperty("DeliveryIndexNumber", "");//交付索引号
+ entity.SetProperty("PartName", "");//零件名称
- _entityDetailList.Add( entity
+ _entityDetailList.Add( entity
);
}
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
index 29e0a34e..8daf8064 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
@@ -408,7 +408,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var innotls = new List();
if (p_notlist != null && p_notlist.Count > 0)
{
- var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
+ var notls = p_notlist.Where(p=>ls.Contains(p.GroupNum)).GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
foreach (var nitm in notls)
{
innotls.Add(new INVOICE_NOT_SETTLE(
@@ -420,7 +420,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
lU1: nitm.LU,
extend1: string.Empty,
extend2: string.Empty,
- qty: nitm.Qty
+ qty: nitm.Qty,
+ p_invbillnum:key
+
));
}
if (innotls.Count > 0)
@@ -841,7 +843,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var innotls = new List();
if (p_notlist != null && p_notlist.Count > 0)
{
- var notls = p_notlist.GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
+ var notls = p_notlist.Where(p=>ls.Contains(p.GroupNum)).GroupBy(p => new { p.GroupNum, p.LU }).Select(p => new { GroupNum = p.Key.GroupNum, LU = p.Key.LU, Qty = p.Sum(itm => itm.Qty) });
foreach (var nitm in notls)
{
innotls.Add(new INVOICE_NOT_SETTLE(
@@ -853,7 +855,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
lU1: nitm.LU,
extend1: string.Empty,
extend2: string.Empty,
- qty: nitm.Qty
+ qty: nitm.Qty,
+ p_invbillnum:key
));
}
if (innotls.Count > 0)
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs
index 99369b3e..106c648b 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Temp/TempClass.cs
@@ -131,6 +131,14 @@ public class TEMP_CAN_SA_DETAIL
public string PartCode { get; set; }
+ ///
+ /// 订单号
+ ///
+ public string PoNum { get; set; }
+
+
+
+
}
public class TEMP_NOT_SA_DETAIL : SA_NOT_BASE
{
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230818073659_202308180001.Designer.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230818073659_202308180001.Designer.cs
new file mode 100644
index 00000000..38accdeb
--- /dev/null
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230818073659_202308180001.Designer.cs
@@ -0,0 +1,5524 @@
+//
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+using Win.Sfs.SettleAccount;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+ [DbContext(typeof(SettleAccountDbContext))]
+ [Migration("20230818073659_202308180001")]
+ partial class _202308180001
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+ .HasAnnotation("Relational:MaxIdentifierLength", 128)
+ .HasAnnotation("ProductVersion", "5.0.17")
+ .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_CAN_SA", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BusinessType")
+ .HasColumnType("int");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Site")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("State")
+ .HasMaxLength(50)
+ .HasColumnType("int");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_CAN_SA");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_CAN_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BusinessType")
+ .HasColumnType("int");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("ContractDocID")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvbillNum")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("IsMaiDan")
+ .HasColumnType("bit");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("bit");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("PartCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_CAN_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_NOT_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BusinessType")
+ .HasColumnType("int");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("ContractDocID")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsMaiDan")
+ .HasColumnType("bit");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("bit");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("PartCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_NOT_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_PD", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("SettleBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("State")
+ .HasColumnType("int");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_PD");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_PD_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("Extend1")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Extend2")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Extend3")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Extend4")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("InvGroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("IsMaiDan")
+ .HasColumnType("bit");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("RELU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("REPN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_PD_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SA", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BusinessType")
+ .HasColumnType("int");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DNBillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("Site")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("State")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SA");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SA_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BillNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("BusinessType")
+ .HasColumnType("int");
+
+ b.Property("Category")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupNum")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsReturn")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("PartCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Price")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property("SettleDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Site")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Version")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Set_BBAC_SA_DETAIL");
+ });
+
+ modelBuilder.Entity("SettleAccount.Domain.BQ.BBAC_SE_DETAIL", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AssembleData")
+ .HasColumnType("datetime2");
+
+ b.Property("AssemblyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Batch")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("BeginDate")
+ .HasColumnType("datetime2");
+
+ b.Property("BillCharacter")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("BillNum")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("BillTime")
+ .HasColumnType("datetime2");
+
+ b.Property("BillType")
+ .HasColumnType("int");
+
+ b.Property("BusinessType")
+ .HasColumnType("int");
+
+ b.Property("CodeType")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("CustPartCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("DeliverBillType")
+ .HasColumnType("int");
+
+ b.Property("DeliverCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("DeliverSubBillType")
+ .HasColumnType("int");
+
+ b.Property("ErpToLoc")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("Factory")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("FactoryPartCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("FromLoc")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("InjectionCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("IsHaveEdiData")
+ .HasColumnType("bit");
+
+ b.Property("JISNum")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("KeyCode")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LU")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("MESConfigCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("MatchNumber")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Oper")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("OrderNum")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("OrigiCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("PN")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("PartCode")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("PartDesc")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("PjsNum")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Position")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ProType")
+ .HasColumnType("int");
+
+ b.Property("Qty")
+ .HasColumnType("decimal(18,2)");
+
+ b.Property