licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

采购收货更改

Browse Source
This commit is contained in:
z 2025-11-13 21:46:59 +08:00
parent 8fda766aea
commit 0fe4f3aa7b
23 changed files with 396 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/PurchaseOrderNoController.java
View File

@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.Purcha
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorder.vo.PurchaseOrderSaveReqVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakeSaveReqVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoPageReqVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoSaveReqVO;
@ -178,5 +179,9 @@ public class PurchaseOrderNoController {
public CommonResult<Boolean> updateIsPrint(@RequestParam("id") Long id) {
return purchaseOrderNoService.updateIsPrint(id);
}
@PutMapping("/updatePurchaseOrderSupplier")
@Operation(summary ="更新采购单供应商" )
public CommonResult<Boolean> updatePurchaseOrderSupplier( PurchaseOrderNoSaveReqVO updateReqVO) {
return success(purchaseOrderNoService.updatePurchaseOrderSupplier(updateReqVO));
}
}

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoRespVO.java
View File

@ -114,4 +114,9 @@ public class PurchaseOrderNoRespVO {
private String submitUserName;
@Schema(description = "工序名称")
private String procedureName;
private Long modUserId;
private LocalDateTime modTime;
private String modRemark;
}

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorderno/vo/PurchaseOrderNoSaveReqVO.java
View File

@ -77,4 +77,8 @@ public class PurchaseOrderNoSaveReqVO {
@Schema(description = "税率")
private Integer taxRatio;
private Long modUserId;
private LocalDateTime modTime;
private String modRemark;
}

16
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/PurchaseOrderNoDetailController.java
View File

@ -1,5 +1,6 @@
package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordernodetail;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakeRespVO;
import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseorderno.vo.PurchaseOrderNoPageReqVO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -192,4 +193,19 @@ public class PurchaseOrderNoDetailController {
public CommonResult<Boolean> updateFrom(@Valid @RequestBody PurchaseOrderNoDetailDO detailDO) {
return purchaseOrderNoDetailService.updateFrom(detailDO);
}
@GetMapping("/exportExcel")
@Operation(summary = "导出采购收货")
@OperateLog(type = EXPORT)
public void exportExcel(@Valid PurchaseOrderNoDetailPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
String[] split = pageReqVO.getIds().split(",");
List<Long> ids = new ArrayList<>();
for (String s : split) {
ids.add(Long.valueOf(s));
}
List<PurchaseOrderNoDetailDO> list = purchaseOrderNoDetailService.exportExcel(ids);
// 导出 Excel
ExcelUtils.write(response, "零件采购收货.xlsx", "数据", PurchaseOrderMakeRespVO.class,
BeanUtils.toBean(list, PurchaseOrderMakeRespVO.class));
}
}

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/OutsourcingExcelVo.java
View File

