浏览代码

手动模式

yaoyq 3 年之前
父节点
当前提交
40d87b9fc3

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomProcedureProductionresourceServiceImpl.java

@@ -28,6 +28,6 @@ public class BomProcedureProductionresourceServiceImpl extends SuperServiceImpl<
     public List<BomProcedureProductionresource> getResourcelist(BomProcedureVersion bean){
         List<BomProcedureProductionresource> list = baseMapper.getResourcelist(bean);
 
-        return baseMapper.getResourcelist(bean);
+        return list;
     }
 }

+ 8 - 0
imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomProcedureProductionresource.java

@@ -97,6 +97,14 @@ public class BomProcedureProductionresource extends Entity<Long> {
     @TableField(exist = false)
     private String cncProgram;
 
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "资源业务ID")
+    @TableField("resource_business_id")
+    @Excel(name = "资源业务ID")
+    private Long resourceBusinessId;
+
     public String getResourceIdStr() {
         if(StringUtil.isEmpty(resourceIdStr)){
             return String.valueOf(getResourceId());