Browse Source

Merge branch 'master_hella' into hella_chenfang

hella_online_20250220
陈放 3 days ago
parent
commit
183705d861
  1. 27
      .env.wyf
  2. 12
      src/api/wms/balance/index.ts
  3. 4
      src/api/wms/countadjustRequestMain/index.ts
  4. BIN
      src/assets/imgs/logo1.png
  5. 2
      src/router/modules/remaining.ts
  6. 17
      src/views/wms/basicDataManage/customerManage/customerdock/index.vue
  7. 2
      src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
  8. 16
      src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
  9. 21
      src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
  10. 44
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  11. 12
      src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
  12. 1
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  13. 5
      src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
  14. 2
      src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
  15. 24
      src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
  16. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
  17. 1
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
  18. 1
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
  19. 18
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
  20. 16
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
  21. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
  22. 2
      src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue
  23. 26
      src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts

27
.env.wyf

@ -15,11 +15,11 @@ VITE_DEV=false
# # 上传路径
# VITE_UPLOAD_URL='http://192.168.0.216:12080/admin-api/infra/file/upload'
# # 雪冰
# 雪冰
# # # 请求路径
# VITE_BASE_URL='http://192.168.1.68:12080'
# VITE_BASE_URL='http://192.168.0.34:12080'
# # 上传路径
# VITE_UPLOAD_URL='http://192.168.1.68:12080/admin-api/infra/file/upload'
# VITE_UPLOAD_URL='http://192.168.0.34:12080/admin-api/infra/file/upload'
# # 依然
# # # 请求路径
# VITE_BASE_URL='http://192.168.1.253:12080'
@ -33,6 +33,11 @@ VITE_DEV=false
# VITE_UPLOAD_URL='http:// 192.168.0.106:12080/admin-api/infra/file/upload'
# # 陈放
# # 请求路径
# VITE_BASE_URL='http://192.168.0.26:12080'
# # 上传路径
# VITE_UPLOAD_URL='http:// 192.168.0.26:12080/admin-api/infra/file/upload'
# 佳兴
@ -46,10 +51,10 @@ VITE_DEV=false
# # 上传路径
# VITE_UPLOAD_URL='http://192.168.0.37:12080/admin-api/infra/file/upload'
# 81 WMS请求路径 82 SCP
VITE_BASE_URL='http://172.22.32.9/api'
# 上传路径
VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload'
# # 81 WMS请求路径 82 SCP
# VITE_BASE_URL='https://wmscdtest.faway-hella.com/api'
# # 上传路径
# VITE_UPLOAD_URL='https://wmscdtest.faway-hella.com/api/admin-api/infra/file/upload'
@ -63,10 +68,10 @@ VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload'
# # 上传路径
# VITE_UPLOAD_URL='https://scptest.faway-hella.com/api/admin-api/infra/file/upload'
# # scptest
# VITE_BASE_URL='http://172.21.32.16/api'
# # 上传路径
# VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload'
# scptest
VITE_BASE_URL='http://172.21.32.16/api'
# 上传路径
VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload'

12
src/api/wms/balance/index.ts

@ -120,6 +120,18 @@ export const getBalancePageByBusinessTypeByItemType = async (params) => {
}
}
// 查询库存余额列表根据业务类型的物料类型--制品回收
export const getBalancePageByBusinessTypeByItemTypeProductredress = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/balance/seniorBusinessTypeByItemTypeProductredress', data })
} else {
return await request.get({ url: `/wms/balance/pageBusinessTypeByItemTypeProductredress`, params })
}
}
// 备件出库查询库存余额列表
export const getBalancePageSpare = async (params) => {
if (params.isSearch) {

4
src/api/wms/countadjustRequestMain/index.ts

@ -94,6 +94,6 @@ export const refused = async (id) => {
}
// 处理盘点申请主 Excel
export const handle = async (id) => {
return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id })
export const handle = async ({id,remark}) => {
return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id + '&remark='+remark })
}

BIN
src/assets/imgs/logo1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

2
src/router/modules/remaining.ts

