更新同步计划

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartBasicsVO.java

@@ -0,0 +1,55 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.desk.dashboard.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.desk.dashboard.pojo.entity.DsPartBasicsEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
+
+import java.io.Serial;
+import java.util.List;
+
+/**
+ * 零件信息表 视图实体类
+ *
+ * @author BladeX
+ * @since 2025-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DsPartBasicsVO extends DsPartBasicsEntity {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+
+
+
+
+
+
+}

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java

@@ -37,4 +37,6 @@ public class MesRbWo {
     private String prodline;    //产品系列
     private Double prtarea; //单件面积平方毫米
     private String plannerdesc;//计划员
+    private Double totalarea;//零件面积
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java

@@ -42,6 +42,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.dashboard.constant.DsPartConstant;
 import org.springblade.desk.dashboard.pojo.vo.*;
+import org.springblade.desk.dashboard.service.IDsPartBasicsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -76,6 +77,7 @@ import javax.sql.DataSource;
 public class DsPartController extends BladeController {
 
 	private final IDsPartService dsPartService;
+	private final IDsPartBasicsService dsPartBasicsService;
 
 
 	/**
@@ -116,12 +118,11 @@ public class DsPartController extends BladeController {
 	@GetMapping("/listNew")
 	@ApiOperationSupport(order = 3)
 	@Operation(summary = "分页", description  = "传入dsPart")
-	public R<IPage<DsPartVO>> listNew(@Parameter(hidden = true) @RequestParam Map<String, Object> reviewSheet, Query query) {
+	public R<IPage<DsPartBasicsVO>> listNew(DsPartBasicsVO dsPart, Query query) {
 
-		QueryWrapper<DsPartEntity> qw = Condition.getQueryWrapper(reviewSheet, DsPartEntity.class);
-        IPage<DsPartEntity> pages = dsPartService.page(Condition.getPage(query), qw);
-        IPage<DsPartVO> pagesVO = DsPartWrapper.build().pageVO(pages);
-		return R.data(pagesVO);
+		IPage<DsPartBasicsVO> pages = dsPartBasicsService.selectDsPartBasicsPage(Condition.getPage(query), dsPart);
+
+		return R.data(pages);
 	}
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsPartBasicsMapper.java

@@ -26,8 +26,12 @@
 package org.springblade.desk.dashboard.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.dashboard.pojo.entity.DsPartBasicsEntity;
+import org.springblade.desk.dashboard.pojo.vo.DsPartBasicsVO;
+
+import java.util.List;
 
 /**
  * 零件基础信息表 Mapper 接口
@@ -39,4 +43,6 @@ public interface DsPartBasicsMapper extends BaseMapper<DsPartBasicsEntity> {
 
 
     DsPartBasicsEntity selectPartCode(@Param("partCode") String partCode);
+
+    List<DsPartBasicsVO> selectDsPartPage(IPage<DsPartBasicsVO> page, @Param("dsPartBasicsVO") DsPartBasicsVO dsPartBasicsVO);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartBasicsMapper.xml

@@ -7,4 +7,10 @@
         select id, part_code, part_name, product_type, is_sintering, is_glass_cake, create_time, create_user, create_dept, update_time, update_user, remarks, status, is_deleted
         from DS_PART_BASICS where PART_CODE = #{partCode}
     </select>
+    <select id="selectDsPartPage" resultType="org.springblade.desk.dashboard.pojo.vo.DsPartBasicsVO">
+         select * from DS_PART_BASICS where is_deleted = 0
+         <if test="dsPartBasicsVO.partCode != null and dsPartBasicsVO.partCode !=''">
+             and part_code = #{dsPartBasicsVO.partCode}
+         </if>
+    </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartBasicsService.java

@@ -25,8 +25,14 @@
  */
 package org.springblade.desk.dashboard.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.dashboard.pojo.entity.DsPartBasicsEntity;
+import org.springblade.desk.dashboard.pojo.vo.DsPartBasicsVO;
+import org.springblade.desk.dashboard.pojo.vo.DsPartVO;
+
+import java.util.List;
 
 /**
  * 零件基础信息表 服务类
@@ -42,4 +48,6 @@ public interface IDsPartBasicsService extends BaseService<DsPartBasicsEntity> {
      * @return
      */
     DsPartBasicsEntity selectByPartCode(String partCode);
