Merge branch 'master' into develop-QA

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPacturnrecordClient.java

@@ -1,28 +1,3 @@
-/**
- * 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.erpdata.feign;
 
 

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPartoplinkClient.java

@@ -1,28 +1,3 @@
-/**
- * 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.erpdata.feign;
 
 

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPurtosoClient.java

@@ -1,28 +1,3 @@
-/**
- * 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.erpdata.feign;
 
 

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java

@@ -1,35 +1,8 @@
-/**
- * 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.erpdata.feign;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.tool.api.R;
-import org.springblade.erpdata.pojo.dto.AllocationDTO;
 import org.springblade.erpdata.pojo.dto.view.MesRbWo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Prtmsg.java

@@ -1,11 +1,75 @@
 package org.springblade.erpdata.pojo.dto.table;
 
+import lombok.Data;
+
 /**
  * 对应ERP中表 t_prtmsg
  *
  * @author lqk
  * @date 2026-01-16 17:32
  */
+@Data
 public class Prtmsg {
 
+    private String  prtarea;     //面积
+
+    private String  prtsize;     //尺寸
+
+    private String  prtmeterial;     //材料
+
+    private String  remark;     //备注
+
+    private String  hangflag;     //是否挂件0--否，1--是
+
+    private String  thofpla;     //插针面积
+
+    private String  kdofplat;     //镀种
+
+    private String  filecode;     //文件号
+
+    private String  excsttdate;     //下发日期
+
+    private String  excenddate;     //有效截至日期
+
+    private String  rigidity;     //有效日期
+
+    private String  dorules;     //标记要求
+
+    private String  cfmflag;     //审核标记 0 未审核，1已审核
+
+    private String  cmsign;     //标记要求
+
+    private String  cfmname;     //审核人
+
+    private String  cfmdate;     //审核日期
+
+    private String  chgname;     //更改人
+
+    private String  chgdate;     //更改时间
+
+    private String  zlxx;     //质量信息
+
+    private String  seqrunhr;     //工时
+
+    private String  mtntype;     //维护类型:1-正常，2-虚拟零件
+
+    private String  height;     //厚度
+
+    private String  sdnumber;     //色带
+
+    private String  sbnumber;     //色标
+
+    private String  ispaint;     //是否油漆0，否，1，是
+
+    private String  jtnumber;     //箭头
+
+    private String  mtlspcf;     //规格
+
+    private String  istrialkey;     //是否试键位：0，否；1，是
+
+    private String  iscs;     //是否吹沙：0，否；1，是
+
+    private String  seqrunhrsj;     //烧结装配工时
+
+    private String  isyz;     //是否印字：0，否；1，是
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/table/Wo.java

@@ -1,10 +1,173 @@
 package org.springblade.erpdata.pojo.dto.table;
 
+import lombok.Data;
+
 /**
  * 对应ERP中表 t_wo
  *
  * @author lqk
  * @date 2026-01-16 17:32
  */
+@Data
 public class Wo {
+
+    private String  wono;      //工作订单
+
+    private String  splcode;      //批次号
+
+    private String  plnsign;      //计划标记
+
+    private String  qstsign;      //实际质量等级
+
+    private String  invadjcode;      //入库单号
+
+    private String  prtmdept;      //主制车间号
+
+    private String  prtudept;      //使用车间号
+
+    private String  prtno;      //物料号
+
+    private String  pkno;      //配料单号
+
+    private String  woreqdat;      //wo需求日期
+
+    private String  wopordat;      //wo下达日期
+
+    private String  woporqty;      //wo需求数量
+
+    private String  wototqty;      //累计完成数量
+
+    private String  pkflag;      //生成配料单标志: ''0'' ''配料 , ''1''未配料
+
+    private String  wosttdat;      //wo实际开工日期
+
+    private String  worelstat;      //wo下达状态: ''0'' 未下达 ''1'' 已正常下达
+
+    private String  woexcstat;      //wo执行状态 ''0'' 执行中,''1''正常完成,''2''欠交完成,''3''超量完成,''4''未执行,''5''脱期完成
+
+    private String  woclsdat;      //wo关闭日期
+
+    private String  wodueqty;      //wo交付数量
+
+    private String  woboqty;      //毛需求数量
+
+    private String  prtltstat;      //提前期状态码: ''0''未检查提前期,''1''满足,''2''不满足
+
+    private String  sprtstat;      //子件可用状态码, ''0''未检查,''1''满足,''2''不满足
+
+    private String  wotosoil;      //车间生成订单so标志: ''0'' 未生成,''1''已生成
+
+    private String  woenddat;      //wo实际完工日期
+
+    private String  mono;      //制造订单号
+
+    private String  wotopur;      //wo生成采购需求计划标记 ''0'' 未生成,''1'' 已生成
+
+    private String  wotoschdl;      //wo生成工序作业单标记 ''0'' 未生成,''1''已生成
+
+    private String  schdrelstat;      //工序作业单下达标记 ''0'' 未下达,''1'' 已下达
+
+    private String  schdrelname;      //工序作业单下达标记
+
+    private String  schdreldate;      //工序作业单下达日期
+
+    private String  itemno;      //项目代码
+
+    private String  prtlotno;      //等级
+
+    private String  prt_mask;      //外协分派标记,0未分派1未分完2已分完
+
+    private String  invstat;      //入库状态 ''0''未入库 ''1''已入库(市场使用)2a毛坯状态1不需要毛坯
+
+    private String  prtwkccode;      //工作中心代码
+
+    private String  assino;      //工作定单满足计算标记，0-未计算，1-已计算
+
+    private String  remark;      //备注
+
+    private String  mtltmrk;      //型号
+
+    private String  planner;      //计划员码
+
+    private String  chksign;      //审核标记 ''0''未审核,''1'' 正式，‘2’临时，‘3’待定，‘4’无图，‘5’有存档工艺，无需晒图 ，‘6’有存档工艺，需晒图 。‘7’需要输入erp信息 ，‘8’生产计划有误 ，‘9’有正式需下临时，不晒图
+
+    private String  chkman;      //审核人
+
+    private String  chkdate;      //审核日期
+
+    private String  woclsman;      //工作订单完工人
+
+    private String  chqty;      //累计领取数
+
+    private String  prtreqflag;      //物料需求上报状态
+
+    private String  wopowerstatus;      //外协计划能力平衡：0未平衡，1正常下达，2超量未下达，3超量下达
+
+    private String  powerremark;      //外协能力平衡结果
+
+    private String  lackreason;      //清欠原因分析，0-尚待确定，1-技术问题，2-报废返修，3-物资采购，4-成件采购，5-生产组织
+
+    private String  planbedat;      //预计开工日期：在下达工作订单时计算，约定‘1111’年份未不满足开工条件
+
+    private String  planendat;      //预计完工日期：在工序作业单生成时计算
+
+    private String  plndept;      //计划部门
+
+    private String  usedept;      //使用部门
+
+    private String  woaddqty;      //加工余量
+
+    private String  woplanner;      //调度员
+
+    private String  plnarea;      //计划加工厂区(0--未定义  1--新区  2--本部)
+
+    private String  wxduedat;      //外协加工实际完成日期
+
+    private String  plntype;      //计划类型
+
+    private String  shplnflag;      //送货计划标记
+
+    private String  ycckflag;      //异常审核标记1、无需审核2、需要审核未审核3、需要审核已审核
+
+    private String  ycckman;      //异常审核人
+
+    private String  ycckdat;      //异常审核日期
+
+    private String  shdate;      //送货时间
+
+    private String  cfmflag;      //机加分厂团队确认标识 0--未确认  1--已确认
+
+    private String  pkfxflag;      //配套分批放行标识 0-未放行 1-放行
+
+    private String  wxplanner;      //外协计划员
+
+    private String  wxrecdat;      //''生产订单接收日期''
+
+    private String  cancelqty;      //返修报废/取消执行数
+
+    private String  cfmdate;      //机加分厂记录工作订单分派日期
+
+    private String  etlid;      //guid，etl使用的唯一性索引列
+
+    private String  wochkqty;      //抽检数
+
+    private String  id;      //新系统同步id
+
+    private String  dataflag;      //新老系统数据标识:	0-老系统,1-新系统
+
+    private String  specreq;      //特殊要求
+
+    private String  wostopstat;      //暂停标记:1-暂停,,2-冻结
+
+    private String  wostopdat;      //暂停日期
+
+    private String  wocleanremark;      //计划清理备注
+
+    private String  wocleanmtnman;      //计划清理备注维护人
+
+    private String  wocleanmtndate;      //计划清理备注维护时间
+
+    private String  cuscode;      //客户代码
+
+    private String  prtmdeptbranch;      //主制车间号对应二级中心
 }

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataSearchClient.java

@@ -1,28 +1,3 @@
-/**
- * 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.erpdata.feign;
 
 

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

@@ -0,0 +1,22 @@
+package org.springblade.erpdata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.springblade.erpdata.pojo.dto.view.MesRbPk;
+import org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg;
+
+import java.util.List;
+
+/**
+ * Mapper 接口
+ *
+ * @author lqk
+ */
+public interface ErpMesRbPkMapper extends Mapper {
+
+	/**
+	 * 从ERP视图中获取要同步的推进计划转工单
+	 *
+	 * @return
+	 */
+	List<MesRbPk> getMesRbPkErpList();
+}

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace = "org.springblade.erpdata.mapper.ErpMesRbPkMapper">
+
+    <select id = "getMesRbPkErpList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPk">
+        SELECT * FROM v_mes_rb_pk WHERE is_deleted = 0
+    </select>
+
+</mapper>

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

@@ -0,0 +1,21 @@
+package org.springblade.erpdata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg;
+
+import java.util.List;
+
+/**
+ * Mapper 接口
+ *
+ * @author lqk
+ */
+public interface ErpMesRbSodelreczgMapper extends Mapper {
+
+	/**
+	 * 从ERP视图中获取要同步的推进计划转工单
+	 *
+	 * @return
+	 */
+	List<MesRbSodelreczg> getMesRbSodelreczgErpList();
+}

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace = "org.springblade.erpdata.mapper.ErpMesRbSodelreczgMapper">
+
+    <select id = "getMesRbSodelreczgErpList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg">
+        SELECT * FROM v_mes_rb_sodelreczg WHERE is_deleted = 0
+    </select>
+
+</mapper>

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

@@ -1,9 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace = "org.springblade.erpdata.mapper.ErpMesRbWoMapper">
-
+    <!-- 周新昊 20240719 计划游标新增条件工艺路线不应为烧结子件的路线
+    AND a.processline NOT IN (SELECT KEY FROM t_listelement WHERE listname = 'SJZJPROCESSLINE')  -->
     <select id = "getYieldPlanErpList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbWo">
-        SELECT * FROM v_mes_rb_wo WHERE is_deleted = 0
+        SELECT DISTINCT rownum,
+                        a.wono,
+                        a.prtno,
+                        a.prtlotno,
+                        a.plndept,
+                        a.woporqty,
+                        a.woreqdat,
+                        a.plannerdesc,
+                        a.wopordat,
+                        a.remark,
+                        a.wototqty,
+                        a.prtmdept,
+                        a.processline,
+                        a.warctlrdesc,
+                        a.kdofplat,
+                        a.processlinedesc,
+                        a.prodline
+        FROM v_mes_rb_wo
+        WHERE  rownum <![CDATA[ <= ]]> 2000
     </select>
 
 </mapper>

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPkService.java

@@ -0,0 +1,14 @@
+package org.springblade.erpdata.service;
+
+/**
+ * ERP数据查询service
+ *
+ * @author lqk
+ */
+public interface IErpMesRbPkService {
+
+	/**
+	 * 同步数据
+	 */
+	void synMesRbPk();
+}

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbSodelreczgService.java

@@ -0,0 +1,14 @@
+package org.springblade.erpdata.service;
+
+/**
+ * ERP数据查询service
+ *
+ * @author lqk
+ */
+public interface IErpMesRbSodelreczgService {
+
+	/**
+	 * 同步数据
+	 */
+	void synMesRbSodelreczg();
+}

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

@@ -0,0 +1,27 @@
+package org.springblade.erpdata.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.desk.order.feign.IApsClient;
+import org.springblade.erpdata.mapper.ErpMesRbPkMapper;
+import org.springblade.erpdata.service.IErpMesRbPkService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lqk
+ * @date 2025-11-26 9:39
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ErpMesRbPkServiceImpl implements IErpMesRbPkService {
+
+	private final ErpMesRbPkMapper mesRbPkMapper;
+
+	private final IApsClient apsClient;
+
+	@Override
+	public void synMesRbPk() {
+
+	}
+}

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

@@ -0,0 +1,29 @@
+package org.springblade.erpdata.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.desk.order.feign.IApsClient;
+import org.springblade.erpdata.mapper.ErpMesRbSodelrecwxMapper;
+import org.springblade.erpdata.mapper.ErpMesRbSodelreczgMapper;
+import org.springblade.erpdata.service.IErpMesRbSodelrecwxService;
+import org.springblade.erpdata.service.IErpMesRbSodelreczgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lqk
+ * @date 2025-11-26 9:39
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ErpMesRbSodelreczgServiceImpl implements IErpMesRbSodelreczgService {
+
+	private final ErpMesRbSodelreczgMapper mesRbSodelreczgMapper;
+
+	private final IApsClient apsClient;
+
+	@Override
+	public void synMesRbSodelreczg() {
+
+	}
+}

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

@@ -35,9 +35,24 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 	@Override
 	public void synMesRbWo() {
 		List<MesRbWo> mesRbWoList=mesRbWoMapper.getYieldPlanErpList();
+		/**
+		 * 有多个实体类
+		 * b1. 根据零件号从`DS_PART`表中查询零件信息
+		 *
+		 * ```sql
+		 * SELECT a.product_type, a.part_name, a.area, a.craft_way, a.config_no
+		 *   INTO v_product_type, v_part_name, v_po_area, v_craft_way, v_config_no
+		 * FROM ds_part a WHERE a.part_code = v_prtno;
+		 */
 		List<YieldPlan> yieldPlanList=new ArrayList<>();
 		mesRbWoList.forEach(mesRbWo -> {
 			YieldPlan yieldPlan=new YieldPlan();
+			yieldPlan.setPlanType(12001L);//赋值默认值12001
+			if(mesRbWo.getProcesslinedesc().contains("封接")
+					||"LX08-05-028,LX08-05-030,LX08-05-031".contains(mesRbWo.getProcessline())){
+				yieldPlan.setPlanType(12002L);
+				yieldPlan.setPlate("烧结电镀");
+			}
 			yieldPlan.setYpCode(mesRbWo.getWono());
 			yieldPlan.setPartCode(mesRbWo.getPrtno());
 			yieldPlan.setProductType(mesRbWo.getPrtlotno());