物流修改bug

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -32,7 +32,7 @@ public interface LauncherConstant {
      * nacos dev 地址
      */
 
-    //String NACOS_DEV_ADDR = "192.168.249.27:8848";
+//    String NACOS_DEV_ADDR = "192.168.249.27:8848";
     String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
     /**R

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java

@@ -67,7 +67,7 @@ public class YieldPlan extends BaseEntity {
 	 * 使用部门
 	 */
 	@TableField(value = "USE_DEPT")
-	private Long useDept;
+	private String useDept;
 
 	/**
 	 * 数量
@@ -91,7 +91,7 @@ public class YieldPlan extends BaseEntity {
 	 * 计划员
 	 */
 	@TableField(value = "PLAN_USER")
-	private Long planUser;
+	private String planUser;
 
 	/**
 	 * 计划下达时间

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldPlanVo.java

@@ -32,4 +32,6 @@ public class YieldPlanVo extends YieldPlan {
 	 * 计划员名称
 	 */
 	String planUserName;
+
+	String useDeptName;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/ShiftTransferDTO.java

@@ -2,6 +2,9 @@ package org.springblade.desk.produce.pojo.dto;
 
 import lombok.Data;
 
+/**
+ * @author litao
+ */
 @Data
 public class ShiftTransferDTO {
     private Long woId;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/UploadPlanDto.java

@@ -0,0 +1,24 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
+import org.springblade.desk.produce.pojo.entity.WorkOrder;
+import org.springblade.desk.produce.pojo.entity.WorkPlan;
+import org.springblade.desk.produce.pojo.enums.WorkOrderEnum;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>Description: 报工调整-保存 </p>
+ *
+ * @author litao
+ */
+@Data
+public class UploadPlanDto {
+
+    private List<WorkPlan> workPlanList;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderAdjust.java

@@ -0,0 +1,58 @@
+package org.springblade.desk.produce.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+/**
+ * 车间作业计划修改日志 实体类
+ *
+ * @author BladeX
+ */
+@Data
+@TableName("MES_WORK_ORDER_ADJUST")
+@Schema(description = "WorkPlanLog对象")
+@EqualsAndHashCode(callSuper = true)
+public class WorkOrderAdjust extends BaseEntity {
+
+	@Schema(description = "车间订单")
+	private Long woId;
+
+	@Schema(description = "订单编号")
+	private String woCode;
+
+	@Schema(description = "路线卡号")
+	private String cardNo;
+
+	@Schema(description = "零件号")
+	private String partCode;
+
+	@Schema(description = "批次")
+	private String batchNo;
+
+	@Schema(description = "工序")
+	private String ppsName;
+
+	@Schema(description = "数量")
+	private Double workQty;
+
+	@Schema(description = "原班组")
+	private String oriMakeTeam;
+
+	@Schema(description = "现班组")
+	private String makeTeam;
+
+	@Schema(description = "原接收人")
+	private String oriReceiveMan;
+
+	@Schema(description = "现接收人")
+	private String receiveMan;
+
+	@TableField(exist = false)
+	@Schema(description = "调整人")
+	private String adjustName;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java

@@ -341,4 +341,9 @@ public class WorkPlan extends BaseEntity {
 	@TableField(exist = false)
 	private TaskDataDto taskData;
 
+	@TableField(exist = false)
+	@Schema(description = "车间计划修改记录")
+	private WorkPlanLog workPlanLog;
+
+
 }

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

@@ -36,4 +36,5 @@ public class MesRbWo {
     private String processlinedesc;    //工艺路线详情
     private String prodline;    //产品系列
     private Double prtarea; //单件面积平方毫米
+    private String plannerdesc;//计划员
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java

@@ -264,7 +264,7 @@ public class PartEntity extends BaseEntity {
 	 * 是否玻璃饼
 	 */
 	@Schema(description = "是否玻璃饼")
-	private String isClassCake;
+	private String isGlassCake;
 	/**
 	 * 成型厚度
 	 */

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

@@ -214,7 +214,7 @@ public class DsPartExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("是否玻璃饼")
-	private String isClassCake;
+	private String isGlassCake;
 	/**
 	 * 成型厚度
 	 */

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

@@ -4,7 +4,7 @@
 
 
     <select id="selectPartCode" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartBasicsEntity">
-        select id, part_code, part_name, product_type, is_sintering, is_class_cake, create_time, create_user, create_dept, update_time, update_user, remarks, status, is_deleted
+        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>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.java

@@ -30,6 +30,8 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.logistics.pojo.entity.PrWorkOrder;
 import org.springblade.desk.logistics.pojo.entity.StationCenter;
 
+import java.util.List;
+
 /**
  * 任务分派表 Mapper 接口
  *
@@ -39,5 +41,5 @@ import org.springblade.desk.logistics.pojo.entity.StationCenter;
 public interface StationCenterMapper extends BaseMapper<StationCenter> {
 
 
-    StationCenter selectByStation(@Param("stationId") Long stationId);
+    List<StationCenter> selectByStation(@Param("stationId") Long stationId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.xml

@@ -6,7 +6,7 @@
 
 
     <select id="selectByStation" resultType="org.springblade.desk.logistics.pojo.entity.StationCenter">
-        select id, station_id, wc_id, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark, status from LM_STATION_CENTER
+         select id, station_id, wc_id, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark, status from LM_STATION_CENTER
         where station_id = #{stationId} and is_deleted = 0
     </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationCenterService.java

@@ -29,6 +29,8 @@ import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.logistics.pojo.entity.PrWorkOrder;
 import org.springblade.desk.logistics.pojo.entity.StationCenter;
 
+import java.util.List;
+
 /**
  * 车间订单 服务类
  *
@@ -37,5 +39,5 @@ import org.springblade.desk.logistics.pojo.entity.StationCenter;
  */
 public interface IStationCenterService extends BaseService<StationCenter> {
 
-    StationCenter selectByStationId(Long id);
+    List<StationCenter> selectByStationId(Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java

@@ -907,17 +907,17 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
             task.setStartStationRegion(station.getStationRegion());
 
             // 查询站台中心（可能为null）
-            StationCenter stationCenter = stationCenterService.selectByStationId(station.getId());
-            if (stationCenter == null) {
+            List<StationCenter> stationCenterList = stationCenterService.selectByStationId(station.getId());
+            if (CollectionUtils.isEmpty(stationCenterList)) {
                 log.warn("未找到站台中心信息, stationId: {}", station.getId());
                 return task;
             }
 
             // 安全设置工作中心ID
-            if (stationCenter.getWcId() != null) {
-                task.setStartWcId(stationCenter.getWcId());
+            if (stationCenterList.size() == 1) {
+                task.setStartWcId(stationCenterList.get(0).getWcId());
             } else {
-                log.warn("站台中心的工作中心ID为空, stationCenterId: {}", stationCenter.getId());
+                log.warn("站台中心的工作中心ID为空, stationCenterId: {}", stationCenterList.get(0).getStationId());
             }
         }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationCenterServiceImpl.java

@@ -36,6 +36,8 @@ import org.springblade.desk.logistics.service.IStationCenterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 车间订单、 服务实现类
  *
@@ -50,7 +52,7 @@ public class StationCenterServiceImpl extends BaseServiceImpl<StationCenterMappe
     StationCenterMapper stationCenterMapper;
 
     @Override
-    public StationCenter selectByStationId(Long stationId) {
+    public List<StationCenter> selectByStationId(Long stationId) {
         return stationCenterMapper.selectByStation(stationId);
     }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java

@@ -28,7 +28,9 @@ import org.springblade.scheduling.feign.IWorkOrderClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 应用管理控制器 - 生产订单
@@ -291,10 +293,23 @@ public class YieldOrderController extends BladeController {
 
 	@PostMapping("/calculateCoatingMaterial")
 	@Operation(summary = "镀层物料需求", description = "")
-	public R calculateCoatingMaterial(@Parameter(description = "主键", required = true) @RequestParam Long id) {
-		YieldOrder yieldOrder = yieldOrderService.getById(id);
-		Boolean result = goodsRecordService.calculateCoatingMaterial(yieldOrder);
-		return R.status(result);
+	public R calculateCoatingMaterial(@Parameter(description = "主键", required = true) @RequestParam String ids) {
+		Map<String,Integer> map = new HashMap<>();
+		int success = 0;
+		int fail = 0;
+		List<Long> idList= Func.toLongList(ids);
+		for(Long id : idList){
+			YieldOrder yieldOrder = yieldOrderService.getById(id);
+			Boolean result = goodsRecordService.calculateCoatingMaterial(yieldOrder);
+			if(result){
+				success++;
+			}else{
+				fail++;
+			}
+		}
+		map.put("success",success);
+		map.put("fail",fail);
+		return R.data(map);
 	}
 
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -56,6 +56,7 @@
         <if test = "entity.status != null and entity.status != ''">
             AND status = #{entity.status}
         </if>
+		order by release_date desc
     </select>
 
     <select id = "pageMaterialApply" resultType = "org.springblade.desk.order.pojo.entity.YieldOrder">

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

@@ -24,8 +24,6 @@ import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.order.service.IYieldPlanService;
 import org.springblade.erpdata.feign.IErpPartoplinkFirseqClient;
 import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
-import org.springblade.system.cache.UserCache;
-import org.springblade.system.pojo.vo.RegionVO;
 import org.springblade.wms.feign.StRealtimeStockClient;
 import org.springblade.wms.pojo.entity.StRealtimeStock;
 import org.springblade.wms.pojo.vo.StGoodStatisVO;
@@ -223,9 +221,7 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
 				yieldOrder.setProductIdent(yieldPlan.getProductIdent());
 				yieldOrder.setUseDept("热表分厂");
 				yieldOrder.setDemandDate(yieldPlan.getDemandDate());
-				if (null != UserCache.getUser(yieldPlan.getPlanUser())) {
-					yieldOrder.setPlanUser(UserCache.getUser(yieldPlan.getPlanUser()).getRealName());
-				}
+				yieldOrder.setPlanUser(yieldPlan.getPlanUser());
 				yieldOrder.setReleaseDate(new Date());
 				yieldOrder.setMemo(yieldPlan.getMemo());
 				yieldOrder.setCardNo(cardNo);

blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java

@@ -2,12 +2,9 @@ package org.springblade.desk.order.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
 import org.springblade.desk.order.pojo.vo.YieldPlanVo;
-import org.springblade.system.cache.UserCache;
-import org.springblade.system.pojo.entity.User;
 
 import java.util.Objects;
 
@@ -26,11 +23,14 @@ public class YieldPlanWrapper extends BaseEntityWrapper<YieldPlan, YieldPlanVo>
 	public YieldPlanVo entityVO(YieldPlan entity) {
 		YieldPlanVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, YieldPlanVo.class));
 		vo.setStatusName(YieldPlanEnum.getName(entity.getStatus()));
-
+		/*Dept dept = SysCache.getDept(entity.getUseDept());
+		if(Func.isNotEmpty(dept)){
+			vo.setUseDeptName(dept.getDeptName());
+		}
 		User user = UserCache.getUser(entity.getPlanUser());
 		if (Func.isNotEmpty(user)) {
 			vo.setPlanUserName(user.getAccount());
-		}
+		}*/
 		return vo;
 	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DisTaskingController.java

@@ -18,6 +18,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.desk.produce.pojo.dto.ShiftTransferDTO;
 import org.springblade.desk.produce.pojo.dto.TaskCompleteDTO;
 import org.springblade.desk.produce.pojo.dto.TaskCompleteOrderDTO;
+import org.springblade.desk.produce.pojo.dto.UploadPlanDto;
 import org.springblade.desk.produce.pojo.entity.DisTasking;
 import org.springblade.desk.produce.pojo.entity.MakeRec;
 import org.springblade.desk.produce.pojo.entity.WorkPlan;
@@ -140,8 +141,8 @@ public class DisTaskingController extends BladeController {
     @PostMapping("/uploadPlan")
     @ApiOperationSupport(order = 8)
     @Operation(summary = "报工调整-保存", description  = "传入workPlanList")
-    public R uploadPlan(@Valid @RequestBody List<WorkPlan> workPlanList) {
-        pdaSaveService.uploadPlan(workPlanList);
+    public R uploadPlan(@RequestBody UploadPlanDto uploadPlanDto) {
+        pdaSaveService.uploadPlan(uploadPlanDto.getWorkPlanList());
         return R.success();
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IWorkOrderService.java

@@ -236,4 +236,6 @@ public interface IWorkOrderService extends BaseService<WorkOrder> {
 	WorkOrder getWorkOrderUniqueRec(String prtno, String splcode, String sono);
 
 	List<WorkOrder> findCubByYoId(Long yoId);
+
+	void saveAdjust(Long woId, Long oldTsId, Long newTsId, Long userId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java

@@ -658,15 +658,15 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void uploadPlan(List<WorkPlan> list) {
-        if (list.size() == 0) {
+        if (list.isEmpty()) {
             return;
         }
         WorkPlan prWorkPlan;
         List<BsProcedureTeam> ptLst;
         Long woId = null;
         for (WorkPlan item : list) {
-
             if (item.getMakeTeam() == null || item.getId() == null) {
                 continue;
             }
@@ -674,54 +674,60 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
             //获取车间订单Id
             woId = item.getWoId();
 
-            prWorkPlan = baseMapper.selectById(item.getWoId());
-            if (item.getReceiveMan() != null) {
-                prWorkPlan.setReceiveMan(item.getReceiveMan());
-            } else {
-                prWorkPlan.setReceiveMan(null);
-            }
+            prWorkPlan = baseMapper.selectById(item.getId());
+            prWorkPlan.setReceiveMan(item.getReceiveMan() != null ? item.getReceiveMan() : null);
             //判定工序是否特殊工序，如果是，则附属班组存在值
-            if (prWorkPlan.getOcId() == null && prWorkPlan.getSubsidiaryTeam() == null && prWorkPlan.getOcId() == null) {
+            BsProcessSetEntity processSet = bsProcessSetService.getById(item.getPpsId());
+            if (processSet != null && "1".equals(processSet.getIsSpecial()) && prWorkPlan.getSubsidiaryTeam() == null && prWorkPlan.getOcId() == null) {
                 ptLst = bsProcedureTeamService.findBsProcedureTeamByPpsId(prWorkPlan.getPpsId());
-                if (ptLst != null && ptLst.size() > 0) {
+                if (ptLst != null && !ptLst.isEmpty()) {
                     prWorkPlan.setSubsidiaryTeam(ptLst.get(0).getPpsId());
                 }
             }
-            if (prWorkPlan.getOem().equals("1")) {
+            if ("1".equals(prWorkPlan.getOem())) {
                 prWorkPlan.setOem("0");
                 prWorkPlan.setOem(null);
             }
             prWorkPlan.setMakeTeam(item.getMakeTeam());
-            // 2025-07-23 线上迁移修改注释掉代码
-            if (item.getPapers() != null && (item.getMakeTeam() != null || item.getReceiveMan() != null)) {
-                WorkPlanLog log = new WorkPlanLog();
-                log.setUpdateUser(AuthUtil.getUser().getUserId());
-                log.setUpdateTime(new Date());
-                log.setWoId(woId);
-                workPlanLogService.save(log);
+            if (item.getSubsidiaryTeam() != null) {
+                prWorkPlan.setSubsidiaryTeam(item.getSubsidiaryTeam());
+            }
+            this.updateById(prWorkPlan);
+            if (item.getWorkPlanLog() != null && (item.getMakeTeam() != null || item.getReceiveMan() != null)) {
+                workPlanLogService.save(item.getWorkPlanLog());
             }
         }
 
+        //获取主班组
+        if (woId != null) {
+            workOrderService.updateHostWorkUnit(workOrderService.getById(woId));
+        }
     }
 
     @Override
     public void shiftTransfer(ShiftTransferDTO shiftTransferDTO) {
-        List<WorkPlan> wpList = baseMapper.selectList(new QueryWrapper<WorkPlan>().eq("wo_id", shiftTransferDTO.getWoId()));
+        List<WorkPlan> wpList = this.list(Wrappers.lambdaQuery(WorkPlan.class).eq(WorkPlan::getWoId, shiftTransferDTO.getWoId()));
 
+        if (CollectionUtils.isEmpty(wpList)) {
+            return;
+        }
         BsTeamSetEntity makeTeam = new BsTeamSetEntity();
         makeTeam.setId(shiftTransferDTO.getNewTsId());
-        BsProcessSetEntity processSet = bsProcessSetService.getOne(Wrappers.lambdaQuery(BsProcessSetEntity.class).eq(BsProcessSetEntity::getId, shiftTransferDTO.getNewTsId()));
+        List<Long> ppsIds = wpList.stream().map(WorkPlan::getPpsId).toList();
+        List<BsProcessSetEntity> processSetEntities = bsProcessSetService.listByIds(ppsIds);
+        // 转换为map
+        Map<Long, BsProcessSetEntity> processSet = processSetEntities.stream().collect(Collectors.toMap(BsProcessSetEntity::getId, item -> item));
         wpList.forEach(wp -> {
-            if (processSet.getIsSpecial() == null) {
+            if (processSet.get(wp.getPpsId()) == null) {
                 return;
             }
             if (WorkPlan.STATUS_NO_START.equals(wp.getStatus())) {
                 wp.setMakeTeam(makeTeam.getId());
             }
         });
-        // prWorkOrderAdjustService.saveAdjust(woId, oldTsId, newTsId, userInfo);
+        workOrderService.saveAdjust(shiftTransferDTO.getWoId(), shiftTransferDTO.getOldTsId(), shiftTransferDTO.getNewTsId(), AuthUtil.getUserId());
         //更新订单主加工单位
-        // prWorkOrderService.updateHostWorkUnit(woId);
+        workOrderService.updateHostWorkUnit(workOrderService.getById(shiftTransferDTO.getWoId()));
     }
 
     @Override

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -734,6 +734,31 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         return baseMapper.findCubByYoId(id);
     }
 
+    @Override
+    public void saveAdjust(Long woId, Long oldTsId, Long newTsId, Long userId) {
+        WorkOrder wo = this.getById(woId);
+//        PrWorkOrderAdjust woa = new PrWorkOrderAdjust();
+//
+//        BsTeamSet newMakeTeam = new BsTeamSet();
+//        newMakeTeam.setTsId(newTsId);
+//        BsTeamSet oldMakeTeam = new BsTeamSet();
+//        oldMakeTeam.setTsId(oldTsId);
+//
+//        woa.setOldTeam(oldMakeTeam);
+//        woa.setNewTeam(newMakeTeam);
+//        woa.setPrWorkOrder(wo);
+//        woa.setCreateMan(userInfo);
+//        woa.setCreateTime(new Date());
+//        woa.setQuota(wo.getPlateSingleQuotaTotal());
+//        if (woa.getQuota() > 0) {
+//            woa.setCurStatus(PrWorkOrderAdjust.CUR_STATUS_UNFINISHED);
+//        } else {
+//            woa.setCurStatus(PrWorkOrderAdjust.CUR_STATUS_COMPLETE);
+//        }
+//
+//        prWorkOrderAdjustDao.save(woa);
+    }
+
     private String getVersionByPartCode(String partCode) {
         return erpDataProduceClient.getVersionByPartCode(partCode).getData();
     }

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

@@ -170,7 +170,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 				yieldPlan.setPartName(part.getPartName());
 				yieldPlan.setPrimaryCraft(part.getCraftWay());
 			}
-			yieldPlan.setUseDept(Long.valueOf(mesRbWo.getPlndept()));
+			yieldPlan.setUseDept(mesRbWo.getPlndept());
+			yieldPlan.setPlanUser(mesRbWo.getPlannerdesc());
 			yieldPlan.setPlate(mesRbWo.getKdofplat());
 			yieldPlan.setMemo(mesRbWo.getRemark());
 			yieldPlan.setDominantDept(mesRbWo.getPrtmdept());
@@ -354,6 +355,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
 			yieldOrder.setYpMemo("临时工艺转工");
 			yieldOrder.setManualIncrease(false);
+			yieldOrder.setYpCode(mesRbPacturnrecord.getWono());
 			yieldOrder.setYoCode(mesRbPacturnrecord.getSono());//生产单号
 			yieldOrder.setBatchNo(mesRbPacturnrecord.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbPacturnrecord.getPrtno());//零件号
@@ -418,6 +420,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ);
 			yieldOrder.setManualIncrease(false);
 			yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号
+			yieldOrder.setYpCode(mesRbtoso.getWono());
 			yieldOrder.setBatchNo(mesRbtoso.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbtoso.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbtoso.getPrtlotno());
@@ -476,6 +479,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpMemo("推进计划");
 			yieldOrder.setManualIncrease(false);
 			yieldOrder.setYoCode(mesRbWxpromotion.getSono());//生产单号
+			yieldOrder.setYpCode(mesRbWxpromotion.getWono());
 			yieldOrder.setBatchNo(mesRbWxpromotion.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbWxpromotion.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbWxpromotion.getPrtlotno());
@@ -542,6 +546,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
 			yieldOrder.setManualIncrease(false);
 			yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号
+			yieldOrder.setYpCode(mesRbSodelrecwx.getWono());
 			yieldOrder.setBatchNo(mesRbSodelrecwx.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbSodelrecwx.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbSodelrecwx.getPrtlotno());
@@ -611,6 +616,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpMemo("正式工艺转工");
 			yieldOrder.setManualIncrease(false);
 			yieldOrder.setYoCode(mesRbSodelreczg.getSono());//生产单号
+			yieldOrder.setYpCode(mesRbSodelreczg.getWono());
 			yieldOrder.setBatchNo(mesRbSodelreczg.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbSodelreczg.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbSodelreczg.getPrtlotno());
@@ -683,6 +689,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setSiteWork(true);
 			yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
 			yieldOrder.setYoCode(mesRbPk.getWono());//生产单号
+			yieldOrder.setYpCode(mesRbPk.getWono());
 			yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbPk.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbPk.getPrtlotno());

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/PartExcel.java

@@ -322,7 +322,7 @@ public class PartExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("是否玻璃饼")
-	private String isClassCake;
+	private String isGlassCake;
 	/**
 	 * 成型厚度
 	 */