@ -28,7 +28,7 @@ public class OutsourcingExcelVo {
@ExcelProperty("BOM编号")
private String boomCode;
@ExcelProperty("件号")
@ExcelProperty("图号")
private String blueprintNo;
@ExcelProperty("零件名称")
private String boomName;

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordernodetail/vo/PurchaseOrderNoDetailPageReqVO.java
View File

@ -132,4 +132,6 @@ public class PurchaseOrderNoDetailPageReqVO extends PageParam {
private String procedureName;
@Schema(description = "工序")
private String subOrDetailName;
@Schema(description = "id集合")
private String ids;
}

13
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseorderno/PurchaseOrderNoDO.java
View File

@ -92,10 +92,23 @@ public class PurchaseOrderNoDO extends BaseDO {
* 送审人
*/
private Long submitUserId;
/**
* 供应商修改人
*/
private Long modUserId;
/**
* 供应商修改时间
*/
private LocalDateTime modTime;
/**
* 修改供应商原因
*/
private String modRemark;
/**
* 送审时间
*/
private LocalDateTime submitTime;
/**
* 审核人
*/

8
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordernodetail/PurchaseOrderNoDetailDO.java
View File

@ -229,4 +229,12 @@ public class PurchaseOrderNoDetailDO extends BaseDO {
private String acarrDates;
@TableField(exist = false)
private Integer goodsType;
@TableField(exist = false)
private String duEmpName;
@TableField(exist = false)
private String effectiveReceivingStatus;
@TableField(exist = false)
private String time;
@TableField(exist = false)
private String requir;
}

28
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java
View File

@ -24,6 +24,8 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrder
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderboom.PurchaseOrderBoomDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermaterial.PurchaseOrderMaterialDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO;
@ -295,4 +297,30 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
.orderByDesc(PurchaseOrderNoDetailDO::getCreateTime);
return selectPage(pageReqVO, query);
}
default List<PurchaseOrderNoDetailDO> exportExcel(List<Long> ids){
MPJLambdaWrapper<PurchaseOrderNoDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(PurchaseOrderNoDetailDO.class)
.select("c.nickname as duEmpName")
.select("t.brief as briefs")
.select("d.brief as supplierName")
.select("bom.blueprint_no as blueprintNo")
.select("CASE \n" +
" WHEN t.purchase_amount = 0 THEN 0 \n" +
" ELSE ROUND(t.estimated_price / t.purchase_amount, 2)\n" +
"END AS unitPrice")
.select("e.name as procedureName")
.select("COALESCE(t.receiving_status, 1) AS effectiveReceivingStatus")
.select("DATE_FORMAT(t.create_time, '%Y-%m-%d') AS time")
.select("DATE_FORMAT(t.require_time, '%Y-%m-%d') AS requir")
.leftJoin(PurchaseOrderNoDO.class,"a",PurchaseOrderNoDO::getId,PurchaseOrderNoDetailDO::getPurchaseOrderId)
.leftJoin(AdminUserDO.class,"c", AdminUserDO::getId,PurchaseOrderNoDetailDO::getDuEmpId)
.leftJoin(SupplierDO.class, "d", SupplierDO::getId,PurchaseOrderNoDO::getSupplierId)
.leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, PurchaseOrderNoDetailDO::getProcedureId)
.leftJoin(ProcessBomDetailDO.class, "bom", ProcessBomDetailDO::getId, PurchaseOrderNoDetailDO::getBoomDetailId)
.leftJoin(ProjectOrderSubDO.class,"sub", ProjectOrderSubDO::getId, PurchaseOrderNoDetailDO::getProjectPlanSubId)
.disableSubLogicDel();
query.in(ids != null && ids.size() > 0, PurchaseOrderNoDetailDO::getId, ids);
return selectList(query);
}
}

7
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
View File