@ -36,7 +36,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
{
path: '/redirect',
component: Layout,
name: 'Redirect',
name: 'redirectNew',
children: [
{
path: '/redirect/:path(.*)',

17
src/views/wms/basicDataManage/customerManage/customerdock/index.vue

@ -191,14 +191,17 @@ const formsSuccess = async (formType,data) => {
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
basicFormRef.value.formLoading = true
if (formType === 'create') {
await CustomerdockApi.createCustomerdock(data)
message.success(t('common.createSuccess'))
} else {
await CustomerdockApi.updateCustomerdock(data)
message.success(t('common.updateSuccess'))
try {
if (formType === 'create') {
await CustomerdockApi.createCustomerdock(data)
message.success(t('common.createSuccess'))
} else {
await CustomerdockApi.updateCustomerdock(data)
message.success(t('common.updateSuccess'))
}
} finally {
basicFormRef.value.formLoading = false
}
basicFormRef.value.formLoading = false
basicFormRef.value.dialogVisible = false
if (formType === 'create') {
getList()

2
src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts

@ -257,7 +257,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false
isTable: true
},
{
label: '创建者',

16
src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts

@ -175,14 +175,6 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150
// },
// },
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
},
{
label: '创建时间',
field: 'createTime',
@ -248,6 +240,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '备注',
field: 'remark',
sort: 'custom',
table: {
width: 150
},
},
]))
//表单校验

21
src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts

@ -679,3 +679,24 @@ export const CountadjustRequestDetailRules = reactive({
{ required: true, message: '请选择物料代码', trigger: 'change' }
],
})
export const CountadjustHandle = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '备注',
field: 'remark',
sort: 'custom',
isTable:false,
form: {
component: 'Input',
componentProps:{
type: 'textarea'
}
},
},
]))
export const CountadjustHandleRules = reactive({
// remark: [
// { max: 50, message: '不得超过50个字符', trigger: 'blur' }
// ],
})

44
src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@ -78,6 +78,16 @@
@searchTableSuccessDetail="searchTableSuccessDetail"
/>
<!-- 处理填写备注窗口 finance_mainPlanSub -->
<BasicForm
ref="handleFormRef"
:rules="CountadjustHandleRules"
:formAllSchemas="CountadjustHandle.allSchemas"
:isBusiness="false"
:footButttondata="undefined"
@success="submitFormHandle"
/>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/countadjust-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@ -86,7 +96,7 @@
<script setup lang="ts">
import download from '@/utils/download'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDetail,CountadjustRequestDetailRules } from './countadjustRequestMain.data'
import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDetail,CountadjustRequestDetailRules,CountadjustHandle,CountadjustHandleRules } from './countadjustRequestMain.data'
import * as CountadjustRequestMainApi from '@/api/wms/countadjustRequestMain'
import * as CountadjustRequestDetailApi from '@/api/wms/countadjustRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
@ -261,27 +271,29 @@ const buttonTableClick = async (val, row) => {
console.log(err)
})
} else if (val == 'mainHandle') { //
await message.confirm('确认要处理吗?')
let getLoading = ElLoading.service({
lock: true,
text: 'loading...',
background: 'rgba(0, 0, 0, 0.7)'
})
CountadjustRequestMainApi.handle(row.id).then(() => {
message.success(t('处理成功'))
getLoading?.close()
buttonBaseClick('refresh',null)
}).catch(err => {
getLoading?.close()
console.log(err)
})
handleRow.value = row
handleFormRef.value.open('update', row, null, '盘点调整申请-处理', '盘点调整申请-处理')
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
const handleRow = ref({})
const handleFormRef = ref()
const submitFormHandle = async (formType, data) => {
handleFormRef.value.formLoading = true
try {
await CountadjustRequestMainApi.handle({id:handleRow?.value?.id,remark:data.remark})
message.success(t('处理成功'))
buttonBaseClick('refresh',null)
handleFormRef.value.dialogVisible = false
} finally {
handleFormRef.value.formLoading = false
}
}
/** 添加/修改操作 */

12
src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts

@ -188,6 +188,17 @@ export const SaleShipmentDetailRecordRules = reactive({
})
export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '客户代码',
field: 'customerCode',
sort: 'custom',
hiddenInMain:true,
isDetail:false,
isTableForm:false,
table: {
width: 150,
}
},
{
label: '销售订单号',
field: 'soNumber',
@ -304,6 +315,7 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
type: 'Select'
}
},
{
label: '备注',
field: 'remark',

1
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -154,6 +154,7 @@ const labelType = ref('') // 标签类别 采购还是制造等
const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPageCreateLabel
})
detatableData.pageSize = 500
const { getList:getDetailList } = detatableMethods
//

