手动模式

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/WorkpieceServiceImpl.java

@@ -17,6 +17,7 @@ import com.github.zuihou.business.operationManagementCenter.dto.OrderProductUpda
 import com.github.zuihou.business.operationManagementCenter.dto.OrderUpdateDTO;
 import com.github.zuihou.business.operationManagementCenter.entity.*;
 import com.github.zuihou.business.operationManagementCenter.service.*;
+import com.github.zuihou.business.productionReadyCenter.dao.BBomMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
 import com.github.zuihou.business.productionReadyCenter.service.AutoNodeService;
 import com.github.zuihou.business.productionReadyCenter.service.BomProcedureService;
@@ -77,6 +78,9 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
     @Autowired
     private StorgeMapper storgeMapper;
 
+    @Autowired
+    private BBomMapper bomMapper;
+
     @Override
     public IPage<TWorkpiece> pageList(IPage page, LbqWrapper<TWorkpiece> wrapper) {
         return baseMapper.pageList(page, wrapper);
@@ -106,8 +110,11 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
             workpiece = list.get(0);
         }
 
-        BeanUtil.copyProperties(workpiece, map);
-
+        map.put("pointId",StringUtil.isEmpty(workpiece.getPointId())?"":workpiece.getPointId());
+        map.put("orderName",StringUtil.isEmpty(workpiece.getOrderName())?"":workpiece.getOrderName());
+        map.put("bomNo",StringUtil.isEmpty(workpiece.getBomNo())?"":workpiece.getBomNo());
+        map.put("bomName",StringUtil.isEmpty(workpiece.getBomName())?"":workpiece.getBomName());
+        map.put("procedureName",StringUtil.isEmpty(workpiece.getProcedureName())?"":workpiece.getProcedureName());
 //        if(CollectionUtil.isEmpty(list)){
 //            return new HashMap();
 //        }

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TWorkpieceMapper.xml

@@ -30,8 +30,8 @@
     <select id="pageList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from (select w.*,b.name bom_name, b.no bom_no
-        from imcs_t_workpiece w left join imcs_b_bom b on w.bom_id = b.id
+        from (select w.*
+        from imcs_t_workpiece w
         ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TWorkpiece.java

@@ -103,7 +103,7 @@ public class TWorkpiece extends Entity {
     @ApiModelProperty(value = "bom_name")
     @NotEmpty(message = "bom_name不能为空")
     @Length(max = 32, message = "bom_name长度不能超过32")
-    @TableField(exist = false)
+//    @TableField(exist = false)
     @Excel(name = "bom_name")
     private String bomName;