@ -20,6 +20,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipMan
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
@ -32,6 +33,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatch
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetailowner.TaskDispatchDetailOwnerDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.plansub.PlanSubMapper;
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.ibatis.annotations.Delete;
@ -322,6 +324,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
.leftJoin(ProcessBomDetailDO.class, "d", ProcessBomDetailDO::getId, TaskDispatchDO::getBomDetailId)
.leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, TaskDispatchDetailDO::getProcedureId)
.leftJoin(TaskReportDO.class, "f", TaskReportDO::getDispatchDetailId, TaskDispatchDetailDO::getId)
.leftJoin(PlanSubDO.class,"plan", PlanSubDO::getProjectSubId, TaskDispatchDO::getProjectSubId)
.groupBy(TaskDispatchDetailDO::getId)
.disableSubLogicDel();;
if (reqVO.getProcedureStatusList().size() == 1 && reqVO.getProcedureStatusList().get(0) == 2) {
@ -336,7 +339,9 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
if (reqVO.getSubOrDetailName() != null && !reqVO.getSubOrDetailName().trim().equals("")){
query.and( e ->e.eq(ProjectOrderDO::getProjectName, reqVO.getSubOrDetailName()).or().eq(
ProjectOrderSubDO::getName, reqVO.getSubOrDetailName()
).or().eq(ProcessBomDetailDO::getMaterialName, reqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, reqVO.getSubOrDetailName()));
).or().eq(ProcessBomDetailDO::getMaterialName, reqVO.getSubOrDetailName()).or().eq(ProcessBomDetailDO::getBomBlueprintNo, reqVO.getSubOrDetailName())
.or().eq(PlanSubDO::getProjectSubCode, reqVO.getSubOrDetailName()));
// query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')");
}
query.and(wrapper -> {

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoService.java
View File

@ -65,4 +65,6 @@ public interface PurchaseOrderNoService {
void updatePORSById(Long id);
CommonResult<Boolean> updateIsPrint(Long id);
Boolean updatePurchaseOrderSupplier(PurchaseOrderNoSaveReqVO updateReqVO);
}

18
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorderno/PurchaseOrderNoServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthing
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
@ -413,4 +414,21 @@ public class PurchaseOrderNoServiceImpl implements PurchaseOrderNoService {
return CommonResult.success(true);
}
@Override
public Boolean updatePurchaseOrderSupplier(PurchaseOrderNoSaveReqVO updateReqVO) {
PurchaseOrderNoDO purchaseOrderNoDO = purchaseOrderNoMapper.selectById(updateReqVO.getId());
if (ObjectUtil.isNotEmpty(purchaseOrderNoDO)){
purchaseOrderNoDO.setSupplierId(updateReqVO.getSupplierId());
purchaseOrderNoDO.setModTime(LocalDateTime.now());
purchaseOrderNoDO.setModUserId(getLoginUser().getId());
purchaseOrderNoDO.setModRemark(updateReqVO.getModRemark());
purchaseOrderNoMapper.updateById(purchaseOrderNoDO);
LambdaUpdateWrapper<PurchaseOrderMakeDetailDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(PurchaseOrderMakeDetailDO::getPurchaseOrderNoId,purchaseOrderNoDO.getId());
lambdaUpdateWrapper.set(PurchaseOrderMakeDetailDO::getSupplierId,updateReqVO.getSupplierId());
purchaseOrderMakeDetailMapper.update(lambdaUpdateWrapper);
}
return true;
}
}

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailService.java
View File

@ -75,4 +75,6 @@ public interface PurchaseOrderNoDetailService {
CommonResult<Boolean> updateFrom(PurchaseOrderNoDetailDO detailDO);
PageResult<PurchaseOrderNoDetailDO> getReceiveGoodDetail(PurchaseOrderNoPageReqVO pageReqVO);
List<PurchaseOrderNoDetailDO> exportExcel(List<Long> ids);
}

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java
View File

@ -279,6 +279,7 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
byId.setReceivingStatus(2);
}
byId.setPurchaseRemAmount(byId.getPurchaseRemAmount().subtract(detailDO.getPurchaseRemAmounts()));
byId.setArriveTime(LocalDateTime.now());
purchaseOrderNoDetailMapper.updateById(byId);
// StorageMatDO storageMatDO = new StorageMatDO();
// StorageMatDO outMat = new StorageMatDO();
@ -594,4 +595,9 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
return purchaseOrderNoDetailMapper.getReceiveGoodDetail(pageReqVO);
}
@Override
public List<PurchaseOrderNoDetailDO> exportExcel(List<Long> ids) {
return purchaseOrderNoDetailMapper.exportExcel(ids);
}
}

4
mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts
View File

