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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
wb_zhanghaoyuan 2025-06-25 11:52:32 +08:00
commit 350e1c8cdb
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ public class PurchaseOrderMakeDetailPageReqVO extends PageParam {
private String projectSubCode; private String projectSubCode;
@Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "2") @Schema(description = "收货状态 未收货/收货中/收货完成 1/2/3", example = "2")
private Boolean receivingStatus; private Integer receivingStatus;
@Schema(description = "采购单号") @Schema(description = "采购单号")
private String purchaseNo; private String purchaseNo;

11
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java
View File

@ -46,6 +46,8 @@ public class PurchaseOrderMakeDetailDO extends BaseDO {
* 零件名称 * 零件名称
*/ */
private String boomName; private String boomName;
@TableField(exist = false)
private String boomCode;
/** /**
* 规格型号 * 规格型号
*/ */
@ -90,6 +92,8 @@ public class PurchaseOrderMakeDetailDO extends BaseDO {
* 供应商id * 供应商id
*/ */
private Long supplierId; private Long supplierId;
@TableField(exist = false)
private String supplierName;
/** /**
* 物料需求计划id * 物料需求计划id
*/ */
@ -121,6 +125,7 @@ public class PurchaseOrderMakeDetailDO extends BaseDO {
/** /**
* 订单状态 未生成/已生成 1/2 * 订单状态 未生成/已生成 1/2
*/ */
@TableField( "order_status")
private Integer orderStatus; private Integer orderStatus;
/** /**
* 子项目编码 * 子项目编码
@ -129,7 +134,7 @@ public class PurchaseOrderMakeDetailDO extends BaseDO {
/** /**
* 收货状态 未收货/收货中/收货完成 1/2/3 * 收货状态 未收货/收货中/收货完成 1/2/3
*/ */
private Boolean receivingStatus; private Integer receivingStatus;
/** /**
* 采购单号 * 采购单号
*/ */
@ -146,5 +151,9 @@ public class PurchaseOrderMakeDetailDO extends BaseDO {
* 责任人id * 责任人id
*/ */
private Long duEmpId; private Long duEmpId;
/**
* 物料id
*/
private Long materialId;
} }

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java
View File

@ -40,6 +40,7 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX<PurchaseOrder
.select("b.material_name as boomName","m.code as boomCode","b.spec as boomSpec","b.unit as boomUnit") .select("b.material_name as boomName","m.code as boomCode","b.spec as boomSpec","b.unit as boomUnit")
.select("pom.purchase_no as purchaseNo") .select("pom.purchase_no as purchaseNo")
.leftJoin(ProcessBomDetailDO.class,"b",ProcessBomDetailDO::getId,PurchaseOrderMakeDetailDO::getBoomDetailId) .leftJoin(ProcessBomDetailDO.class,"b",ProcessBomDetailDO::getId,PurchaseOrderMakeDetailDO::getBoomDetailId)
.leftJoin(MaterialDO.class,"m",MaterialDO::getId,PurchaseOrderMakeDetailDO::getMaterialId)
.leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,PurchaseOrderMakeDetailDO::getProjectPlanSubId) .leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,PurchaseOrderMakeDetailDO::getProjectPlanSubId)
.leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId) .leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId)
.leftJoin(PurchaseOrderMakeDO.class,"pom",PurchaseOrderMakeDO::getId,PurchaseOrderMakeDetailDO::getPurchaseOrderId) .leftJoin(PurchaseOrderMakeDO.class,"pom",PurchaseOrderMakeDO::getId,PurchaseOrderMakeDetailDO::getPurchaseOrderId)