+
+    IPage<DsPartBasicsVO> selectDsPartBasicsPage(IPage<DsPartBasicsVO> page, DsPartBasicsVO dsPartBasicsVO);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartBasicsServiceImpl.java

@@ -25,13 +25,27 @@
  */
 package org.springblade.desk.dashboard.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.checkerframework.checker.units.qual.A;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.dashboard.constant.TaskingConstant;
 import org.springblade.desk.dashboard.mapper.DsPartBasicsMapper;
 import org.springblade.desk.dashboard.pojo.entity.DsPartBasicsEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity;
+import org.springblade.desk.dashboard.pojo.vo.DsPartBasicsVO;
+import org.springblade.desk.dashboard.pojo.vo.DsPartVO;
+import org.springblade.desk.dashboard.pojo.vo.DsPartVersionVO;
 import org.springblade.desk.dashboard.service.IDsPartBasicsService;
+import org.springblade.system.pojo.entity.User;
+import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 零件基础信息 服务实现类
@@ -49,4 +63,12 @@ public class DsPartBasicsServiceImpl extends BaseServiceImpl<DsPartBasicsMapper,
     public DsPartBasicsEntity selectByPartCode(String partCode) {
         return partBasicsMapper.selectPartCode(partCode);
     }
+
+    @Override
+    public IPage<DsPartBasicsVO> selectDsPartBasicsPage(IPage<DsPartBasicsVO> page, DsPartBasicsVO dsPartBasicsVO) {
+        List<DsPartBasicsVO> dsPartVOS = partBasicsMapper.selectDsPartPage(page, dsPartBasicsVO);
+
+        return page.setRecords(dsPartVOS);
+
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java

@@ -115,6 +115,7 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 	@Autowired
 	IDsProcessMoldToolService processMoldToolService;
 
+
 	@Override
 	public IPage<DsPartVO> selectDsPartPage(IPage<DsPartVO> page, DsPartVO dsPart) {
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -1006,6 +1006,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	public List<String> getToolByPartCode(String partCode) {
 		List<String> list = new ArrayList<>();
 		DsPartEntity part = dsPartService.selectDsPartByPatCodeAndVersion(partCode, null);
+		if(null == part){
+			return list;
+		}
 		if("1".equals(part.getIsSintering()) && "0".equals(part.getIsGlassCake())){
 			List<DsPartEntity> subPartList = dsPartService.getPartSubList(partCode,null);
 			list = subPartList.stream().filter(item -> DsPartConstant.SIN_TER_TYPE_SMM.equals(item.getSinTerType())).map(DsPartEntity::getPartCode).collect(Collectors.toList());

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWoMapper.xml

@@ -20,7 +20,9 @@
                         a.warctlrdesc,
                         a.kdofplat,
                         a.processlinedesc,
-                        a.prodline
+                        a.prodline,
+                        a.prtarea,
+                        a.prtdesc
         FROM dba_mgr.v_mes_rb_wo a
         <where>
             a.processlinedesc like '%4%'

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

@@ -163,13 +163,11 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			YieldPlan yieldPlan=new YieldPlan();
 			yieldPlan.setProductIdent(mesRbWo.getPrtlotno());
 			yieldPlan.setYpQty(Long.valueOf(Math.round(Double.parseDouble(mesRbWo.getWoporqty()))));
-			DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbWo.getPrtno());
-			if(part != null){
-				yieldPlan.setYpArea(part.getArea());
-				yieldPlan.setProductType(part.getProductType());
-				yieldPlan.setPartName(part.getPartName());
-				yieldPlan.setPrimaryCraft(part.getCraftWay());
-			}
+			//直接取erp数据不查询mes
+			yieldPlan.setYpArea(mesRbWo.getPrtarea());
+			yieldPlan.setPartName(mesRbWo.getPrtdesc());
+			yieldPlan.setPrimaryCraft(mesRbWo.getProcesslinedesc());
+
 			yieldPlan.setUseDept(mesRbWo.getPlndept());
 			yieldPlan.setPlanUser(mesRbWo.getPlannerdesc());
 			yieldPlan.setPlate(mesRbWo.getKdofplat());