@ -82,3 +82,7 @@ export const exportOut = async (params) => {
export const updateDuEmp = async (data) => {
return await request.post({ url: `/heli/purchase-order-make/updateDuEmp`, data })
}
// 更新采购单主驳回
export const updatePurchaseOrderSupplier = async (params) => {
return await request.put({ url: `/heli/purchase-order-no/updatePurchaseOrderSupplier`, params })
}

4
mes-ui/mes-ui-admin-vue3/src/api/heli/purchaseordernodetail/index.ts
View File

@ -94,3 +94,7 @@ export const updateFrom= async (data) => {
export const getReceiveGoodDetail = async (params) => {
return await request.get({ url: `/heli/purchase-order-no-detail/getReceiveGoodDetail`, params })
}
// 导出外协费用 Excel
export const exportExcel = async (params) => {
return await request.download({ url: `/heli/purchase-order-no-detail/exportExcel`, params })
}

130
mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcingexpenses/index.vue
View File

@ -79,34 +79,34 @@
<el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- @click="handleExport"-->
<!-- :loading="exportLoading"-->
<!-- v-hasPermi="['heli:pg-master:export']"-->
<!-- >-->
<!-- <Icon icon="ep:download" class="mr-5px" /> 导出-->
<!-- </el-button>-->
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['heli:pg-master:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出EXCEL
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table" border>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" show-summary :summary-method="getSummaries" class="hl-table" border>
<el-table-column label="序号" type="index" width="80" align="center" />
<el-table-column label="订单日期" align="center" prop="ordDate" :formatter="dateFormatter2" min-width="120" />
<el-table-column label="供应商简称" align="center" prop="supplierName" min-width="180" />
<el-table-column label="BOM编号" align="center" prop="boomCode" min-width="180" />
<el-table-column label="订单日期" align="center" prop="ordDate" :formatter="dateFormatter2" min-width="100" />
<el-table-column label="供应商简称" align="center" prop="supplierName" min-width="120" />
<el-table-column label="BOM编号" align="center" prop="boomCode" min-width="200" />
<el-table-column label="图号" align="center" prop="blueprintNo" width="120"/>
<el-table-column label="零件名称" align="center" prop="boomName" width="120"/>
<el-table-column label="零件名称" align="center" prop="boomName" width="200"/>
<el-table-column label="材料" align="center" prop="composition" width="120"/>
<el-table-column label="规格" align="center" prop="boomSpec" width="120"/>
<el-table-column label="数量" align="center" prop="purchaseAmount" width="80"/>
<el-table-column label="单价" align="center" prop="unitPrice" width="80"/>
<el-table-column label="小计" align="center" prop="estimatedPrice" width="80"/>
<el-table-column label="规格" align="center" prop="boomSpec" width="180"/>
<el-table-column label="数量" align="center" prop="purchaseAmount" width="100"/>
<el-table-column label="单价" align="center" prop="unitPrice" width="120"/>
<el-table-column label="小计" align="center" prop="estimatedPrice" width="120"/>
<el-table-column label="工序" align="center" prop="procedureName" width="100"/>
<el-table-column label="到货日期" align="center" prop="acarrDate" width="120" :formatter="dateFormatter2"/>
<el-table-column label="采购员" align="center" prop="userName" width="120"/>
@ -133,6 +133,7 @@ import {useCommonStateWithOut} from "@/store/modules/common";
import {useUserStore} from "@/store/modules/user";
import dayjs from "dayjs";
import * as PurchaseOrderNoDetailApi from '@/api/heli/purchaseordernodetail'
import {ElTable} from "element-plus";
defineOptions({ name: 'outsourcingExpenses' })
const message = useMessage() // 消息弹窗
@ -170,7 +171,72 @@ const getList = async () => {
loading.value = false
}
}
const getSummaries = (param: SummaryMethodProps) => {
const summaryField = ["purchaseAmount","estimatedPrice"];
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
if (!summaryField.includes(column.property)) {
sums[index] = '';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return floatAdd(prev, curr);
} else {
return prev;
}
}, 0);
const thousandsField = [];
if (thousandsField.includes(column.property)) {
sums[index] = thousandsFormat(sums[index]);
}
} else {
sums[index] = '';
}
});
// const sumValue = computed(() => {
// return list.value.reduce((sum, item) => sum + item.quantityLent, 0);
// });
// const sums = ['合计','','','','','','','',sumValue];
return sums;
}
const floatAdd = (a, b) => {
var c, d, e;
if (undefined === a || null === a || "" === a || isNaN(a)) { a = 0; }
if (undefined === b || null === b || "" === b || isNaN(b)) { b = 0; }
try {
c = a.toString().split(".")[1].length;
} catch (f) {
c = 0;
}
try {
d = b.toString().split(".")[1].length;
} catch (f) {
d = 0;
}
e = Math.pow(10, Math.max(c, d));
return (floatMul(a, e) + floatMul(b, e)) / e;
};
const floatMul = (a, b) => {
var c = 0,
d = a.toString(),
e = b.toString();
try {
c += d.split(".")[1].length;
} catch (f) {}
try {
c += e.split(".")[1].length;
} catch (f) {}
return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
@ -191,19 +257,19 @@ const setDefaultDate = () => {
]
}
/** 导出按钮操作 */
// const handleExport = async () => {
// try {
// // 导出的二次确认
// await message.exportConfirm()
// // 发起导出
// exportLoading.value = true
// const data = await PurchaseOrderNoDetailApi.exportOutsourcing(queryParams)
// download.excel(data, '外协费用查询.xlsx')
// } catch {
// } finally {
// exportLoading.value = false
// }
// }
const handleExport = async () => {
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await PurchaseOrderNoDetailApi.exportOutsourcing(queryParams)
download.excel(data, '外协费用查询.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {

2
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printDialog.vue
View File

@ -85,7 +85,7 @@ const open = async ( vals) => {
await Promise.all(
printCodeName.value.map(async (item) => {
const qrCodeData = await QRCode.toDataURL(item.name,{
const qrCodeData = await QRCode.toDataURL(item.code,{
errorCorrectionLevel: 'H'
})
const qrCodeElement = document.getElementById('qrCodeContainer')

2
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printFinalDialog.vue
View File

@ -200,7 +200,7 @@ const open = async ( vals) => {
await Promise.all(
printCodeName.value.map(async (item) => {
const qrCodeData = await QRCode.toDataURL(item.name,{
const qrCodeData = await QRCode.toDataURL(item.code,{
errorCorrectionLevel: 'H'
})
const qrCodeElement = document.getElementById('qrCodeContainer1')

8
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
View File

@ -301,7 +301,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.beginTime`" class="mb-0px!">
<!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->
<el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled=" (row.isOver == 1 || formData.isOverProcess == 1) && row.flag!=0" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/>
<el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled="row.flag!=0" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/>
</el-form-item>
</template>
</el-table-column>
@ -310,7 +310,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.endTime`" class="mb-0px!">
<!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->
<el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled=" (row.isOver == 1 || formData.isOverProcess == 1) && row.flag!=0" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/>
<el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled="row.flag!=0" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/>
</el-form-item>
</template>
</el-table-column>
@ -318,7 +318,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<template #header>已做时间(小时)</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.workTime`" class="mb-0px!">
<el-input-number :max="row.maxTime" :precision="2" class="!w-240px" :disabled=" (row.isOver == 1 || formData.isOverProcess == 1) && row.flag!=0" v-model="row.workTime" placeholder="请输入已做时间"/>
<el-input-number :max="row.maxTime" :precision="2" class="!w-240px" :disabled=" row.flag!=0" v-model="row.workTime" placeholder="请输入已做时间"/>
</el-form-item>
</template>
</el-table-column>
@ -763,7 +763,6 @@ const updateFlag = async(row:any) =>{
var maxTime = null;
if(formData.value.processDesignProgressList.length == 1){
formData.value.processDesignProgressList[0].hasNext = false;
console.log(ststus.value)
if(formData.value.processDesignProgressList[0].endTime != null && formData.value.processDesignProgressList[0].endTime != ''){
if (ststus.value){
formData.value.processDesignProgressList[0].flag=0
@ -779,7 +778,6 @@ const updateFlag = async(row:any) =>{
}
} else{
console.log(ststus.value)
var maxIndex = 0;
for (let index = 0; index < formData.value.processDesignProgressList.length; index++) {

112
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/Form.vue Normal file
View File

@ -0,0 +1,112 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" @close="cancel">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="供应商" prop="supplierId">
<el-select
v-model="formData.supplierId"
size="large"
clearable
filterable
style="width: 165px"
>
<el-option
v-for="item in supplierList"
:key="item.id"
:label="item.brief"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="修改原因" prop="modRemark">
<el-input type="textarea" :rows="5" v-model="formData.modRemark" placeholder="请输入修改原因" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder";
import {ref} from "vue";
import * as supplierApi from "@/api/heli/supplier";
import {updatePurchaseOrderSupplier} from "@/api/heli/partpurchaseorder";
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined,
modRemark: undefined,
supplierId:undefined
})
const formRules = reactive({
supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
modRemark: [{ required: true, message: '修改原因不能为空', trigger: 'blur' }],
})
const formRef = ref() // 表单 Ref
const queryParams1 = reactive({
pageNo: 1,
pageSize: 999,
status:1
})
/** 打开弹窗 */
const open = async (row) => {
dialogVisible.value = true
resetForm()
formData.value.id=row.id
formData.value.supplierId=row.supplierId
formData.value.modRemark=row.modRemark
await supplier()
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const cancel = async () => {
dialogVisible.value = false
emit('success')
}
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
// 提交请求
formLoading.value = true
try {
dialogVisible.value = false
await PartPurchaseOrderApi.updatePurchaseOrderSupplier(formData.value)
// 发送操作成功的事件
message.success("修改成功");
emit('success')
} finally {
formLoading.value = false
}
}
const supplierList = ref([])
const supplier = async() =>{
var data = await supplierApi.getSupplierPage(queryParams1);
supplierList.value =data.list
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
modRemark:undefined,
supplierId: undefined,
}
formRef.value?.resetFields()
}
</script>

14
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/index.vue
View File

@ -125,6 +125,9 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" cl
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
查看详情
</el-button>
<el-button link type="primary" v-if="scope.row.receivingStatus1==1" @click="openUpdateForm(scope.row)">
修改供应商
</el-button>
</template>
</el-table-column>
</el-table>
@ -135,6 +138,8 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" cl
</ContentWrap>
</el-card>
<Form ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
@ -142,10 +147,11 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import download from '@/utils/download'
import * as PurchaseOrderApi from '@/api/heli/purchaseorder'
import * as PurchaseOrderNoApi from '@/api/heli/purchaseorderno'
import { ElTable } from 'element-plus'
import {ElButton, ElTable} from 'element-plus'
import {useUserStore} from "@/store/modules/user";
import routeParamsCache from '@/utils/routeParamsCache'
import {dateFormatter1} from "@/utils/formatTime";
import Form from "./Form.vue";
defineOptions({ name: 'PurchaseOrder' })
const userStore = useUserStore()
const username = userStore.getUser.nickname
@ -204,7 +210,11 @@ const getList = async () => {
loading.value = false
}
}
/** 添加/修改操作 */
const formRef = ref()
const openUpdateForm = (row) => {
formRef.value.open( row)
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1

53
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/partReceived.vue
View File

@ -86,6 +86,15 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
<template #header>
<div class="hl-card-info-icona"></div><span class="hl-card-info-text">订单明细</span>
<el-button style="margin-left: 20px" @click="receiveGoods" type="success" size="large">收货</el-button>
<el-button
style="margin-left: 20px"
type="success"
plain
@click="handleExportDetail"
:loading="exportLoading"
>
<Icon icon="ep:download" class="mr-5px" /> 导出EXCEL
</el-button>
</template>
<el-row>
<el-col>
@ -99,15 +108,16 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
<!-- <dict-tag :type="DICT_TYPE.HELI_PURCHASE_RECEIVING_STATUS" :value="scope.row.receivingStatus" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="projectSubCode" min-width="150" label="子项目编码" align="center"/>
<el-table-column prop="blueprintNo" min-width="100" label="图号" align="center"/>
<el-table-column prop="boomName" min-width="120" label="零件名称" align="center"/>
<el-table-column prop="supplierName" min-width="120" label="供应商" align="center"/>
<el-table-column prop="procedureName" min-width="120" label="工序" align="center"/>
<el-table-column prop="projectSubCode" min-width="240" label="子项目编码" align="center"/>
<el-table-column prop="blueprintNo" min-width="80" label="图号" align="center"/>
<el-table-column prop="boomName" min-width="180" label="零件名称" align="center"/>
<el-table-column prop="boomSpec" min-width="110" label="规格/型号" align="center"/>
<el-table-column prop="supplierName" min-width="100" label="供应商" align="center"/>
<el-table-column prop="procedureName" min-width="100" label="工序" align="center"/>
<el-table-column prop="compositionName" min-width="100" label="材质" align="center"/>
<el-table-column prop="purchaseAmount" min-width="100" label="采购数量" align="center" />
<!-- <el-table-column prop="purchaseRemAmount" min-width="100" label="剩余数量" align="center"/>-->
<el-table-column prop="purchaseRemAmounts" min-width="180" align="center">
<el-table-column prop="purchaseRemAmounts" min-width="170" align="center">
<template #header><span class="hl-table_header">*</span>入库数量</template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.purchaseRemAmounts`" class="mb-0px!">
@ -115,7 +125,7 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="estimatedPrice" min-width="180" label="单价" align="center">
<el-table-column prop="estimatedPrice" min-width="170" label="单价" align="center">
<template #header>单价</template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.unitPrice`" class="mb-0px!">
@ -127,7 +137,7 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="estimatedPrice" min-width="180" label="预估总价(元)" align="center">
<el-table-column prop="estimatedPrice" min-width="170" label="预估总价(元)" align="center">
<template #header><span class="hl-table_header">*</span>预估总价(元)</template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.estimatedPrice`" class="mb-0px!">
@ -173,10 +183,12 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as PurchaseOrderApi from '@/api/heli/purchaseorder'
import * as UserApi from '@/api/system/user'
import { ElTable } from 'element-plus'
import {ElButton, ElTable} from 'element-plus'
import {useUserStore} from "@/store/modules/user";
import {dateFormatter1} from "@/utils/formatTime";
import * as PurchaseOrderNoDetailApi from "@/api/heli/purchaseordernodetail";
import download from "@/utils/download";
import {exportExcel} from "@/api/heli/purchaseordernodetail";
defineOptions({ name: 'PurchaseordernopartReceived' })
const userStore = useUserStore()
const username = userStore.getUser.nickname
@ -359,7 +371,30 @@ const handleQuery = () => {
getList()
}
/** 导出按钮操作 */
const handleExportDetail = async () => {
try {
const list = multipleSelection.value|| []; // 安全获取数据
// 1. 检查空数据
if (!list || list.length==null||list.length==0) {
message.error("采购订单信息未选择，请确认");
return;
}
// 导出的二次确认
await message.exportConfirm()
const ids = list.map(item => item.id).join(',');
queryParams.ids=ids
// 发起导出
exportLoading.value = true
const data = await PurchaseOrderNoDetailApi.exportExcel(queryParams);
download.excel(data, '零件采购收货.xlsx')
} catch {
} finally {
exportLoading.value = false
queryParams.ids=undefined
}
}
/** 重置按钮操作 */
const resetQuery = () => {