diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java index b07cbb8..1615774 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java @@ -70,17 +70,17 @@ public class OrderYsDO extends BaseDO { private BigDecimal amount; @TableField(exist = false) - private BigDecimal shouFuKuanBiLi; + private BigDecimal shouFuKuan; @TableField(exist = false) - private BigDecimal twoFuKuanBiLi; + private BigDecimal twoFuKuan; @TableField(exist = false) - private BigDecimal threeFuKuanBiLi; + private BigDecimal threeFuKuan; @TableField(exist = false) - private BigDecimal fourFuKuanBiLi; + private BigDecimal fourFuKuan; @TableField(exist = false) - private BigDecimal fiveFuKuanBiLi; + private BigDecimal fiveFuKuan; @TableField(exist = false) - private BigDecimal sixFuKuanBiLi; + private BigDecimal sixFuKuan; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java index 936c82f..113b57b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java @@ -50,8 +50,8 @@ public interface OrderYsMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(OrderYsDO.class) .select("sum(i.amount) as amount") - .select("p.shou_Fu_Kuan_Bi_Li as shouFuKuanBiLi","p.two_Fu_Kuan_Bi_Li as twoFuKuanBiLi","p.three_Fu_Kuan_Bi_Li as threeFuKuanBiLi") - .select("p.four_Fu_Kuan_Bi_Li as fourFuKuanBiLi","p.five_Fu_Kuan_Bi_Li as fiveFuKuanBiLi","p.six_Fu_Kuan_Bi_Li as sixFuKuanBiLi") + .select("p.shou_Fu_Kuan as shouFuKuan","p.two_Fu_Kuan as twoFuKuan","p.three_Fu_Kuan as threeFuKuan") + .select("p.four_Fu_Kuan as fourFuKuan","p.five_Fu_Kuan as fiveFuKuan","p.six_Fu_Kuan as sixFuKuan") .leftJoin( "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE' AND i.status !='3'") .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getCode, OrderYsDO::getCode) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermake/PurchaseOrderMakeMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermake/PurchaseOrderMakeMapper.java index 44a597e..86a71cb 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermake/PurchaseOrderMakeMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermake/PurchaseOrderMakeMapper.java @@ -100,8 +100,8 @@ public interface PurchaseOrderMakeMapper extends BaseMapperX getPartPurchaseOrderPage(PartPurchaseOrderPageReqVO pageReqVO) { @@ -83,24 +92,36 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ @Override public boolean submit(List list) { + PurchaseOrderNoDO purchaseOrderNoDO = new PurchaseOrderNoDO(); + // 返回 + // 月度流水号 + SerialNumberDO serialNumberDO = new SerialNumberDO(); + serialNumberDO = serialNumberService.getSerialNumber(PURCHASE_ORDER.name(), new SimpleDateFormat("yyyyMMdd").format(new Date())); + serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1); + // 回写序列记录 + serialNumberService.updateSerialNumber(serialNumberDO); + + purchaseOrderNoDO.setPurchaseNo(PURCHASE_ORDER.getCode(serialNumberDO.getSerialNumber().toString())); + purchaseOrderNoDO.setPurchaseType(1); + purchaseOrderNoDO.setGoodsType(2); + purchaseOrderNoDO.setSupplierId(list.get(0).getSupplierId()); + purchaseOrderNoDO.setOrdDate(new Date()); + purchaseOrderNoMapper.insert(purchaseOrderNoDO); + long purchaseOrderId = purchaseOrderNoDO.getId(); + OrderYfSaveReqVO orderYfVO = new OrderYfSaveReqVO(); + orderYfVO.setCgOrderNum(purchaseOrderNoDO.getPurchaseNo()); + SupplierDO supplierDO = supplierMapper.selectById(list.get(0).getSupplierId()); + if (ObjectUtil.isNotEmpty(supplierDO)){ + orderYfVO.setCgGysname(supplierDO.getName()); + } + BigDecimal sum = list.stream() + .filter(Objects::nonNull) // 过滤掉空对象 + .map(PartPurchaseOrderPageRespVO::getEstimatedPrice) + .filter(Objects::nonNull) // 过滤掉空值 + .reduce(BigDecimal.ZERO, BigDecimal::add); // 累加求和 + orderYfVO.setCgYf(sum); + orderYfService.createCg(orderYfVO); list.forEach(detailDO -> { - PurchaseOrderNoDO purchaseOrderNoDO = new PurchaseOrderNoDO(); - // 返回 - // 月度流水号 - SerialNumberDO serialNumberDO = new SerialNumberDO(); - serialNumberDO = serialNumberService.getSerialNumber(PURCHASE_ORDER.name(), new SimpleDateFormat("yyyyMMdd").format(new Date())); - serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1); - // 回写序列记录 - serialNumberService.updateSerialNumber(serialNumberDO); - - purchaseOrderNoDO.setPurchaseNo(PURCHASE_ORDER.getCode(serialNumberDO.getSerialNumber().toString())); - purchaseOrderNoDO.setPurchaseType(1); - purchaseOrderNoDO.setGoodsType(2); - purchaseOrderNoDO.setSupplierId(detailDO.getSupplierId()); - purchaseOrderNoDO.setOrdDate(new Date()); - purchaseOrderNoMapper.insert(purchaseOrderNoDO); - long purchaseOrderId = purchaseOrderNoDO.getId(); - // PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = new PurchaseOrderNoDetailDO(); // purchaseOrderNoDetailDO.setPurchaseOrderId(purchaseOrderId); // purchaseOrderNoDetailDO.setBoomDetailId(detailDO.getBoomDetailId()); @@ -309,6 +330,7 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ logList.add(log); } } + orderMakeDO.setLogList(logList); return CommonResult.success(orderMakeDO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermakedetail/PurchaseOrderMakeDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermakedetail/PurchaseOrderMakeDetailServiceImpl.java index 516de5c..a8ae988 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermakedetail/PurchaseOrderMakeDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermakedetail/PurchaseOrderMakeDetailServiceImpl.java @@ -1,6 +1,8 @@ package com.chanko.yunxi.mes.module.heli.service.purchaseordermakedetail; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.OrderYfSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO; @@ -8,11 +10,14 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.Purchas import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.composition.CompositionMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.material.MaterialMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermake.PurchaseOrderMakeMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorderno.PurchaseOrderNoMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordernodetail.PurchaseOrderNoDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.supplier.SupplierMapper; +import com.chanko.yunxi.mes.module.heli.service.orderyf.OrderYfService; import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService; import org.checkerframework.checker.units.qual.A; import org.springframework.stereotype.Service; @@ -20,6 +25,7 @@ import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; @@ -61,6 +67,11 @@ public class PurchaseOrderMakeDetailServiceImpl implements PurchaseOrderMakeDeta private MaterialMapper materialMapper; @Resource private CompositionMapper compositionMapper; + + @Resource + private OrderYfService orderYfService; + @Resource + private SupplierMapper supplierMapper; @Override public Long createPurchaseOrderMakeDetail(PurchaseOrderMakeDetailSaveReqVO createReqVO) { // 插入 @@ -90,6 +101,19 @@ public class PurchaseOrderMakeDetailServiceImpl implements PurchaseOrderMakeDeta purchaseOrderNoDO.setSupplierId(updateList.get(0).getSupplierId()); purchaseOrderNoDO.setOrdDate(new Date()); purchaseOrderNoMapper.insert(purchaseOrderNoDO); + OrderYfSaveReqVO orderYfVO = new OrderYfSaveReqVO(); + orderYfVO.setCgOrderNum(code); + SupplierDO supplierDO = supplierMapper.selectById(updateList.get(0).getSupplierId()); + if (ObjectUtil.isNotEmpty(supplierDO)){ + orderYfVO.setCgGysname(supplierDO.getName()); + } + BigDecimal sum = updateList.stream() + .filter(Objects::nonNull) // 过滤掉空对象 + .map(PurchaseOrderMakeDetailDO::getEstimatedPrice) + .filter(Objects::nonNull) // 过滤掉空值 + .reduce(BigDecimal.ZERO, BigDecimal::add); // 累加求和 + orderYfVO.setCgYf(sum); + orderYfService.createCg(orderYfVO); List insertList =new ArrayList<>(); HashMap insertMap = new HashMap<>(); HashMap insertMaterialMap = new HashMap<>(); diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts index 8425e51..29c51ff 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts @@ -60,3 +60,10 @@ export const getDetail = async (params) => { export const createPurchaseOrderMakeAndDetail = async (data) => { return await request.post({ url: `/heli/purchase-order-make/createPurchaseOrderMakeAndDetail`, data }) } +export const review = async (params) => { + return await request.get({ url: `/heli/purchase-order-make/review`, params }) +} + +export const obtainReviewDetails = async (id:number) => { + return await request.get({ url: `/heli/purchase-order-make/obtainReviewDetails?id=` +id }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue index 25af90e..763716d 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/purchasemake.vue @@ -68,33 +68,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150,12 +158,9 @@ import * as purchaseOrderMakeDetailApi from '@/api/heli/purchaseordermakedetail' import { useCommonStateWithOut } from '@/store/modules/common' import * as matApi from '@/api/heli/material' import { useUserStore } from '@/store/modules/user' -import matLog from './storageLog.vue' +import matLog from './storageLogs.vue' import * as supplierApi from '@/api/heli/supplier' -import UserSelect from "@/views/heli/materialplan/userSelectNew.vue"; import {inject, ref} from "vue"; -import { update } from 'lodash-es' -import { Hash } from 'crypto' const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 const userStore = useUserStore() const username = userStore.getUser.nickname @@ -170,7 +175,6 @@ import { formatDate, dateFormatter2 } from "@/utils/formatTime"; const meterialLoading = ref(false) -const matLogRef = ref() const loading = ref(true) // 列表的加载中 const list = ref([]) // 列表的数据 const total = ref(0) // 列表的总页数 @@ -200,6 +204,7 @@ const queryParams1 = reactive({ }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 +const matLogRef = ref() /** 查询列表 */ const getList = async () => { @@ -207,7 +212,7 @@ const getList = async () => { try { multipleTable.value.clearSelection(); const data = await purchaseOrderMakeDetailApi.page(queryParams) - + list.value = data.list for (const row of list.value ) { // 如果boomCode不为空,则调用remoteMethod进行查询 @@ -262,7 +267,9 @@ const getMateriallist = async(row) =>{ const data = await matApi.getMaterialPage(queryMaterialParams) row.materialSelectList = data.list } - +const serachLog = (row) => { + matLogRef.value.open(row.id) +} const handleSelectionChange = (selection) => { ids.value = selection; } @@ -283,13 +290,13 @@ const handleExportDetail = async () => { exportLoading.value = false } } -const getMat = async (rowids,amount,ids) => { +const getMat = async (rowids,ids,matCodes) => { //formData.value.boomItemDOList = arrBoom for(var i = 0 ; i < list.value.length ; i ++){ if(list.value[i].id == rowids){ - list.value[i].matRest = amount + list.value[i].boomCode = matCodes list.value[i].materialId = ids - await updateRow(2,list.value[i]); + // await updateRow(2,list.value[i]); break; } } @@ -315,14 +322,14 @@ const changeDate = async(e,row) => { await updateRow(5,row) } } -const serachLog = (row) => { - matLogRef.value.open(row.id,row.matCode) -} +// const serachLog = (row) => { +// matLogRef.value.open(row.id,row.matCode) +// } /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 getList() - + } const opearteForm = async(type) =>{ loading.value = true; diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLogs.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLogs.vue new file mode 100644 index 0000000..fa46ac2 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/storageLogs.vue @@ -0,0 +1,175 @@ + + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseordermake/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseordermake/detail.vue index 9832af1..649503a 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseordermake/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseordermake/detail.vue @@ -63,6 +63,8 @@ size="large">批 准 驳 回 取 消 + +