chenjingyong
/
sdgslk-wms-solution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

系统优化

Browse Source
master
ZR20090193-陈敬勇 2 years ago
parent e5dd0fdb74
commit 2de319f448
53 changed files with 2815 additions and 145 deletions
Show Stats Download Patch File Download Diff File

1
gslk-wms-web-client/src/router/helper/menuHelper.ts
Unescape Escape View File

@ -70,6 +70,7 @@ export function transformRouteToMenu(routeModList: AppRouteModule[], routerMappi
meta: node.meta,
name: title,
hideMenu,
tag: node.tag,
path: node.path,
...(node.redirect ? { redirect: node.redirect } : {}),
}

1
gslk-wms-web-client/src/router/helper/routeHelper.ts
Unescape Escape View File

@ -78,6 +78,7 @@ export function transformObjToRoute<T = AppRouteModule>(routeList: AppRouteModul
meta.single = true
meta.affix = false
route.meta = meta
route.tag = route.tag
}
} else {
warn('请正确配置路由：' + route?.name + '的component属性')

1
gslk-wms-web-client/src/router/types.ts
Unescape Escape View File

@ -16,6 +16,7 @@ export interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
children?: AppRouteRecordRaw[]
props?: Recordable
fullPath?: string
tag?: MenuTag
}
export interface MenuTag {

21
gslk-wms-web-client/src/views/system/company/index.vue
Unescape Escape View File

@ -87,15 +87,16 @@
console.log(main, files)
const postData = reactive({
id: main.id,
address: main.address,
phone: main.phone,
chief: main.chief,
email: main.email,
cardfiles: files.cardfiles,
licensefiles: files.licensefiles,
})
var postData = Object.assign({}, main, { cardfiles: files.cardfiles, licensefiles: files.licensefiles, })
// const postData = reactive({
// id: main.id,
// address: main.address,
// phone: main.phone,
// chief: main.chief,
// email: main.email,
// cardfiles: files.cardfiles,
// licensefiles: files.licensefiles,
// })
await editClientCompany(postData).then((res) => {
if (res.succeeded) {
notification.success({ message: res.message, duration: 3 })
@ -117,7 +118,7 @@
var main = getFieldsValue()
// var files = getFileFieldsValue();
await submitCompany({ id: main.id }).then((res) => {
await submitCompany({ id: main.gid }).then((res) => {
if (res.succeeded) {
notification.success({ message: res.message, duration: 3 })
setProps({ submitButtonOptions: { loading: false } })

14
gslk-wms-web-server/src/api/common/index.ts
Unescape Escape View File

@ -45,6 +45,20 @@ enum Api {
getInfoClientList = '/Common/GetInfoClientList',
getSecurityUserTypeList = '/Common/getSecurityUserTypeList',
getFeeList = '/Common/GetFeeList',
getStoreHouseSelect = '/Common/GetStoreHouseSelect',
getCollectWarningCount = '/Common/GetCollectWarningCount',
}
export function getCollectWarningCount() {
return request<DataResult>({
url: Api.getCollectWarningCount,
method: 'get',
})
}
export function getStoreHouseSelect() {
return request<DataResult<ApiSelectList>>({
url: Api.getStoreHouseSelect,
method: 'get',
})
}
export function getFeeList(query: { code: string }) {
return request<DataResult>({

8
gslk-wms-web-server/src/api/wms/wmsinplan.ts
Unescape Escape View File

@ -8,6 +8,7 @@ enum Api {
getInfo = '/WmsInPlan/GetWmsInPlanInfo',
editInfo = '/WmsInPlan/EditWmsInPlanInfo',
auditInfo = '/WmsInPlan/AuditWmsInPlan',
getFeeRateList = '/WmsInPlan/GetWmsInPlanFeeRateList',
}
export function getList(data: PageRequest) {
return request<DataResult>({
@ -30,6 +31,13 @@ export function getWmsInPlanGoodslist(query: { id: string }) {
params: query,
})
}
export function getFeeRateList(query: { id: string }) {
return request<DataResult>({
url: Api.getFeeRateList,
method: 'get',
params: query,
})
}
export function editInfo(data: any) {
return request<DataResult>({
url: Api.editInfo,

1
gslk-wms-web-server/src/router/helper/menuHelper.ts
Unescape Escape View File

@ -70,6 +70,7 @@ export function transformRouteToMenu(routeModList: AppRouteModule[], routerMappi
meta: node.meta,
name: title,
hideMenu,
tag: node.tag,
path: node.path,
...(node.redirect ? { redirect: node.redirect } : {}),
}

2
gslk-wms-web-server/src/router/helper/routeHelper.ts
Unescape Escape View File

@ -78,12 +78,14 @@ export function transformObjToRoute<T = AppRouteModule>(routeList: AppRouteModul
meta.single = true
meta.affix = false
route.meta = meta
route.tag = route.tag
}
} else {
warn('请正确配置路由：' + route?.name + '的component属性')
}
route.children && asyncImportRoute(route.children)
})
// console.log('转化路由',routeList)
return routeList as unknown as T[]
}

1
gslk-wms-web-server/src/router/types.ts
Unescape Escape View File

@ -16,6 +16,7 @@ export interface AppRouteRecordRaw extends Omit<RouteRecordRaw, 'meta'> {
children?: AppRouteRecordRaw[]
props?: Recordable
fullPath?: string
tag?: MenuTag
}
export interface MenuTag {

3
gslk-wms-web-server/src/store/modules/permission.ts
Unescape Escape View File

@ -223,8 +223,9 @@ export const usePermissionStore = defineStore({
// await this.changePermissionCode()
// routeList = (await getMenuList()) as AppRouteRecordRaw[]
const res = await getMenuList()
// console.log('后台返回路由', res);
// console.log('后台返回路由', res)
routeList = res.data as AppRouteRecordRaw[]
// console.log('后台返回路由1', routeList)
} catch (error) {
console.error(error)
}

8
gslk-wms-web-server/src/store/modules/user.ts
Unescape Escape View File

@ -15,9 +15,10 @@ import { h } from 'vue'
import { Storage } from '/@/utils/Storage'
import { CurrentUserViewModel, LoginParams } from '/@/api/common/Model'
import { getUserInfo, login, userLogout } from '/@/api/common'
import { getUserInfo, login, userLogout, getCollectWarningCount } from '/@/api/common'
import { DataResult } from '/@/api/model/baseModel'
import { initDictOptions } from '/@/utils/dictUtil'
import { getThermometryWarningCount } from '/@/api/security/hkopen'
interface UserState {
userInfo: Nullable<CurrentUserViewModel>
@ -110,12 +111,17 @@ export const useUserStore = defineStore({
if (!this.getToken) return null
// get user info
const userInfo = await this.getUserInfoAction()
const res: API.DataResult = await getCollectWarningCount()
console.log(res)
const sessionTimeout = this.sessionTimeout
console.log(sessionTimeout)
if (sessionTimeout) {
this.setSessionTimeout(false)
} else {
const permissionStore = usePermissionStore()
if (!permissionStore.isDynamicAddedRoute) {
const routes = await permissionStore.buildRoutesAction()
routes.forEach((route) => {

2
gslk-wms-web-server/src/views/baseinfo/clientaudit/ClientModal.vue
Unescape Escape View File

@ -98,7 +98,7 @@
const postData = reactive({
id: values.gid,
status: values.status,
auditNote: values.auditNote,
auditNote: values.auditNote === null ? '通过' : values.auditNote,
})
createConfirm({
iconType: 'warning',

11
gslk-wms-web-server/src/views/baseinfo/clientaudit/columns.tsx
Unescape Escape View File

@ -54,11 +54,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'tel',
width: 100,
},
// {
// title: '审批时间',
// dataIndex: 'auditTime',
// width: 120,
// },
{
title: '审批时间',
dataIndex: 'auditTime',
width: 100,
sorter: true,
},
]
export const searchFormSchema: FormSchema[] = [

2
gslk-wms-web-server/src/views/baseinfo/clientaudit/index.vue
Unescape Escape View File

@ -59,7 +59,7 @@
})
} else {
postParam.pageCondition.sortConditions.push({
sortField: 'shortname',
sortField: 'auditTime',
listSortDirection: 0,
})
}

2
gslk-wms-web-server/src/views/baseinfo/goodsaudit/GoodsAuditModal.vue
Unescape Escape View File

@ -181,7 +181,7 @@
const postData = reactive({
id: values.gid,
status: values.status,
auditNote: values.auditNote,
auditNote: values.auditNote === null ? '通过' : values.auditNote,
})
createConfirm({
iconType: 'warning',

6
gslk-wms-web-server/src/views/baseinfo/goodsaudit/columns.tsx
Unescape Escape View File

@ -70,6 +70,12 @@ export const columns: BasicColumn[] = [
return text
},
},
{
title: '审批时间',
dataIndex: 'auditTime',
width: 100,
sorter: true,
},
{
title: '审批备注',
dataIndex: 'auditNote',

2
gslk-wms-web-server/src/views/fee/feerate/FeeRateDetail.vue
Unescape Escape View File

@ -172,7 +172,7 @@
</vxe-column>
<vxe-column
field="inputmode"
title="结算账单"
title="结算账期"
width="100"
:edit-render="{ autofocus: '.vxe-input--inner' }"
>

13
gslk-wms-web-server/src/views/wms/storequery/api.ts
Unescape Escape View File

@ -0,0 +1,13 @@
// @ts-ignore
import { request } from '/@/utils/request'
import { DataResult, PageRequest } from '/@/api/model/baseModel'
enum Api {
list = '/StoreQuery/GetWmsStoreList',
}
export function getList(data: PageRequest) {
return request<DataResult>({
url: Api.list,
method: 'post',
data,
})
}

325
gslk-wms-web-server/src/views/wms/storequery/columns.tsx
Unescape Escape View File

@ -0,0 +1,325 @@
import { Tag } from 'ant-design-vue'
import { BasicColumn, FormSchema } from '/@/components/Table'
import { formatToDate, formatToDateTime } from '/@/utils/dateUtil'
import dayjs from 'dayjs'
import { getStoreHouseSelect } from '/@/api/common'
export const columns: BasicColumn[] = [
{
title: 'wmsphysicsid',
dataIndex: 'wmsphysicsid',
ifShow: false,
},
{
title: 'wmsid',
dataIndex: 'wmsid',
ifShow: false,
},
{
title: '客户名称',
dataIndex: 'customername',
width: 100,
},
{
title: '仓库',
dataIndex: 'storehousename',
width: 100,
},
{
title: '品名',
dataIndex: 'goodsname',
width: 100,
},
{
title: '规格型号',
dataIndex: 'goodsmodel',
width: 80,
},
{
title: '库位',
dataIndex: 'areacodename',
width: 100,
},
{
title: '毛重',
dataIndex: 'kgs',
width: 50,
},
{
title: '体积',
dataIndex: 'cbm',
width: 50,
},
{
title: '件数',
dataIndex: 'pkgs',
width: 100,
},
{
title: '计费数量',
dataIndex: 'storageunitcount',
width: 100,
},
{
title: '锁定数量',
dataIndex: 'lockstorageunitcount',
width: 100,
},
{
title: '是否保税',
dataIndex: 'billtype',
width: 60,
customRender: ({ text }) => {
if (text === '0') {
return <Tag color="red">否</Tag>
} else if (text === '1') {
return <Tag color="success">是</Tag>
}
return text
},
},
{
title: '提单号',
dataIndex: 'mblno',
width: 100,
},
{
title: '入库日期',
dataIndex: 'startdate',
width: 80,
customRender: ({ text }) => {
return formatToDate(text)
},
},
]
export const searchFormSchema: FormSchema[] = [
{
field: 'STOREHOUSE',
label: '仓库:',
component: 'ApiSelect',
colProps: { span: 8 },
componentProps: {
// mode: 'multiple',
api: getStoreHouseSelect,
resultField: 'data',
},
},
{
field: 'CUSTOMERNAME',
label: '客户名称:',
component: 'Input',
colProps: { span: 8 },
},
{
field: 'GOODSNAME',
label: '品名:',
component: 'Input',
colProps: { span: 8 },
},
{
field: 'MBLNO',
label: '提单号:',
component: 'Input',
colProps: { span: 8 },
},
{
field: 'PinYinCode',
label: '助记码:',
component: 'Input',
colProps: { span: 8 },
},
]
export const formSchema: FormSchema[] = [
{
field: 'divider-selects',
component: 'Divider',
label: '基本信息',
colProps: {
span: 24,
},
},
{
label: '',
field: 'wmsplanid',
component: 'Input',
defaultValue: '',
show: false,
},
{
label: '',
field: 'corpid',
component: 'Input',
defaultValue: '',
show: false,
},
{
label: '',
field: 'clientId',
component: 'Input',
defaultValue: '',
show: false,
},
{
label: '',
field: 'goodsowner',
component: 'Input',
defaultValue: '',
show: false,
},
{
label: '',
field: 'customername',
component: 'Input',
defaultValue: '',
show: false,
},
{
label: '',
field: 'storehouse',
component: 'Input',
defaultValue: '',
show: false,
},
{
field: 'wmsno',
label: '出库单号',
component: 'Input',
defaultValue: '',
colProps: {
span: 8,
},
componentProps: {
disabled: true,
},
},
{
field: 'plantime',
label: '预约出库日期',
component: 'DatePicker',
required: true,
defaultValue: dayjs(),
colProps: {
span: 8,
},
componentProps: {
disabledDate: (current: dayjs.Dayjs) => {
return current && current < dayjs().add(-1, 'day').endOf('day')
},
},
},
{
field: 'customno',
label: '出区报关单号',
component: 'Input',
colProps: {
span: 8,
},
componentProps: {},
},
{
field: 'kindpkgs',
label: '包装方式',
component: 'RadioButtonGroup',
defaultValue: '托盘',
required: true,
colProps: { span: 8 },
componentProps: {
options: [
{ label: '包', value: '包' },
{ label: '托盘', value: '托盘' },
{ label: '散装', value: '散装' },
],
},
},
{
field: 'storehousename',
label: '仓库',
component: 'Input',
required: true,
colProps: {
span: 8,
},
slot: 'storehouseSelectSlot',
},
{
field: 'goodsname',
label: '商品名称',
component: 'Input',
colProps: {
span: 8,
},
componentProps: {
disabled: true,
},
},
{
field: 'goodsmodel',
label: '规格型号',
component: 'Input',
colProps: {
span: 8,
},
componentProps: {
disabled: true,
},
},
{
field: 'truckno',
label: '承运车辆',
component: 'Input',
colProps: {
span: 8,
},
componentProps: {
disabled: true,
},
},
{
field: 'remark',
label: '备注',
component: 'InputTextArea',
colProps: { span: 20 },
componentProps: {
placeholder: '',
rows: 4,
},
},
{
field: 'divider-audit',
component: 'Divider',
label: '审批信息',
colProps: {
span: 24,
},
ifShow: ({ values }) => {
// return !!(values.auditStatus === -1)
return !!values.wmsplanid
},
},
{
field: 'auditNote',
label: '审核意见',
component: 'InputTextArea',
colProps: { span: 20 },
componentProps: {
disabled: true,
rows: 2,
},
ifShow: ({ values }) => {
return !!values.wmsplanid
},
},
{
field: 'auditStatus',
label: '审核状态',
component: 'Input',
defaultValue: -1,
colProps: {
span: 8,
},
ifShow: ({ values }) => {
return !!values.wmsplanid
},
slot: 'auditStatusSlot',
},
]

152
gslk-wms-web-server/src/views/wms/storequery/index.vue
Unescape Escape View File

@ -0,0 +1,152 @@
<template>
<PageWrapper contentBackground contentClass="flex" dense contentFullHeight fixedHeight>
<BasicTable @register="registerTable">
<template #toolbar>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<!-- <TableAction-->
<!-- :actions="[-->
<!-- {-->
<!-- icon: 'clarity:note-edit-line',-->
<!-- tooltip: '详情',-->
<!-- onClick: handleDetail.bind(null, record),-->
<!-- },-->
<!-- ]"-->
<!-- />-->
</template>
</template>
</BasicTable>
</PageWrapper>
</template>
<script lang="ts" setup>
import { BasicTable, useTable, TableAction, SorterResult } from '/@/components/Table'
import { useModal } from '/@/components/Modal'
import { getList } from './api'
import { PageWrapper } from '/@/components/Page'
import { columns, searchFormSchema } from './columns'
let sortInfo: SorterResult = {}
let filterInfo: Partial<Recordable<string[]>> = []
const [registerModal, { openModal }] = useModal()
const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
title: '库存列表',
api: async (p) => {
const res: API.DataResult = await getList(p)
// console.log(items);
return new Promise((resolve) => {
resolve({ data: [...res.data], total: res.count })
})
},
beforeFetch: () => {
var currentPageInfo: any = getPaginationRef()
// var data = getForm().getFieldsValue()
const postParam: API.PageRequest = {
queryCondition: '',
pageCondition: {
pageIndex: currentPageInfo.current,
pageSize: currentPageInfo.pageSize,
sortConditions: [],
},
}
var data = getForm().getFieldsValue()
/* 排序字段 */
if (!!sortInfo.columnKey) {
postParam.pageCondition.sortConditions.push({
sortField: sortInfo.field,
listSortDirection: sortInfo.order === 'ascend' ? 0 : 1,
})
} else {
postParam.pageCondition.sortConditions.push({
sortField: 'storehouse',
listSortDirection: 0,
})
}
/* 检索字段 */
let condition: API.ConditionItem[] = []
if (!!data.GOODSNAME) {
condition.push({
FieldName: 'GOODSNAME',
FieldValue: data.GOODSNAME,
ConditionalType: 1,
})
}
if (!!data.CUSTOMERNAME) {
condition.push({
FieldName: 'CUSTOMERNAME',
FieldValue: data.CUSTOMERNAME,
ConditionalType: 1,
})
}
if (!!data.STOREHOUSE) {
condition.push({
FieldName: 'STOREHOUSE',
FieldValue: data.STOREHOUSE,
ConditionalType: 1,
})
}
if (!!data.MBLNO) {
condition.push({
FieldName: 'MBLNO',
FieldValue: data.MBLNO,
ConditionalType: 1,
})
}
if (!!data.PinYinCode) {
condition.push({
FieldName: 'PinYinCode',
FieldValue: data.PinYinCode,
ConditionalType: 1,
})
}
// /* 筛选字段 */
// if (filterInfo === null) {
// } else {
// // console.log(filterInfo);
// // console.log('审核状态' + filterInfo.auditStatus);
// if (!!filterInfo.auditStatus && filterInfo.auditStatus.length > 0) {
// condition.push({
// FieldName: 'AuditStatus',
// FieldValue: filterInfo.auditStatus.join(),
// ConditionalType: 6,
// })
// }
// }
postParam.queryCondition = JSON.stringify(condition)
// console.log(postParam);
return postParam
},
columns: columns,
sortFn: (sorter) => {
// console.log('排序:' + sorter);
sortInfo = sorter
},
filterFn: (filters) => {
// console.log('筛选:' + filters);
filterInfo = filters
},
bordered: true,
useSearchForm: true,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
},
showTableSetting: true,
tableSetting: { fullScreen: true },
actionColumn: null,
})
function handleCreate() {
openModal(true, {
isUpdate: false,
})
}
function handleDetail(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
})
}
function handleSuccess() {
reload()
}
</script>

6
gslk-wms-web-server/src/views/wms/wmsclearance/columns.tsx
Unescape Escape View File

@ -108,6 +108,12 @@ export const columns: BasicColumn[] = [
return text
},
},
{
title: '审批时间',
dataIndex: 'auditTime',
width: 100,
sorter: true,
},
{
title: '审批备注',
dataIndex: 'auditNote',

186
gslk-wms-web-server/src/views/wms/wmsinplan/WmsInPlanVxeModal.vue
Unescape Escape View File

@ -7,14 +7,40 @@
width="80%"
@ok="handleSave"
>
<!-- <BasicForm @register="registerForm">-->
<!-- &lt;!&ndash; <template #auditStatusSlot="{ model, field }">&ndash;&gt;-->
<!-- &lt;!&ndash; <canvas id="canvas" width="200" height="200"></canvas>&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- </BasicForm>-->
<Tabs v-model:activeKey="activeMainKey">
<TabPane key="mainTab" tab="基本信息">
<BasicForm @register="registerForm">
<template #auditStatusSlot="{ model, field }">
<canvas id="canvas" width="200" height="200"></canvas>
</template>
</BasicForm>
<Divider>预约入库明细</Divider>
<!-- <VxeTableWmsInPlanGoods ref="tableRef" :dataList="dataSource" />-->
</TabPane>
<!-- <TabPane key="auditTab" tab="审批意见">-->
<!-- <BasicForm @register="registerAuditForm">-->
<!-- </BasicForm>-->
<!-- </TabPane>-->
</Tabs>
<!-- <Divider>预约入库明细</Divider>-->
<!-- &lt;!&ndash; <VxeTableWmsInPlanGoods ref="tableRef" :dataList="dataSource" />&ndash;&gt;-->
<!-- <vxe-grid ref="xGrid" v-bind="gridOptions" />-->
<!-- <Divider>费率信息</Divider>-->
<!-- &lt;!&ndash; <VxeTableWmsInPlanGoods ref="tableRef" :dataList="dataSource" />&ndash;&gt;-->
<!-- <vxe-grid ref="feeGrid" v-bind="feeOptions" />-->
<CollapseContainer title="其他信息">
<Tabs v-model:activeKey="activeKey">
<TabPane key="detailTab" tab="预约入库明细">
<vxe-grid ref="xGrid" v-bind="gridOptions" />
</TabPane>
<TabPane key="feeTab" tab="费率信息">
<vxe-grid ref="feeGrid" v-bind="feeOptions" />
</TabPane>
</Tabs>
</CollapseContainer>
<!--右下角按钮-->
<template #footer>
<a-button
@ -40,30 +66,47 @@
</template>
<script lang="ts" setup>
import { ref, computed, unref, h, reactive } from 'vue'
import { TabPane, Tabs } from 'ant-design-vue'
import { CollapseContainer } from '/@/components/Container'
import { BasicModal, useModalInner, useModal } from '/@/components/Modal'
import { BasicForm, useForm } from '/@/components/Form/index'
import { formSchema } from './columns'
import { formSchema, auditFormSchema } from './columns'
import { useMessage } from '/@/hooks/web/useMessage'
// import GoodsTypeSelectModal from './GoodsTypeSelectModal.vue'
import chapter from '/@/utils/chapter'
// import VxeTableWmsInPlanGoods from './VxeTableWmsInPlanGoods.vue'
const { notification, createConfirm, createMessage } = useMessage()
import { editInfo, getInfo, getWmsInPlanGoodslist, auditInfo } from '/@/api/wms/wmsinplan'
import {
editInfo,
getInfo,
getWmsInPlanGoodslist,
auditInfo,
getFeeRateList,
} from '/@/api/wms/wmsinplan'
import { Divider } from 'ant-design-vue'
import { VxeGridProps } from 'vxe-table'
import { get } from 'lodash-es'
// 声明Emits
const emit = defineEmits(['change', 'update:value', 'success', 'register'])
const isUpdate = ref(true)
const loading = ref(false)
const rowId = ref('')
const dataSource = ref<any[]>([])
const feeSource = ref<any[]>([])
const activeKey = ref('detailTab')
const activeMainKey = ref('mainTab')
const [registerForm, { resetFields, setFieldsValue, validate, updateSchema, getFieldsValue }] =
useForm({
labelWidth: 180,
schemas: formSchema,
showActionButtonGroup: false,
})
const [registerAuditForm, { setFieldsValue: setAuditFieldsValue }] = useForm({
labelWidth: 180,
schemas: auditFormSchema,
showActionButtonGroup: false,
})
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
resetFields()
setModalProps({ confirmLoading: false, loading: true })
@ -78,10 +121,15 @@
await setFieldsValue({
...res.data,
})
const status = res.data.auditStatus
// await setAuditFieldsValue({
// auditStatus:status,
// auditNote:res.data.auditNote,
// })
// console.log(res.data.list)
// data.value = res.data.list
const status = res.data.auditStatus
// const status = res.data.auditStatus
console.log(status)
if (status === -1) {
chapter('未提交', '高速临空管理平台', 'red')
@ -95,20 +143,20 @@
}
} else {
dataSource.value = []
updateSchema([
{
field: 'divider-audit',
show: unref(isUpdate),
},
{
field: 'auditStatus',
show: unref(isUpdate),
},
{
field: 'auditNote',
show: unref(isUpdate),
},
])
// updateSchema([
// {
// field: 'divider-audit',
// show: unref(isUpdate),
// },
// {
// field: 'auditStatus',
// show: unref(isUpdate),
// },
// {
// field: 'auditNote',
// show: unref(isUpdate),
// },
// ])
}
setModalProps({ loading: false })
})
@ -123,6 +171,14 @@
} else {
dataSource.value = []
}
const fee: API.DataResult = await getFeeRateList({ id: unref(rowId) })
console.log(fee)
if (fee.succeeded) {
feeSource.value = fee.data
} else {
feeSource.value = []
}
console.log(dataSource.value)
}
const gridOptions = reactive<VxeGridProps>({
@ -227,7 +283,95 @@
// },
// },
})
const feeOptions = reactive<VxeGridProps>({
border: true,
height: 500,
align: null,
columnConfig: {
resizable: true,
},
columns: [
{
title: '序号',
type: 'seq',
fixed: 'left',
width: 50,
align: 'center',
},
{
title: 'id',
field: 'id',
visible: false,
},
{
title: 'feerateid',
field: 'feerateid',
visible: false,
},
{
title: 'feetype',
field: 'feetype',
visible: false,
},
{
title: '费用类型',
field: 'feemaketype',
width: 100,
fixed: 'left',
},
{
title: '费用名称',
field: 'feename',
width: 100,
},
{
title: '计费单位',
field: 'defaultunit',
width: 100,
},
{
title: '计费单价',
field: 'feeprice',
width: 100,
},
{
title: '收付方向',
field: 'feetypename',
width: 100,
},
{
title: '计费等级',
field: 'feegrade',
width: 100,
},
{
title: '计费区间',
field: 'feescale',
width: 100,
},
{
title: '增值价',
field: 'addprice',
width: 100,
},
{
title: '封顶价',
field: 'endprice',
width: 100,
},
{
title: '结算账期',
field: 'inputmode',
width: 100,
},
{
title: '备注',
field: 'remark',
},
],
toolbarConfig: {},
data: feeSource,
})
const getTitle = computed(() => (!unref(isUpdate) ? '预约入库-新增' : '预约入库-审批'))
async function handleSave(exit) {

97
gslk-wms-web-server/src/views/wms/wmsinplan/columns.tsx
Unescape Escape View File

@ -113,6 +113,12 @@ export const columns: BasicColumn[] = [
return text
},
},
{
title: '审批时间',
dataIndex: 'auditTime',
width: 100,
sorter: true,
},
{
title: '审批备注',
dataIndex: 'auditNote',
@ -232,7 +238,6 @@ export const listcolumns: BasicColumn[] = [
},
]
export const searchFormSchema: FormSchema[] = [
{
field: 'CUSTOMERNAME',
@ -259,15 +264,64 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 8 },
},
]
export const formSchema: FormSchema[] = [
export const auditFormSchema: FormSchema[] = [
{
field: 'divider-selects',
component: 'Divider',
label: '基本信息',
label: '审批意见',
colProps: {
span: 24,
},
},
{
field: 'auditStatus',
label: '审批状态',
component: 'Input',
colProps: {
span: 8,
},
slot: 'auditStatusSlot',
},
{
field: 'auditNote',
component: 'InputTextArea',
label: '审核意见',
defaultValue: '通过',
colProps: {
span: 18,
},
componentProps: {
placeholder: '请填写审核意见',
rows: 4,
},
},
{
field: 'status',
component: 'RadioButtonGroup',
label: '审批选项',
defaultValue: 1,
required: true,
colProps: {
span: 18,
},
componentProps: {
placeholder: '请选择状态',
options: [
{ label: '通过', value: 1 },
{ label: '驳回', value: 2 },
],
},
},
]
export const formSchema: FormSchema[] = [
// {
// field: 'divider-selects',
// component: 'Divider',
// label: '基本信息',
// colProps: {
// span: 24,
// },
// },
{
label: '',
field: 'wmsplanid',
@ -383,39 +437,6 @@ export const formSchema: FormSchema[] = [
],
},
},
// {
// field: 'goodsname',
// label: '商品名称',
// component: 'Input',
// colProps: {
// span: 8,
// },
// componentProps: {
// disabled: true,
// },
// },
// {
// field: 'goodsmodel',
// label: '规格型号',
// component: 'Input',
// colProps: {
// span: 8,
// },
// componentProps: {
// disabled: true,
// },
// },
// {
// field: 'truckno',
// label: '承运车辆',
// component: 'Input',
// colProps: {
// span: 8,
// },
// componentProps: {
// disabled: true,
// },
// },
{
field: 'storehousename',
label: '仓库',
@ -446,7 +467,7 @@ export const formSchema: FormSchema[] = [
},
helpMessage: ['请按要求上传报关单资料!'],
ifShow: ({ values }) => {
return values.billtype === '1' && !!values.wmsplanid
return values.billtype === '0' && !!values.wmsplanid
},
},
{
@ -490,7 +511,7 @@ export const formSchema: FormSchema[] = [
},
componentProps: {
placeholder: '请填写审核意见',
rows: 4,
rows: 2,
},
},
{

6
gslk-wms-web-server/src/views/wms/wmsoutplan/columns.tsx
Unescape Escape View File

@ -77,6 +77,12 @@ export const columns: BasicColumn[] = [
return text
},
},
{
title: '审批时间',
dataIndex: 'auditTime',
width: 100,
sorter: true,
},
{
title: '审批备注',
dataIndex: 'auditNote',

2
gslk-wmsapi-service-client/DS.WMS.Core/System/Dtos/CodeGoodsAuditViewModel.cs
Unescape Escape View File

@ -23,6 +23,8 @@ public class CodeGoodsAuditViewModel:CodeGoodsViewModel
/// </summary>
public int? AuditStatus { get; set; }
public DateTime AuditTime { get; set; }
/// <summary>
/// 审批备注
/// </summary>

16
gslk-wmsapi-service-client/DS.WMS.Core/System/Dtos/CompanyInput.cs
Unescape Escape View File

@ -13,42 +13,42 @@ public class CompanyInput
/// Default:
/// Nullable:True
/// </summary>
public string SHORTNAME { get; set; }
public string SHORTNAME { get; set; }= "";
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string DESCRIPTION { get; set; }
public string DESCRIPTION { get; set; }= "";
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string ADDR { get; set; }
public string ADDR { get; set; }= "";
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string EMAIL { get; set; }
public string EMAIL { get; set; }= "";
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string TEL { get; set; }
public string TEL { get; set; }= "";
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string CHIEF { get; set; }
public string CHIEF { get; set; }= "";
/// <summary>
@ -77,14 +77,14 @@ public class CompanyInput
/// Default:
/// Nullable:True
/// </summary>
public string LOGINNAME { get; set; }
public string LOGINNAME { get; set; }= "";
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string TAXNO { get; set; }
public string TAXNO { get; set; } = "";
/// <summary>
/// 业务归属单位

2
gslk-wmsapi-service-client/DS.WMS.Core/WmsModule/Method/WmsInPlanService.cs
Unescape Escape View File

@ -125,7 +125,7 @@ public class WmsInPlanService:IWmsInPlanService
plan.GOODSNAME = record.GOODSNAME;
plan.TRUCKNO = record.TRUCKNO;
plan.GOODSMODEL = record.GOODSMODEL;
plan.MBLNO = record.MBLNO;
// plan.MBLNO = record.MBLNO;
}
db.Insertable(plan).ExecuteCommand();

37
gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt
Unescape Escape View File

@ -5292,3 +5292,40 @@
2023-04-21 18:08:38.7095 Info Shutdown() called. Logger closing...
2023-04-21 18:08:38.7095 Info Closing old configuration.
2023-04-21 18:08:38.7710 Info Logger has been closed down.
2023-04-23 17:14:58.2103 Info Message Template Auto Format enabled
2023-04-23 17:14:58.2448 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 17:14:58.4754 Info Adding target FileTarget(Name=allfile)
2023-04-23 17:14:58.4847 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 17:14:58.5214 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 17:14:58.6453 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-client\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 17:14:58.6772 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 17:31:54.4741 Info Shutdown() called. Logger closing...
2023-04-23 17:31:54.4741 Info Closing old configuration.
2023-04-23 17:31:54.5117 Info Logger has been closed down.
2023-04-23 17:32:27.6546 Info Message Template Auto Format enabled
2023-04-23 17:32:27.6889 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 17:32:27.7972 Info Adding target FileTarget(Name=allfile)
2023-04-23 17:32:27.7972 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 17:32:27.8168 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 17:32:27.8538 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-client\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 17:32:27.8626 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 17:33:02.2170 Info Message Template Auto Format enabled
2023-04-23 17:33:02.2539 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 17:33:02.3492 Info Adding target FileTarget(Name=allfile)
2023-04-23 17:33:02.3492 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 17:33:02.3731 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 17:33:02.4198 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-client\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 17:33:02.4309 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 17:40:09.6258 Info Shutdown() called. Logger closing...
2023-04-23 17:40:09.6258 Info Closing old configuration.
2023-04-23 17:40:09.6861 Info Logger has been closed down.
2023-04-23 17:40:30.3172 Info Message Template Auto Format enabled
2023-04-23 17:40:30.3414 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 17:40:30.4742 Info Adding target FileTarget(Name=allfile)
2023-04-23 17:40:30.4866 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 17:40:30.5089 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 17:40:30.5578 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-client\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 17:40:30.5683 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 19:54:23.0763 Info Shutdown() called. Logger closing...
2023-04-23 19:54:23.0779 Info Closing old configuration.
2023-04-23 19:54:23.1657 Info Logger has been closed down.

1214
gslk-wmsapi-service-server/Api.xml
View File

File diff suppressed because it is too large Load Diff

2
gslk-wmsapi-service-server/DS.WMS.Core/BaseInfo/Dtos/GoodsFeeTypeInput.cs
Unescape Escape View File

@ -4,7 +4,7 @@ namespace DS.WMS.Core.BaseInfo.Dtos;
/// </summary>
public class GoodsFeeTypeInput
{
public string GID { get; set; }
public Guid? GID { get; set; }
/// 计费大类
/// </summary>
public string GOODSFEETYPE { get; set; }

4
gslk-wmsapi-service-server/DS.WMS.Core/BaseInfo/Entity/code_goods_audit.cs
Unescape Escape View File

@ -115,4 +115,8 @@ public class code_goods_audit
/// 审批备注
/// </summary>
public string AuditNote { get; set; }= "";
/// <summary>
/// 审批时间
/// </summary>
public DateTime AuditTime{ get; set; } = DateTime.Now;
}

4
gslk-wmsapi-service-server/DS.WMS.Core/BaseInfo/Method/GoodsFeeTypeService.cs
Unescape Escape View File

@ -66,7 +66,7 @@ public class GoodsFeeTypeService:IGoodsFeeTypeService
return DataResult.Failed("计费大类已存在!");
}
var data = model.MapTo<GoodsFeeTypeInput,OP_WMS_GOODSFEETYPE>();
var data = model.Adapt<OP_WMS_GOODSFEETYPE>();
db.Insertable(data).ExecuteCommand();
@ -74,7 +74,7 @@ public class GoodsFeeTypeService:IGoodsFeeTypeService
}
else
{
var info =db.Queryable<OP_WMS_GOODSFEETYPE>().Where(x => x.GID == Guid.Parse(model.GID)).First();
var info =db.Queryable<OP_WMS_GOODSFEETYPE>().Where(x => x.GID == model.GID).First();
info = model.Adapt(info);
db.Updateable(info).IgnoreColumns(ignoreAllNullColumns:true).ExecuteCommand();

1
gslk-wmsapi-service-server/DS.WMS.Core/System/Dtos/CodeGoodsAuditViewModel.cs
Unescape Escape View File

@ -24,6 +24,7 @@ public class CodeGoodsAuditViewModel : CodeGoodsViewModel
/// </summary>
public int? AuditStatus { get; set; }
public DateTime AuditTime { get; set; }
/// <summary>
/// 审批备注
/// </summary>

22
gslk-wmsapi-service-server/DS.WMS.Core/System/Dtos/CollectWarningCount.cs
Unescape Escape View File

@ -0,0 +1,22 @@
namespace DS.WMS.Core.System.Dtos;
/// <summary>
/// 集合提醒统计
/// </summary>
public class CollectWarningCount
{
public int LineDetectionCount { get; set; }= 0;
public int ThermometryCount { get; set; }= 0;
public int WmsInPlanCount { get; set; }= 0;
public int WmsOutPlanCount { get; set; }= 0;
public int WmsClearanceCount { get; set; }= 0;
public int GoodsAuditCount { get; set; }= 0;
public int ClientAuditCount { get; set; } = 0;
public int ContractCount { get; set; } = 0;
}

12
gslk-wmsapi-service-server/DS.WMS.Core/System/Dtos/RouteItem.cs
Unescape Escape View File

@ -30,6 +30,8 @@ public class RouteItem
public RouteMeta Meta { get; set; }
public Tag Tag { get; set; }
public List<RouteItem> Children { get; set; }
/// <summary>
@ -47,3 +49,13 @@ public class RouteMeta
public string Icon { get; set; }
}
public class Tag
{
/// <summary>
///
/// </summary>
public string Content { get; set; }
public bool Dot { get; set; }
public string Type { get; set; }
}

5
gslk-wmsapi-service-server/DS.WMS.Core/System/Entity/OP_YARD_COMPANY.cs
Unescape Escape View File

@ -360,4 +360,9 @@ public class OP_YARD_COMPANY
/// 审批备注
/// </summary>
public string AuditNote { get; set; }
/// <summary>
/// 审批时间
/// </summary>
public DateTime AuditTime{ get; set; } = DateTime.Now;
}

13
gslk-wmsapi-service-server/DS.WMS.Core/System/Interface/ICommonService.cs
Unescape Escape View File

@ -116,4 +116,17 @@ public interface ICommonService
/// <param name="code"></param>
/// <returns></returns>
public DataResult GetFeeList(string code);
/// <summary>
/// 获取仓库选择
/// </summary>
/// <returns></returns>
public DataResult<List<ApiSelectViewModel>> GetStoreHouseSelect();
/// <summary>
/// 获取集合提醒统计
/// </summary>
/// <returns></returns>
public DataResult<CollectWarningCount> GetCollectWarningCount();
}

2
gslk-wmsapi-service-server/DS.WMS.Core/System/Method/CodeGoodsAuditService.cs
Unescape Escape View File

@ -47,9 +47,11 @@ public class CodeGoodsAuditService : ICodeGoodsAuditService
.LeftJoin<OP_YARD_COMPANY>((a, b,c) => a.CompanyId == c.GID.ToString())
.Select((a, b,c) => new CodeGoodsAuditViewModel()
{
AuditTime = a.AuditTime,
CompanyName = c.DESCRIPTION //手动指定一列在自动映射
},
true)
.MergeTable()
// .Select<CodeGoodsAuditViewModel>()
.Where(whereList).Where(a => a.AuditStatus != AuditStatus.NoAudit.ToEnumInt()).ToQueryPage(request.PageCondition);
return data;

131
gslk-wmsapi-service-server/DS.WMS.Core/System/Method/CommonService.cs
Unescape Escape View File

@ -8,11 +8,14 @@ using DS.Module.UserModule;
using DS.WMS.Common.Enum;
using DS.WMS.Core.BaseInfo.Dtos;
using DS.WMS.Core.BaseInfo.Entity;
using DS.WMS.Core.ContractModule.Entity;
using DS.WMS.Core.FeeModule.Entity;
using DS.WMS.Core.OpenApiModule.Entity;
using DS.WMS.Core.SecurityModule.Entity;
using DS.WMS.Core.System.Dtos;
using DS.WMS.Core.System.Entity;
using DS.WMS.Core.System.Interface;
using DS.WMS.Core.WmsModule.Entity;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
@ -295,6 +298,99 @@ public class CommonService : ICommonService
}
}
#region 处理报警信息
var data = new CollectWarningCount();
data.ThermometryCount = db.Queryable<tb_HKThermometry>().Where(x => x.Status == 0).Count();
data.LineDetectionCount = db.Queryable<tb_HKLineDetection>().Where(x => x.Status == 0).Count();
data.GoodsAuditCount = db.Queryable<code_goods_audit>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.ClientAuditCount = db.Queryable<OP_YARD_COMPANY>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.WmsInPlanCount = db.Queryable<OP_WMS_IN_PLAN>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.WmsOutPlanCount = db.Queryable<OP_WMS_OUT_PLAN>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.WmsClearanceCount = db.Queryable<OP_WMS_CLEARANCE>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.ContractCount = db.Queryable<tb_Contract>()
.Where(x => x.EndDate.AddDays(x.Days * (-1)) <= DateTime.Now && x.Status == 0).Count();
foreach (var item in list)
{
if (item.Name =="园区安全")
{
var temp = item.Children.Where(x => x.Name == "高温报警").First();
temp.Tag = new Tag()
{
Type = "error",
Dot = false,
Content = data.ThermometryCount.ToString(),
};
var temp1 = item.Children.Where(x => x.Name == "越界侦测").First();
temp1.Tag = new Tag()
{
Type = "error",
Dot = false,
Content = data.LineDetectionCount.ToString(),
};
}
if (item.Name =="仓储管理")
{
var temp = item.Children.Where(x => x.Name == "预约入库审批").First();
temp.Tag = new Tag()
{
Type = "error",
Dot = false,
Content = data.WmsInPlanCount.ToString(),
};
var temp1 = item.Children.Where(x => x.Name == "预约出库审批").First();
temp1.Tag = new Tag()
{
Type = "error",
Dot = false,
Content = data.WmsOutPlanCount.ToString(),
};
var temp2 = item.Children.Where(x => x.Name == "预约清关审批").First();
temp2.Tag = new Tag()
{
Type = "error",
Dot = false,
Content = data.WmsClearanceCount.ToString(),
};
}
if (item.Name =="基础信息")
{
var temp = item.Children.Where(x => x.Name == "商品申报").First();
temp.Tag = new Tag()
{
Type = "error",
Dot = false,
Content = data.GoodsAuditCount.ToString(),
};
var temp1 = item.Children.Where(x => x.Name == "企业用户审批").First();
temp1.Tag = new Tag()
{
Type = "error",
Dot = false,
Content = data.ClientAuditCount.ToString(),
};
}
if (item.Name =="合同管理")
{
var temp = item.Children.Where(x => x.Name == "合同信息").First();
temp.Tag = new Tag()
{
Type = "error",
Dot = false,
Content = data.ContractCount.ToString(),
};
}
}
#endregion
// list = list.OrderBy(x => x.Id).ToList();
return DataResult<List<RouteItem>>.Success("获取数据成功!", list);
}
@ -655,4 +751,39 @@ public class CommonService : ICommonService
.ToList();
return DataResult.Successed("获取数据成功!", data);
}
/// <summary>
/// 获取仓库选择
/// </summary>
/// <returns></returns>
public DataResult<List<ApiSelectViewModel>> GetStoreHouseSelect()
{
var list = db.Queryable<OP_WMS_STOREHOUSE>()
.Select(a => new ApiSelectViewModel
{
Label = a.AREANAME,
Value = a.AREACODE,
})
.ToList();
return DataResult<List<ApiSelectViewModel>>.Success("获取数据成功!", list);
}
/// <summary>
/// 获取集合提醒统计
/// </summary>
/// <returns></returns>
public DataResult<CollectWarningCount> GetCollectWarningCount()
{
var data = new CollectWarningCount();
data.ThermometryCount = db.Queryable<tb_HKThermometry>().Where(x => x.Status == 0).Count();
data.LineDetectionCount = db.Queryable<tb_HKLineDetection>().Where(x => x.Status == 0).Count();
data.GoodsAuditCount = db.Queryable<code_goods_audit>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.ClientAuditCount = db.Queryable<OP_YARD_COMPANY>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.WmsInPlanCount = db.Queryable<OP_WMS_IN_PLAN>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.WmsOutPlanCount = db.Queryable<OP_WMS_OUT_PLAN>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
data.WmsClearanceCount = db.Queryable<OP_WMS_CLEARANCE>().Where(x => x.AuditStatus == AuditStatus.Auditing.ToEnumInt()).Count();
return DataResult<CollectWarningCount>.Success("获取数据成功!", data);
}
}

136
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Dtos/WmsStoreListPagModel.cs
Unescape Escape View File

@ -0,0 +1,136 @@
namespace DS.WMS.Core.WmsModule.Dtos;
public class WmsStoreListPagModel
{
public Guid WMSPHYSICSID { get; set; }
public Guid? WMSID { get; set; }
/// <summary>
/// Desc:
/// </summary>
public string STOREHOUSE { get; set; }
public string STOREHOUSENAME { get; set; }
/// <summary>
/// Desc:
/// </summary>
public string AREACODE { get; set; }
public string AREACODENAME { get; set; }
/// <summary>
/// Desc:
/// </summary>
public decimal? KGS { get; set; }
/// <summary>
/// Desc:
/// </summary>
public decimal? CBM { get; set; }
/// <summary>
/// Desc:
/// </summary>
public decimal? PKGS { get; set; }
/// <summary>
/// 锁库件数
/// </summary>
public decimal? LOCKPKGS { get; set; } = 0;
/// <summary>
/// Desc:
/// </summary>
public decimal? MINPKGS { get; set; }
/// <summary>
/// Desc:
/// </summary>
public string KINDPKGS { get; set; }
/// <summary>
/// Desc:
/// </summary>
public string STORAGEUNIT { get; set; }
/// <summary>
/// Desc:
/// </summary>
public decimal? STORAGEUNITCOUNT { get; set; }
/// <summary>
/// 锁库计费数量
/// </summary>
public decimal? LOCKSTORAGEUNITCOUNT { get; set; } = 0;
/// <summary>
/// 入库日期
/// </summary>
public DateTime? STARTDATE { get; set; }
/// <summary>
/// Desc:
/// </summary>
public decimal? NETWEIGHT { get; set; }
/// <summary>
/// 客户ID
/// </summary>
public string ClientId { get; set; }
/// <summary>
///
/// </summary>
public string BILLTYPE { get; set; }
/// <summary>
///
/// </summary>
public string CUSTOMERNAME { get; set; }
/// <summary>
///
/// </summary>
public string GOODSCODE { get; set; }
/// <summary>
///
/// </summary>
public string GOODSHSCODE { get; set; }
/// <summary>
///
/// </summary>
public string MBLNO { get; set; }
/// <summary>
/// 规格型号
/// </summary>
public string GOODSMODEL { get; set; }
/// <summary>
/// 商品名称
/// </summary>
public string GOODSNAME { get; set; }
/// <summary>
/// 助记码
/// </summary>
public string PinYinCode { get; set; }
/// <summary>
/// 批次号
/// </summary>
public string GOODSMODEL2 { get; set; }
/// <summary>
/// 计费单位类型
/// </summary>
public string StorageUnitType { get; set; }
}

6
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Entity/OP_WMS_CLEARANCE.cs
Unescape Escape View File

@ -108,11 +108,9 @@ public class OP_WMS_CLEARANCE : BaseMiddleModel
public string AuditBy { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// 审批时间
/// </summary>
public DateTime? AuditTime { get; set; }
public DateTime? AuditTime { get; set; } =DateTime.Now;
/// <summary>
/// Desc:

98
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Entity/OP_WMS_FEERATE_IN_DETAIL.cs
Unescape Escape View File

@ -0,0 +1,98 @@
using SqlSugar;
namespace DS.WMS.Core.WmsModule.Entity;
public class OP_WMS_FEERATE_IN_DETAIL
{
/// <summary>
/// Desc:
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public Guid ID { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public Guid? FEERATEID { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string FEEMAKETYPE { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string FEENAME { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string DEFAULTUNIT { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public decimal? FEEPRICE { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public byte? FEETYPE { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public byte? FEEGRADE { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public int? FEESCALE { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public decimal? ADDPRICE { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public decimal? ENDPRICE { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string REMARK { get; set; }
/// <summary>
/// Desc:
/// Default:
/// Nullable:True
/// </summary>
public string INPUTMODE { get; set; }
}

3
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Entity/OP_WMS_IN_PLAN.cs
Unescape Escape View File

@ -242,7 +242,7 @@ public class OP_WMS_IN_PLAN:BaseMiddleModel
/// <summary>
/// 审批时间
/// </summary>
public DateTime? AuditTime { get; set; }
public DateTime? AuditTime { get; set; } =DateTime.Now;
/// <summary>
/// 审批人
/// </summary>
@ -252,6 +252,7 @@ public class OP_WMS_IN_PLAN:BaseMiddleModel
/// 审批备注
/// </summary>
public string AuditNote { get; set; }
/// <summary>
/// 客户ID
/// </summary>

2
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Entity/OP_WMS_OUT_PLAN.cs
Unescape Escape View File

@ -170,7 +170,7 @@ namespace DS.WMS.Core.WmsModule.Entity
/// <summary>
/// 审批时间
/// </summary>
public DateTime? AuditTime { get; set; }
public DateTime? AuditTime { get; set; } =DateTime.Now;
/// <summary>
/// 审批人
/// </summary>

15
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Interface/IStoreQueryService.cs
Unescape Escape View File

@ -0,0 +1,15 @@
using DS.Module.Core;
using DS.WMS.Core.WmsModule.Dtos;
namespace DS.WMS.Core.WmsModule.Interface;
public interface IStoreQueryService
{
/// <summary>
/// 查询仓库库存
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public DataResult<List<WmsStoreListPagModel>> GetWmsStoreList(PageRequest request);
}

6
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Interface/IWmsInPlanService.cs
Unescape Escape View File

@ -40,4 +40,10 @@ public interface IWmsInPlanService
/// <param name="id"></param>
/// <returns></returns>
DataResult GetWmsInPlanGoodsList(string id);
/// <summary>
/// 获取入库计划费率信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public DataResult GetWmsInPlanFeeRateList(string id);
}

57
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Method/StoreQueryService.cs
Unescape Escape View File

@ -0,0 +1,57 @@
using DS.Module.Core;
using DS.Module.Core.Extensions;
using DS.Module.UserModule;
using DS.WMS.Core.BaseInfo.Entity;
using DS.WMS.Core.WmsModule.Dtos;
using DS.WMS.Core.WmsModule.Entity;
using DS.WMS.Core.WmsModule.Interface;
using Microsoft.Extensions.DependencyInjection;
using SqlSugar;
namespace DS.WMS.Core.WmsModule.Method;
public class StoreQueryService:IStoreQueryService
{
private readonly IServiceProvider _serviceProvider;
private readonly ISqlSugarClient db;
private readonly IUser user;
/// <summary>
///
/// </summary>
/// <param name="serviceProvider"></param>
public StoreQueryService(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;
db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
user = _serviceProvider.GetRequiredService<IUser>();
}
/// <summary>
/// 查询仓库库存
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public DataResult<List<WmsStoreListPagModel>> GetWmsStoreList(PageRequest request)
{
var companyId = user.GetCompanyId();
//序列化查询条件
var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
var data = db.Queryable<OP_WMS_PHYSICS>()
.LeftJoin<OP_WMS>((a, b) => a.WMSID == b.WMSID)
.LeftJoin<OP_WMS_STOREHOUSE>((a, b,c) => a.STOREHOUSE == c.AREACODE)
.LeftJoin<OP_WMS_STOREHOUSE_AREA>((a, b,c,d) => a.AREACODE == d.AREACODE)
.LeftJoin<code_goods>((a, b,c,d,e) => b.GoodsId == e.GID && e.ISSTOP ==false)
.Select((a, b,c,d,e) => new WmsStoreListPagModel()
{
STORAGEUNITCOUNT = a.STORAGEUNITCOUNT,
STOREHOUSENAME = c.AREANAME, //手动指定一列在自动映射
AREACODENAME = d.AREANAME
},
true)
// .Select<WmsInPlanListViewModel>()
.MergeTable()
.Where(whereList).Where(a => a.STORAGEUNITCOUNT+ a.LOCKSTORAGEUNITCOUNT>0).ToQueryPage(request.PageCondition);
return data;
}
}

8
gslk-wmsapi-service-server/DS.WMS.Core/WmsModule/Method/WmsInPlanService.cs
Unescape Escape View File

@ -317,4 +317,12 @@ public class WmsInPlanService : IWmsInPlanService
.Where(a => a.WMSPLANID == Guid.Parse(id)).ToList();
return DataResult.Successed("查询成功！", data);
}
public DataResult GetWmsInPlanFeeRateList(string id)
{
var data = db.Queryable<OP_WMS_FEERATE_IN_DETAIL>()
.Where(a => a.FEERATEID == Guid.Parse(id)).ToList();
return DataResult.Successed("查询成功！", data);
}
}

37
gslk-wmsapi-service-server/DS.WMS.WebApi/Api.xml
Unescape Escape View File

@ -236,6 +236,18 @@
<param name="code"></param>
<returns></returns>
</member>
<member name="M:DS.WMS.WebApi.Controllers.CommonController.GetStoreHouseSelect">
<summary>
获取仓库选择
</summary>
<returns></returns>
</member>
<member name="M:DS.WMS.WebApi.Controllers.CommonController.GetCollectWarningCount">
<summary>
获取集合提醒统计
</summary>
<returns></returns>
</member>
<member name="M:DS.WMS.WebApi.Controllers.CompanyController.#ctor(DS.WMS.Core.System.Interface.ICompanyService)">
<summary>
构造函数
@ -780,6 +792,24 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="T:DS.WMS.WebApi.Controllers.StoreQueryController">
<summary>
查询模块
</summary>
</member>
<member name="M:DS.WMS.WebApi.Controllers.StoreQueryController.#ctor(DS.WMS.Core.WmsModule.Interface.IStoreQueryService)">
<summary>
构造函数
</summary>
<param name="invokeService"></param>
</member>
<member name="M:DS.WMS.WebApi.Controllers.StoreQueryController.GetWmsStoreList(DS.Module.Core.PageRequest)">
<summary>
查询仓库库存
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="T:DS.WMS.WebApi.Controllers.SysDictionaryController">
<summary>
字典模块
@ -1116,6 +1146,13 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="M:DS.WMS.WebApi.Controllers.WmsInPlanController.GetWmsInPlanFeeRateList(System.String)">
<summary>
获取费率信息
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:DS.WMS.WebApi.Controllers.WmsOutDoController">
<summary>
出库确认

24
gslk-wmsapi-service-server/DS.WMS.WebApi/Controllers/CommonController.cs
Unescape Escape View File

@ -206,6 +206,7 @@ public class CommonController : ApiController
var res = _invokeService.GetStoreHouseList(request);
return res;
}
/// <summary>
/// 获取仓库库位列表
/// </summary>
@ -243,4 +244,27 @@ public class CommonController : ApiController
var res = _invokeService.GetFeeList(code);
return res;
}
/// <summary>
/// 获取仓库选择
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetStoreHouseSelect")]
public DataResult<List<ApiSelectViewModel>> GetStoreHouseSelect()
{
var res = _invokeService.GetStoreHouseSelect();
return res;
}
/// <summary>
/// 获取集合提醒统计
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetCollectWarningCount")]
public DataResult<CollectWarningCount> GetCollectWarningCount()
{
var res = _invokeService.GetCollectWarningCount();
return res;
}
}

36
gslk-wmsapi-service-server/DS.WMS.WebApi/Controllers/StoreQueryController.cs
Unescape Escape View File

@ -0,0 +1,36 @@
using DS.Module.Core;
using DS.WMS.Core.WmsModule.Dtos;
using DS.WMS.Core.WmsModule.Interface;
using Microsoft.AspNetCore.Mvc;
namespace DS.WMS.WebApi.Controllers;
/// <summary>
/// 查询模块
/// </summary>
public class StoreQueryController : ApiController
{
private readonly IStoreQueryService _invokeService;
/// <summary>
/// 构造函数
/// </summary>
/// <param name="invokeService"></param>
public StoreQueryController(IStoreQueryService invokeService)
{
_invokeService = invokeService;
}
/// <summary>
/// 查询仓库库存
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
[Route("GetWmsStoreList")]
public DataResult<List<WmsStoreListPagModel>> GetWmsStoreList([FromBody] PageRequest request)
{
var res = _invokeService.GetWmsStoreList(request);
return res;
}
}

12
gslk-wmsapi-service-server/DS.WMS.WebApi/Controllers/WmsInPlanController.cs
Unescape Escape View File

@ -83,4 +83,16 @@ public class WmsInPlanController : ApiController
var res = _invokeService.GetWmsInPlanGoodsList(id);
return res;
}
/// <summary>
/// 获取费率信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
[Route("GetWmsInPlanFeeRateList")]
public DataResult GetWmsInPlanFeeRateList([FromQuery]string id)
{
var res = _invokeService.GetWmsInPlanFeeRateList(id);
return res;
}
}

162
gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt
Unescape Escape View File

@ -6178,3 +6178,165 @@
2023-04-21 18:08:27.5508 Info Shutdown() called. Logger closing...
2023-04-21 18:08:27.5508 Info Closing old configuration.
2023-04-21 18:08:27.6376 Info Logger has been closed down.
2023-04-23 13:46:58.7143 Info Message Template Auto Format enabled
2023-04-23 13:46:58.7619 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 13:46:58.9134 Info Adding target FileTarget(Name=allfile)
2023-04-23 13:46:58.9236 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 13:46:58.9409 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 13:46:59.0000 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 13:46:59.0146 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 14:07:01.8836 Info Shutdown() called. Logger closing...
2023-04-23 14:07:01.8836 Info Closing old configuration.
2023-04-23 14:07:01.9278 Info Logger has been closed down.
2023-04-23 14:07:35.2534 Info Message Template Auto Format enabled
2023-04-23 14:07:35.2831 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 14:07:35.4059 Info Adding target FileTarget(Name=allfile)
2023-04-23 14:07:35.4059 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 14:07:35.4255 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 14:07:35.4641 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 14:07:35.4727 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 14:20:30.2695 Info Shutdown() called. Logger closing...
2023-04-23 14:20:30.2695 Info Closing old configuration.
2023-04-23 14:20:30.3089 Info Logger has been closed down.
2023-04-23 14:21:42.7820 Info Message Template Auto Format enabled
2023-04-23 14:21:42.8211 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 14:21:43.0863 Info Adding target FileTarget(Name=allfile)
2023-04-23 14:21:43.1012 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 14:21:43.1583 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 14:21:43.3710 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 14:21:43.4371 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 16:27:56.4510 Info Shutdown() called. Logger closing...
2023-04-23 16:27:56.4527 Info Closing old configuration.
2023-04-23 16:27:56.5001 Info Logger has been closed down.
2023-04-23 16:28:32.0688 Info Message Template Auto Format enabled
2023-04-23 16:28:32.0806 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 16:28:32.1899 Info Adding target FileTarget(Name=allfile)
2023-04-23 16:28:32.1899 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 16:28:32.2131 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 16:28:32.2579 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 16:28:32.2695 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 18:37:44.7395 Info Shutdown() called. Logger closing...
2023-04-23 18:37:44.7395 Info Closing old configuration.
2023-04-23 18:37:44.8024 Info Logger has been closed down.
2023-04-23 18:38:22.6791 Info Message Template Auto Format enabled
2023-04-23 18:38:22.7195 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 18:38:22.8933 Info Adding target FileTarget(Name=allfile)
2023-04-23 18:38:22.8933 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 18:38:22.9442 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 18:38:23.0987 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 18:38:23.1401 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 18:41:03.9590 Info Message Template Auto Format enabled
2023-04-23 18:41:03.9751 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 18:41:04.0649 Info Adding target FileTarget(Name=allfile)
2023-04-23 18:41:04.0649 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 18:41:04.0879 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 18:41:04.1407 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 18:41:04.1407 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 18:48:30.2168 Info Message Template Auto Format enabled
2023-04-23 18:48:30.2309 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 18:48:30.3224 Info Adding target FileTarget(Name=allfile)
2023-04-23 18:48:30.3276 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 18:48:30.3276 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 18:48:30.3729 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 18:48:30.3813 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 19:57:01.9014 Info Shutdown() called. Logger closing...
2023-04-23 19:57:01.9014 Info Closing old configuration.
2023-04-23 19:57:01.9484 Info Logger has been closed down.
2023-04-23 19:57:39.6058 Info Message Template Auto Format enabled
2023-04-23 19:57:39.6320 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 19:57:39.7138 Info Adding target FileTarget(Name=allfile)
2023-04-23 19:57:39.7192 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 19:57:39.7192 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 19:57:39.7737 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 19:57:39.7842 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 19:58:21.6824 Info Shutdown() called. Logger closing...
2023-04-23 19:58:21.6824 Info Closing old configuration.
2023-04-23 19:58:21.7169 Info Logger has been closed down.
2023-04-23 19:58:44.5111 Info Message Template Auto Format enabled
2023-04-23 19:58:44.5236 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 19:58:44.6021 Info Adding target FileTarget(Name=allfile)
2023-04-23 19:58:44.6091 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 19:58:44.6091 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 19:58:44.6597 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 19:58:44.6597 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 20:00:53.9199 Info Shutdown() called. Logger closing...
2023-04-23 20:00:53.9223 Info Closing old configuration.
2023-04-23 20:00:54.0268 Info Logger has been closed down.
2023-04-23 20:01:16.0455 Info Message Template Auto Format enabled
2023-04-23 20:01:16.0577 Info Loading assembly: NLog.Web.AspNetCore
2023-04-23 20:01:16.1469 Info Adding target FileTarget(Name=allfile)
2023-04-23 20:01:16.1555 Info Adding target FileTarget(Name=ownFile-web)
2023-04-23 20:01:16.1726 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-23 20:01:16.2075 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-23 20:01:16.2075 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-23 20:01:51.5776 Info Shutdown() called. Logger closing...
2023-04-23 20:01:51.5776 Info Closing old configuration.
2023-04-23 20:01:51.6429 Info Logger has been closed down.
2023-04-24 08:54:49.6736 Info Message Template Auto Format enabled
2023-04-24 08:54:49.7840 Info Loading assembly: NLog.Web.AspNetCore
2023-04-24 08:54:50.2290 Info Adding target FileTarget(Name=allfile)
2023-04-24 08:54:50.2534 Info Adding target FileTarget(Name=ownFile-web)
2023-04-24 08:54:50.3851 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-24 08:54:50.5815 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-24 08:54:50.6584 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-24 09:27:29.1550 Info Shutdown() called. Logger closing...
2023-04-24 09:27:29.1567 Info Closing old configuration.
2023-04-24 09:27:29.1957 Info Logger has been closed down.
2023-04-24 09:28:15.9592 Info Message Template Auto Format enabled
2023-04-24 09:28:15.9731 Info Loading assembly: NLog.Web.AspNetCore
2023-04-24 09:28:16.0536 Info Adding target FileTarget(Name=allfile)
2023-04-24 09:28:16.0536 Info Adding target FileTarget(Name=ownFile-web)
2023-04-24 09:28:16.0746 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-24 09:28:16.1136 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-24 09:28:16.1136 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-24 10:12:01.7525 Info Shutdown() called. Logger closing...
2023-04-24 10:12:01.7525 Info Closing old configuration.
2023-04-24 10:12:01.7820 Info Logger has been closed down.
2023-04-24 10:13:01.0862 Info Message Template Auto Format enabled
2023-04-24 10:13:01.1047 Info Loading assembly: NLog.Web.AspNetCore
2023-04-24 10:13:01.2387 Info Adding target FileTarget(Name=allfile)
2023-04-24 10:13:01.2495 Info Adding target FileTarget(Name=ownFile-web)
2023-04-24 10:13:01.2874 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-24 10:13:01.3954 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-24 10:13:01.4136 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-24 10:15:06.4506 Info Shutdown() called. Logger closing...
2023-04-24 10:15:06.4517 Info Closing old configuration.
2023-04-24 10:15:06.4812 Info Logger has been closed down.
2023-04-24 10:15:28.8939 Info Message Template Auto Format enabled
2023-04-24 10:15:28.9163 Info Loading assembly: NLog.Web.AspNetCore
2023-04-24 10:15:29.0553 Info Adding target FileTarget(Name=allfile)
2023-04-24 10:15:29.0704 Info Adding target FileTarget(Name=ownFile-web)
2023-04-24 10:15:29.1031 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-24 10:15:29.1772 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-24 10:15:29.1907 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-24 10:17:33.9021 Info Shutdown() called. Logger closing...
2023-04-24 10:17:33.9021 Info Closing old configuration.
2023-04-24 10:17:33.9789 Info Logger has been closed down.
2023-04-24 10:18:03.8502 Info Message Template Auto Format enabled
2023-04-24 10:18:03.8807 Info Loading assembly: NLog.Web.AspNetCore
2023-04-24 10:18:04.0003 Info Adding target FileTarget(Name=allfile)
2023-04-24 10:18:04.0003 Info Adding target FileTarget(Name=ownFile-web)
2023-04-24 10:18:04.0239 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-24 10:18:04.0706 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-24 10:18:04.0816 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-24 10:23:36.0992 Info Message Template Auto Format enabled
2023-04-24 10:23:36.1237 Info Loading assembly: NLog.Web.AspNetCore
2023-04-24 10:23:36.1917 Info Adding target FileTarget(Name=allfile)
2023-04-24 10:23:36.1917 Info Adding target FileTarget(Name=ownFile-web)
2023-04-24 10:23:36.2074 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-24 10:23:36.2401 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-24 10:23:36.2511 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-24 10:52:33.2470 Info Message Template Auto Format enabled
2023-04-24 10:52:33.2628 Info Loading assembly: NLog.Web.AspNetCore
2023-04-24 10:52:33.3169 Info Adding target FileTarget(Name=allfile)
2023-04-24 10:52:33.3169 Info Adding target FileTarget(Name=ownFile-web)
2023-04-24 10:52:33.3351 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-24 10:52:33.3598 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-24 10:52:33.3598 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
2023-04-24 10:56:33.3618 Info Message Template Auto Format enabled
2023-04-24 10:56:33.3618 Info Loading assembly: NLog.Web.AspNetCore
2023-04-24 10:56:33.6559 Info Adding target FileTarget(Name=allfile)
2023-04-24 10:56:33.6559 Info Adding target FileTarget(Name=ownFile-web)
2023-04-24 10:56:33.6890 Info Adding target ColoredConsoleTarget(Name=console)
2023-04-24 10:56:33.9026 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config
2023-04-24 10:56:33.9299 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile

Write Preview
Loading…
Cancel
Save