5
src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@ -173,12 +173,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
//
setV['productionLineCode'] = ''
setV['workStationCode'] = ''
tableData.value = []
}else if('productionLineCode'==formField){
//线
setV['workStationCode'] = ''
tableData.value = []
}else if('workStationCode'==formField){
//
setV['productionLineCode1'] = val[0]['productionLineCode']//线
setV['productionLineCode'] = val[0]['productionLineCode']//线
tableData.value = []
}
formRef.setValues(setV)
}

2
src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@ -557,7 +557,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
searchPage: BalanceApi.getBalancePageByBusinessTypeByItemTypeProductredress, // 查询弹窗所需分页方法
searchCondition: [{
key: 'businessType',
value: businessTypeData.code,

24
src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@ -601,6 +601,30 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
},
{
label: '制品单价',
field: 'singlePrice',
sort: 'custom',
isTable: true,
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '制品金额',
field: 'amount',
sort: 'custom',
isTable: true,
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '原料物料代码',
field: 'itemCodeThird',

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@ -188,7 +188,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(
field: 'status',
dictType: DICT_TYPE.PURCHASE_JOB_STATUS,
dictClass: 'string',
isSearch: false,
isSearch: true,
isTable: true,
sort: 'custom',
table: {

1
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@ -120,6 +120,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isTable: true,
isSearch: true,
sort: 'custom',
table: {
width: 150

1
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts

@ -187,6 +187,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.JOB_STATUS,
dictClass: 'string',
isTable: true,
isSearch:true,
sort: 'custom',
table: {
width: 150

18
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@ -211,7 +211,7 @@ export const Version = useCrudSchemas(reactive<CrudSchema[]>([
label: '子表版本',
field: 'detailVersion',
sort: 'custom',
}
},
]))
export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
{
@ -362,6 +362,22 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '先前累计需求',
field: 'schdPcrQty',
sort: 'custom',
table: {
width: 150
}
},
{
label: '累计收货量',
field: 'schdCumrcQty',
sort: 'custom',
table: {
width: 150
}
},
{
label: '到货日期',
field: 'dueDate',

16
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

@ -148,6 +148,22 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '先前累计需求',
field: 'schdPcrQty',
sort: 'custom',
table: {
width: 150
}
},
{
label: '累计收货量',
field: 'schdCumrcQty',
sort: 'custom',
table: {
width: 150
}
},
{
label: '到货日期',
field: 'dueDate',

2
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@ -474,7 +474,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
isDetail: false,
isForm: false,
table: {
width: 250,
width: 290,
fixed: 'right'
}
}

2
src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue

@ -290,7 +290,7 @@ const handleExport = async () => {
//
loadStart()
const data = await SupplierApbalanceMainApi.exportSupplierApbalanceMain(tableObject.params)
download.excel(data, '供应商余额明细主.xlsx')
download.excel(data, '供应商对账管理.xlsx')
} catch {
} finally {
loadDone()

26
src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts

@ -169,7 +169,10 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
table: {
width: 120,
}
},
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return Number(cellValue).toFixed(2)
},
},
{
label: '其他应付金额',
@ -178,7 +181,11 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
table: {
width: 120,
}
},
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return Number(cellValue).toFixed(2)
},
},
{
label: '预付金额',
@ -187,7 +194,10 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
table: {
width: 120,
}
},
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return Number(cellValue).toFixed(2)
},
},
{
label: '暂估余额',
@ -196,7 +206,10 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
table: {
width: 120,
}
},
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return Number(cellValue).toFixed(2)
},
},
{
label: '活动金额',
@ -205,7 +218,10 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
table: {
width: 120,
}
},
formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return Number(cellValue).toFixed(2)
},
},
{
label: '付款周期',

Loading…
Cancel
Save