From 7f6694b8f5859d85bb3af7686e655bae7802bc9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Thu, 7 May 2026 17:41:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/order/pojo/entity/YieldOrder.java       |  9 +++++++++
 .../scheduling/pojo/entity/YieldOrderEntity.java |  9 +++++++++
 .../produce/service/impl/PdaSaveServiceImpl.java |  3 +++
 .../erpdata/mapper/ErpDataProduceMapper.xml      | 16 ++++++++--------
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
index 74b267bc..6f975cd1 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java
@@ -497,6 +497,15 @@ public class YieldOrder extends BaseEntity {
 	@TableField(value = "parent_yo_id")
 	private Long parentYoId;
 
+	@Schema(description = "涂色标个数")
+	private String tsbNum;
+	@Schema(description = "涂色带个数")
+	private String tsdNum;
+	@Schema(description = "涂箭头个数")
+	private String tjtNum;
+	@Schema(description = "责任部门")
+	private String resDept;
+
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double plateThickness1;
 
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
index 9a8e70d9..32e1cea1 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
@@ -369,4 +369,13 @@ public class YieldOrderEntity extends TenantEntity {
 	@TableField(value = "ACTUAL_WEIGHING")
 	private BigDecimal actualWeighing;
 
+	@Schema(description = "涂色标个数")
+	private String tsbNum;
+	@Schema(description = "涂色带个数")
+	private String tsdNum;
+	@Schema(description = "涂箭头个数")
+	private String tjtNum;
+	@Schema(description = "责任部门")
+	private String resDept;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
index 73dd228d..8812aa68 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
@@ -563,6 +563,8 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         yieldOrder.setCardNo(yieldOrderService.nextCardNo());
         yieldOrder.setYoCode(yieldOrderService.nextCode(rr.getRedono()));
         yieldOrder.setYpCode(rr.getRedono());
+        // todo责任部门从erp获取
+        yieldOrder.setResDept("");
         yieldOrder.setPartCode(part.getPartCode());
         yieldOrder.setProductType(part.getProductType());
         yieldOrder.setPartName(part.getPartName());
@@ -584,6 +586,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         yieldOrder.setSiteWork(Boolean.FALSE);
         yieldOrder.setPrimaryCraft(rr.getDeptcode());
         yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode());
+        yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCode());
         List<User> users = userClient.listByNameNolike(rr.getRecman());
         yieldOrder.setReceiveUser(CollectionUtils.isNotEmpty(users) ? users.get(0).getId() : AuthUtil.getUserId());
         yieldOrder.setReceiveTime(new Date());
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml
index 060be2cb..249f95ee 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml
@@ -105,18 +105,18 @@
         </where>
     </select>
     <select id="reviewFormMess" resultType="org.springblade.erpdata.pojo.vo.PpmReportDetailModelVO">
-        select a.code,
+        select a.code as sheetNo,
                a.p5layer1,
                a.p5layer3,
-               a.useproc,
-               a.useseq,
+               a.useproc as process,
+               a.useseq as processName,
                a.precode,
-               a.redodeptcode,
-               a.p1remark,
-               a.disposename,
+               a.redodeptcode as reworkLine,
+               a.p1remark as memo,
+               a.disposename as dispose,
                a.deptcode,
-               a.p2layer1,
-               a.chker,
+               a.p2layer1 as layer1,
+               a.chker as usercode,
                a.prtno,
                a.lotno
         from dba_mgr.v_mes_rb_qisbillqry a