erp同步烧结订单

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseLOTTJProcessor.java

@@ -0,0 +1,27 @@
+package org.springblade.job.processor.erp;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import tech.powerjob.worker.core.processor.ProcessResult;
+import tech.powerjob.worker.core.processor.TaskContext;
+import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
+
+import java.util.concurrent.CompletableFuture;
+
+@RequiredArgsConstructor
+@Slf4j
+public class SynPurchaseLOTTJProcessor implements BasicProcessor {
+
+    private final IErpMesRbWoClient mesRbWoClient;
+
+
+
+    @Override
+    public ProcessResult process(TaskContext taskContext) throws Exception {
+        log.info("同步采购LOTTJ订单定时任务开始");
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synPurchaseLOTTJ());
+        log.info("同步采购LOTTJ订单定时任务结束");
+        return new ProcessResult(true);
+    }
+}

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSinterProcessor.java

@@ -0,0 +1,27 @@
+package org.springblade.job.processor.erp;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import tech.powerjob.worker.core.processor.ProcessResult;
+import tech.powerjob.worker.core.processor.TaskContext;
+import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
+
+import java.util.concurrent.CompletableFuture;
+
+@RequiredArgsConstructor
+@Slf4j
+public class SynSinterProcessor implements BasicProcessor {
+
+    private final IErpMesRbWoClient mesRbWoClient;
+
+
+
+    @Override
+    public ProcessResult process(TaskContext taskContext) throws Exception {
+        log.info("同步烧结订单定时任务开始");
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synSinter());
+        log.info("同步烧结订单定时任务结束");
+        return new ProcessResult(true);
+    }
+}

blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynTemporaryProcessor.java

@@ -0,0 +1,27 @@
+package org.springblade.job.processor.erp;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.erpdata.feign.IErpMesRbWoClient;
+import tech.powerjob.worker.core.processor.ProcessResult;
+import tech.powerjob.worker.core.processor.TaskContext;
+import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
+
+import java.util.concurrent.CompletableFuture;
+
+@RequiredArgsConstructor
+@Slf4j
+public class SynTemporaryProcessor implements BasicProcessor {
+
+    private final IErpMesRbWoClient mesRbWoClient;
+
+
+
+    @Override
+    public ProcessResult process(TaskContext taskContext) throws Exception {
+        log.info("同步临时订单定时任务开始");
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synTemporary());
+        log.info("同步临时订单定时任务结束");
+        return new ProcessResult(true);
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java

@@ -3,10 +3,12 @@ package org.springblade.desk.order.feign;
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -32,6 +34,10 @@ public interface IApsOrderClient {
     String MAX_CARD_NO = API_PREFIX + "/getMaxCardNo";
     String SYN_GLASS_CAKE = API_PREFIX + "/synGlassCake";
     String CLOSE_PROD_PLAN = API_PREFIX + "/synCloseProdPlan";
+    String GET_SELECT_TIME = API_PREFIX + "/getSelectTime";
+    String GET_CRAFT_CODE = API_PREFIX + "/getDsCraftListByCode";
+    String SAVE_ORDER_LIST = API_PREFIX + "/saveOrderList";
+    String UP_DATE_MAX = API_PREFIX + "/upByDateMax";
 
     @PostMapping(SYNC_PLAN_FROM_SAVE)
     void saveList(List<YieldPlan> yieldOrderList);
@@ -51,4 +57,12 @@ public interface IApsOrderClient {
     void synGlassCake();
     @GetMapping(CLOSE_PROD_PLAN)
     void synCloseProdPlan();
+    @GetMapping(GET_SELECT_TIME)
+    String getSelectTime(String sycnTime);
+    @GetMapping(GET_CRAFT_CODE)
+    List<DsPartEntity> getDsCraftListByCode(String prtno);
+    @PostMapping(SAVE_ORDER_LIST)
+    void saveOrderList(List<YieldOrder> yieldOrderList);
+    @GetMapping  (UP_DATE_MAX)
+    void upByDateMax(@RequestParam("max") String max,@RequestParam("code") String code);
 }

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

@@ -25,6 +25,13 @@ public interface IErpMesRbWoClient {
 	String API_PREFIX = "/feign/erpdata/mesrbwo";
 	String GET_LIST = API_PREFIX + "/getList";
 	String GET_WO = API_PREFIX + "/getWoOne";
+	String SYN_MES_WO = API_PREFIX + "/synMesRbWo";
+	String SYN_CLOSE_PLAN = API_PREFIX + "/synCloseProdPlan";
+	String SYN_PURCHASE = API_PREFIX + "/synPurchase";
+	String SYN_TEMPORARY = API_PREFIX + "/synTemporary";
+	String SYN_SINTER = API_PREFIX + "/synSinter";
+	String SYN_PURCHASELOTTJ = API_PREFIX + "/synPurchaseLOTTJ";
+	String SYN_GLASSCAKE = API_PREFIX + "/synGlassCake";
 
 	/**
 	 * 查询烧结配套信息
@@ -38,15 +45,23 @@ public interface IErpMesRbWoClient {
 	/**
 	 * 同步生产计划数据
 	 */
+	@GetMapping(SYN_MES_WO)
 	R<Void> synMesRbWo();
 	/**
 	 * 同步玻璃饼订单
 	 */
+	@GetMapping(SYN_GLASSCAKE)
 	R<Void> synGlassCake();
-
+	@GetMapping(SYN_CLOSE_PLAN)
 	R<Void>synCloseProdPlan();
 	@GetMapping(GET_WO)
 	R<Wo> getWoOne(String ypCode);
-
+	@GetMapping(SYN_PURCHASE)
 	R<Void> synPurchase();
+	@GetMapping(SYN_TEMPORARY)
+	R<Void> synTemporary();
+	@GetMapping(SYN_SINTER)
+	R<Void> synSinter();
+	@GetMapping(SYN_PURCHASELOTTJ)
+	R<Void> synPurchaseLOTTJ();
 }

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

@@ -45,4 +45,19 @@ public class IErpMesRbWoClientFallback implements IErpMesRbWoClient {
 	public R<Void> synPurchase() {
 		return R.fail("获取数据失败");
 	}
+
+	@Override
+	public R<Void> synTemporary() {
+		return R.fail("获取数据失败");
+	}
+
+	@Override
+	public R<Void> synSinter() {
+		return R.fail("获取数据失败");
+	}
+
+	@Override
+	public R<Void> synPurchaseLOTTJ() {
+		return R.fail("获取数据失败");
+	}
 }

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

@@ -43,4 +43,5 @@ public class MesRbPacturnrecord {
     private String ouclp;      //路线卡号
     private String processlinedesc;      //一级路线
     private String wono;      //工作订单号
+    private String firseq;
 }

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

@@ -28,4 +28,5 @@ public class MesRbPurtoso {
     private String kdofplat;      //镀种
     private String prtmeterial;      //材料
     private String rigidity;      //硬度
+    private String firseq;
 }

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

@@ -33,4 +33,5 @@ public class MesRbSjso {
     private String warctlr;
     private String planner;
     private String username;
+    private String firseq;
 }

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

@@ -39,4 +39,5 @@ public class MesRbWxpromotion {
     private String kdofplat;      //镀种
     private String prtmeterial;      //材料
     private String rigidity;    //硬度
+    private String firseq;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java

@@ -8,6 +8,7 @@ import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
 import org.springblade.desk.dashboard.service.IDsCraftService;
 import org.springblade.desk.dashboard.service.IDsPartService;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.order.service.IYieldPlanService;
@@ -36,6 +37,7 @@ public class ApsOrderClient implements IApsOrderClient {
 	private final IDsPartService dsPartService;
 
 	//private final IErpMesRbWoClient mesRbWoClient;
+
 	@Override
 	@PostMapping(SYNC_PLAN_FROM_SAVE)
 	public void saveList(List<YieldPlan> yieldPlanList) {
@@ -102,4 +104,24 @@ public class ApsOrderClient implements IApsOrderClient {
 //			}
 //		});
 	}
+
+	@Override
+	public String getSelectTime(String sycnTime) {
+		return yieldPlanService.getSelectTime(sycnTime);
+	}
+	@Override
+	public List<DsPartEntity> getDsCraftListByCode(String prtno) {
+		return dsPartService.list(new QueryWrapper<DsPartEntity>().lambda()
+				.eq(DsPartEntity::getPartCode, prtno));
+	}
+
+	@Override
+	public void saveOrderList(List<YieldOrder> yieldOrderList) {
+		yieldOrderService.saveOrUpdateBatch(yieldOrderList);
+	}
+
+	@Override
+	public void upByDateMax(String max, String code) {
+		yieldPlanService.updateByNewlevdateMax(max,code);
+	}
 }

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

@@ -51,4 +51,14 @@ public interface YieldPlanMapper extends BaseMapper<YieldPlan> {
 	 * @return
 	 */
 	LineMemoVo getLineMemo(String ypCode);
+	/**
+	 * 获取计划开始时间
+	 * @return
+	 */
+    String getSelectTime(String sycnTime);
+	/**
+	 * 更新计划开始时间
+	 * @return
+	 */
+	void updateByNewlevdateMax(String newlevdateMax, String code);
 }

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

@@ -73,4 +73,25 @@
             </if>
         </where>
     </select>
+    <select id="getSelectTime" resultType="java.lang.String">
+        select to_date(DICT_VALUE,'yyyy-mm-dd hh24:mi:ss')
+                   AS vSelectTime
+        from BLADE_DICT
+        <where>
+            <if test="sycnTime != null">
+                and code = #{sycnTime}
+            </if>
+            and DICT_KEY = 1
+        </where>
+    </select>
+    <update id="updateByNewlevdateMax">
+        UPDATE BLADE_DICT
+        SET DICT_VALUE = to_char(#{newlevdateMax}, 'yyyy-mm-dd hh24:mi:ss')
+        <where>
+            <if test="code != null">
+                and code = #{code}
+            </if>
+            and DICT_KEY = 1
+        </where>
+    </update>
 </mapper>

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

@@ -68,4 +68,14 @@ public interface IYieldPlanService extends BaseService<YieldPlan> {
 	 * 同步玻璃饼订单
 	 */
     void synGlassCake();
+	/**
+	 * 获取同步时间
+	 * @return
+	 */
+    String getSelectTime(String sycnTime);
+	/**
+	 * 更新同步时间
+	 *
+	 */
+	void updateByNewlevdateMax(String newlevdateMax, String code);
 }

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

@@ -227,4 +227,14 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
 			baseMapper.updateById(yieldPlan);
 		});
 	}
+
+	@Override
+	public String getSelectTime(String sycnTime) {
+		return baseMapper.getSelectTime(sycnTime);
+	}
+
+	@Override
+	public void updateByNewlevdateMax(String max, String code) {
+		baseMapper.updateByNewlevdateMax(max,code);
+	}
 }

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

@@ -2,6 +2,7 @@ package org.springblade.erpdata.feign;
 
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.table.Wo;
@@ -21,6 +22,7 @@ import java.util.List;
 @Hidden
 @RestController
 @AllArgsConstructor
+@Slf4j
 public class ErpMesRbWoClient implements IErpMesRbWoClient {
 
     private final IErpMesRbWoService erpMesRbWoService;
@@ -59,4 +61,26 @@ public class ErpMesRbWoClient implements IErpMesRbWoClient {
         erpMesRbWoService.synPurchase();
         return R.success();
     }
+
+    @Override
+    public R<Void> synTemporary() {
+        erpMesRbWoService.synTemporary();
+        return R.success();
+    }
+
+    @Override
+    public R<Void> synSinter() {
+        log.info("同步烧结订单定时任务开始");
+        erpMesRbWoService.synSinter();
+        log.info("同步烧结订单定时任务结束");
+        return R.success();
+    }
+
+    @Override
+    public R<Void> synPurchaseLOTTJ() {
+        log.info("同步采购LOTTJ订单定时任务开始");
+        erpMesRbWoService.synPurchaseLOTTJ();
+        log.info("同步采购LOTTJ订单定时任务结束");
+        return R.success();
+    }
 }

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

@@ -18,4 +18,10 @@ public interface ErpMesRbPacturnrecordMapper extends Mapper {
 	 * @return
 	 */
 	List<MesRbPacturnrecord> getMesRbPacturnrecordErpList();
+	/**
+	 * 获取要同步的推进计划转工单
+	 *
+	 * @return
+	 */
+	List<MesRbPacturnrecord> getMesRbPacturnrecordList(String newlevdateMax);
 }

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

@@ -6,4 +6,37 @@
         SELECT * FROM v_mes_rb_pacturnrecord WHERE is_deleted = 0
     </select>
 
+    <select id = "getMesRbPacturnrecordList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPacturnrecord">
+        SELECT
+            a.deptno,
+            a.sono,
+            a.wono,
+            a.prtno,
+            a.prtlotno,
+            a.usedept,
+            a.woreqdat,
+            a.planner,
+            a.cdate,
+            a.rouclp,
+            a.splcode,
+            a.seqavlqty,
+            a.warctlr,
+            a.recseqno,
+            a.firseq,
+            a.usedeptcode,
+            a.conductor,
+            a.cdate
+        FROM
+            v_mes_rb_pacturnrecord a
+        <where>
+            <if test="newlevdateMax != null">
+                AND a.cdate <![CDATA[ > ]]> #{newlevdateMax}
+            </if>
+            AND a.wono IS NOT NULL
+            AND a.prtlotno IS NOT NULL
+            AND a.rouclp IS NOT NULL
+            AND a.splcode IS NOT NULL
+        </where>
+    </select>
+
 </mapper>

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

@@ -18,4 +18,25 @@ public interface ErpMesRbPartoplinkMapper extends Mapper {
 	 * @return
 	 */
 	List<MesRbPartoplink> getMesRbPartoplinkErpList();
+	/**
+	 * 获取ERP推进计划转工单
+	 *
+	 * @param
+	 * @return
+	 */
+    Long getVcount(String prtno, String firseq);
+	/**
+	 * 获取ERP推进计划转工单
+	 *
+	 * @param
+	 * @return
+	 */
+	String getRoamNo(String prtno, String firseq);
+	/**
+	 * 获取ERP推进计划转工单
+	 *
+	 * @param
+	 * @return
+	 */
+	String getRoamNoNext(String prtno, String firseq);
 }

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

@@ -5,5 +5,75 @@
     <select id = "getMesRbPartoplinkErpList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPartoplink">
         SELECT * FROM v_mes_rb_partoplink WHERE is_deleted = 0
     </select>
+    <select id = "getVcount" resultType = "java.lang.Long">
+        SELECT count(1) as vCount
+        FROM v_mes_rb_partoplink a
+        <where>
+            <if test="prtno != null">
+                AND a.prtno = #{prtno}
+            </if>
+            <if test="firseq != null">
+                AND a.firseq = #{firseq}
+            </if>
+        </where>
+    </select>
+    <select id = "getRoamNo" resultType = "java.lang.String">
+        SELECT
+        (a.firseq) AS roamNo
+        FROM
+        v_mes_rb_partoplink a
+         <where>
+             rownum = 1
+            <if test="prtno != null">
+                AND a.prtno = #{prtno}
+            </if>
+             AND a.firseqno > (
+             SELECT
+             DISTINCT b.firseqno
+             FROM
+             v_mes_rb_partoplink b
+             <where>
+                 <if test="prtno != null">
+                     AND b.prtno = #{prtno}
+                 </if>
+                 <if test="firseq != null">
+                     AND b.firseq = #{firseq}
+                 </if>
+             </where>
+         </where>
+        )
+        AND a.firseqname NOT LIKE '库%'
+    </select>
+    <select id = "getRoamNoNext" resultType = "java.lang.String">
+        SELECT
+            (CASE
+                 WHEN a.firseqname NOT LIKE '库%' THEN a.firseq
+                 ELSE ''
+                END)
+                AS
+                roamNoNext
+        FROM
+            v_mes_rb_partoplink a
+        <where>
+            rownum = 1
+            <if test="prtno != null">
+                AND a.prtno = #{prtno}
+            </if>
+            AND a.firseqno > (
+            SELECT
+            DISTINCT b.firseqno
+            FROM
+            v_mes_rb_partoplink b
+            <where>
+                <if test="prtno != null">
+                    AND b.prtno = #{prtno}
+                </if>
+                <if test="firseq != null">
+                    AND b.firseq = #{firseq}
+                </if>
+            </where>
+            )
+        </where>
+    </select>
 
 </mapper>

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

@@ -18,4 +18,26 @@ public interface ErpMesRbPurtosoMapper extends Mapper {
 	 * @return
 	 */
 	List<MesRbPurtoso> getMesRbPurtosoErpList();
+	/**
+	 * 获取ERP最新等级时间
+	 *
+	 * @param selectTime
+	 * @return
+	 */
+    String getNewlevdateMax(String selectTime);
+	/**
+	 * 获取ERP推进计划转工单
+	 *
+	 * @param newlevdateMax
+	 * @return
+	 */
+	List<MesRbPurtoso> getMesRbPurtosoList(String newlevdateMax);
+	/**
+	 * 获取ERP推进计划转工单的vcount
+	 *
+	 * @param prtno
+	 * @param firseq
+	 * @return
+	 */
+	Long getVcount(String prtno, String firseq);
 }

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

@@ -6,4 +6,28 @@
         SELECT * FROM V_MES_RB_PURTOSO WHERE is_deleted = 0
     </select>
 
+    <select id = "getNewlevdateMax" resultType = "java.lang.String">
+        SELECT nvl(max(a.newlevdate), selectTime)
+                   as newlevdateMax
+        FROM V_MES_RB_PURTOSO a
+        <where>
+            a.is_deleted = 0
+            AND a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+        </where>
+        ORDER BY a.newlevdate DESC;
+    </select>
+
+    <select id = "getMesRbPurtosoList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPurtoso">
+        select a.firseq,a.sono,a.wono,a.prtno,a.prtlotno,a.prtudept,
+               a.soreqdat,a.soplanner,a.soreldat,a.rouclp,a.splcode,a.newlevsoqty,
+               a.warctlr,a.lewdept,a.prtudeptcode,a.newlevname,a.newlevdate
+        from V_MES_RB_PURTOSO a
+        <where>
+            1=1
+            <if test="newlevdateMax != null">
+                AND a.newlevdate <![CDATA[ > ]]> #{newlevdateMax} -1/24/6;
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -18,4 +18,10 @@ public interface ErpMesRbSjsoMapper extends Mapper {
 	 * @return
 	 */
 	List<MesRbSjso> getMesRbSjsoErpList();
+	/**
+	 * 获取要同步的推进计划转工单
+	 *
+	 * @return
+	 */
+    List<MesRbSjso> getMesRbSjsoList(String newlevdateMax);
 }

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

@@ -6,4 +6,36 @@
         SELECT * FROM v_mes_rb_sjso WHERE is_deleted = 0
     </select>
 
+    <select id = "getMesRbSjsoList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbSjso">
+        SELECT
+            a.firseq,
+            a.sono,
+            a.wono,
+            a.prtno,
+            a.prtlotno,
+            a.prtudept,
+            a.soreqdat,
+            a.soplanner,
+            a.soreldat,
+            a.rouclp,
+            a.splcode,
+            a.newlevsoqty,
+            a.warctlr,
+            a.lewdept,
+            a.newlevflag,
+            a.prtudeptcode,
+            a.newlevname,
+            a.newlevdate
+        FROM
+            v_mes_rb_sjso a
+        <where>
+            1=1
+            <if test="newlevdateMax != null">
+                AND a.newlevdate <![CDATA[ > ]]> #{newlevdateMax}
+            </if>
+        </where>
+       /* WHERE
+            a.newlevdate > v_select_time*/
+    </select>
+
 </mapper>

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

@@ -19,4 +19,10 @@ public interface ErpMesRbWxpromotionMapper extends Mapper {
 	 * @return
 	 */
 	List<MesRbWxpromotion> getMesRbWxpromotionErpList();
+	/**
+	 * 获取要同步的推进计划转工单
+	 *
+	 * @return
+	 */
+    List<MesRbWxpromotion> getMesRbWxpromotionList(String newlevdateMax);
 }

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

@@ -6,4 +6,35 @@
         SELECT * FROM v_mes_rb_wxpromotion WHERE is_deleted = 0
     </select>
 
+    <select id = "getMesRbWxpromotionList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbWxpromotion">
+        SELECT
+            a.firseq,
+            a.sono,
+            a.wono,
+            a.prtno,
+            a.prtlotno,
+            a.prtudept,
+            a.soreqdat,
+            a.soplanner,
+            a.soreldat,
+            a.rouclp,
+            a.splcode,
+            a.newlevsoqty,
+            a.warctlr,
+            a.lewdept,
+            a.prtudeptcode,
+            a.newlevname,
+            a.newlevdate
+        FROM
+            v_mes_rb_wxpromotion a
+        <where>
+            1=1
+            <if test="newlevdateMax != null">
+                AND a.newlevdate <![CDATA[ > ]]> #{newlevdateMax} -1/24/6;
+            </if>
+        </where>
+        /*WHERE
+            a.newlevdate > v_select_time-1 / 24 / 6*/
+    </select>
+
 </mapper>

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

@@ -1,5 +1,9 @@
 package org.springblade.erpdata.service;
 
+import org.springblade.erpdata.pojo.dto.view.MesRbPacturnrecord;
+
+import java.util.List;
+
 /**
  * ERP数据查询service
  *
@@ -11,4 +15,11 @@ public interface IErpMesRbPacturnrecordService {
 	 * 同步推进计划转工单
 	 */
 	void synMesRbPacturnrecord();
+	/**
+	 * 从ERP视图中获取要同步的推进计划转工单
+	 *
+	 * @return
+	 */
+
+	List<MesRbPacturnrecord> getMesRbPacturnrecordList(String newlevdateMax);
 }

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

@@ -11,4 +11,25 @@ public interface IErpMesRbPartoplinkService {
 	 * 同步推进计划转工单
 	 */
 	void synMesRbPartoplink();
+	/**
+	 * 获取ERP推进计划转工单
+	 *
+	 * @param
+	 * @return
+	 */
+	Long getVcount(String prtno, String firseq);
+	/**
+	 * 获取ERP推进计划转工单
+	 *
+	 * @param
+	 * @return
+	 */
+	String getRoamNo(String prtno, String firseq);
+	/**
+	 * 获取ERP推进计划转工单
+	 *
+	 * @param
+	 * @return
+	 */
+	String getRoamNoNext(String prtno, String firseq);
 }

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

@@ -1,6 +1,6 @@
 package org.springblade.erpdata.service;
 
-import org.springblade.erpdata.pojo.dto.view.MesRbWo;
+import org.springblade.erpdata.pojo.dto.view.MesRbPurtoso;
 
 import java.util.List;
 
@@ -15,4 +15,23 @@ public interface IErpMesRbPurtosoService {
 	 * 同步推进计划转工单
 	 */
 	void synPurtoso();
+	/**
+	 * 获取最新等级时间
+	 * @param selectTime
+	 * @return
+	 */
+	String getNewlevdateMax(String selectTime);
+	/**
+	 * 获取推进计划转工单
+	 * @param newlevdateMax
+	 * @return
+	 */
+	List<MesRbPurtoso> getMesRbPurtosoList(String newlevdateMax);
+	/**
+	 * 获取vcount
+	 * @param prtno
+	 * @param firseq
+	 * @return
+	 */
+	Long getVcount(String prtno, String firseq);
 }

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

@@ -1,5 +1,9 @@
 package org.springblade.erpdata.service;
 
+import org.springblade.erpdata.pojo.dto.view.MesRbSjso;
+
+import java.util.List;
+
 /**
  * ERP数据查询service
  *
@@ -11,4 +15,11 @@ public interface IErpMesRbSjsoService {
 	 * 同步推进计划转工单
 	 */
 	void synMesRbSjso();
+	/**
+	 * 获取推送的推送计划
+	 *
+	 * @param newlevdateMax
+	 * @return
+	 */
+    List<MesRbSjso> getMesRbSjsoList(String newlevdateMax);
 }

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

@@ -32,4 +32,16 @@ public interface IErpMesRbWoService {
     R<Wo> getWoOne(String ypCode);
 
     void synPurchase();
+	/**
+	 * 同步临时数据
+	 */
+    void synTemporary();
+	/**
+	 * 同步烧结数据
+	 */
+	void synSinter();
+	/**
+	 * 同步采购订单LOTTJ数据
+	 */
+	void synPurchaseLOTTJ();
 }

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

@@ -1,5 +1,9 @@
 package org.springblade.erpdata.service;
 
+import org.springblade.erpdata.pojo.dto.view.MesRbWxpromotion;
+
+import java.util.List;
+
 /**
  * ERP数据查询service
  *
@@ -11,4 +15,11 @@ public interface IErpMesRbWxpromotionService {
 	 * 同步数据
 	 */
 	void synMesRbWxpromotion();
+	/**
+	 * 获取数据
+	 *
+	 * @param newlevdateMax
+	 * @return
+	 */
+	List<MesRbWxpromotion> getMesRbWxpromotionList(String newlevdateMax);
 }

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

@@ -5,10 +5,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.desk.order.feign.IApsClient;
 import org.springblade.erpdata.mapper.ErpMesRbPacturnrecordMapper;
 import org.springblade.erpdata.mapper.ErpMesRbPartoplinkMapper;
+import org.springblade.erpdata.pojo.dto.view.MesRbPacturnrecord;
 import org.springblade.erpdata.service.IErpMesRbPacturnrecordService;
 import org.springblade.erpdata.service.IErpMesRbPartoplinkService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author lqk
  * @date 2025-11-26 9:39
@@ -26,4 +29,15 @@ public class ErpMesRbPacturnrecordServiceImpl implements IErpMesRbPacturnrecordS
 	public void synMesRbPacturnrecord() {
 
 	}
+	/**
+	 * 从ERP视图中获取要同步的推进计划转工单
+	 *
+	 * @return
+	 */
+	@Override
+	public List<MesRbPacturnrecord> getMesRbPacturnrecordList(String newlevdateMax) {
+		return mesRbPacturnrecordMapper.getMesRbPacturnrecordList(newlevdateMax);
+	}
+
+
 }

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

@@ -27,4 +27,19 @@ public class ErpMesRbPartoplinkServiceImpl implements IErpMesRbPartoplinkService
 	public void synMesRbPartoplink() {
 
 	}
+
+	@Override
+	public Long getVcount(String prtno, String firseq) {
+		return mesRbPartoplinkMapper.getVcount(prtno,firseq);
+	}
+
+	@Override
+	public String getRoamNo(String prtno, String firseq) {
+		return mesRbPartoplinkMapper.getRoamNo(prtno,firseq);
+	}
+
+	@Override
+	public String getRoamNoNext(String prtno, String firseq) {
+		return mesRbPartoplinkMapper.getRoamNoNext(prtno,firseq);
+	}
 }

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

@@ -4,9 +4,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.desk.order.feign.IApsClient;
 import org.springblade.erpdata.mapper.ErpMesRbPurtosoMapper;
+import org.springblade.erpdata.pojo.dto.view.MesRbPurtoso;
 import org.springblade.erpdata.service.IErpMesRbPurtosoService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author lqk
  * @date 2025-11-26 9:39
@@ -25,4 +28,19 @@ public class ErpMesRbPurtosoServiceImpl implements IErpMesRbPurtosoService {
 	public void synPurtoso() {
 
 	}
+
+	@Override
+	public String getNewlevdateMax(String selectTime) {
+		return mesRbPurtosoMapper.getNewlevdateMax(selectTime);
+	}
+
+	@Override
+	public List<MesRbPurtoso> getMesRbPurtosoList(String newlevdateMax) {
+		return mesRbPurtosoMapper.getMesRbPurtosoList(newlevdateMax);
+	}
+
+	@Override
+	public Long getVcount(String prtno, String firseq) {
+		return mesRbPurtosoMapper.getVcount(prtno, firseq);
+	}
 }

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

@@ -4,9 +4,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.desk.order.feign.IApsClient;
 import org.springblade.erpdata.mapper.ErpMesRbSjsoMapper;
+import org.springblade.erpdata.pojo.dto.view.MesRbSjso;
 import org.springblade.erpdata.service.IErpMesRbSjsoService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author lqk
  * @date 2025-11-26 9:39
@@ -25,4 +28,14 @@ public class ErpMesRbSjsoServiceImpl implements IErpMesRbSjsoService {
 	public void synMesRbSjso() {
 
 	}
+	/**
+	 * 获取推送的推送计划
+	 *
+	 * @param newlevdateMax
+	 * @return
+	 */
+	@Override
+	public List<MesRbSjso> getMesRbSjsoList(String newlevdateMax) {
+		return mesRbSjsoMapper.getMesRbSjsoList(newlevdateMax);
+	}
 }

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

@@ -3,19 +3,19 @@ package org.springblade.erpdata.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
 import org.springblade.desk.order.feign.IApsOrderClient;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
 import org.springblade.erpdata.mapper.ErpMesRbWoMapper;
 import org.springblade.erpdata.pojo.dto.table.Rrbwoerptomes;
 import org.springblade.erpdata.pojo.dto.table.Wo;
-import org.springblade.erpdata.pojo.dto.view.MesRbWo;
-import org.springblade.erpdata.service.IErpMesRbWoService;
-import org.springblade.erpdata.service.IErpRrbwoerptomesService;
-import org.springblade.erpdata.service.IErpWoService;
+import org.springblade.erpdata.pojo.dto.view.*;
+import org.springblade.erpdata.service.*;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -39,6 +39,16 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 
 	private final IErpWoService woService;
 
+	private final IErpMesRbPurtosoService mesRbPurtosoService;
+
+	private final IErpMesRbPartoplinkService mesRbPartoplinkService;
+
+	private final IErpMesRbPacturnrecordService mesRbPacturnrecordService;
+
+	private final IErpMesRbSjsoService mesRbSjsoService;
+
+	private final IErpMesRbWxpromotionService mesRbWxpromotionService;
+
 
 	@Override
 	public List<MesRbWo> getList(MesRbWo entity) {
@@ -171,9 +181,112 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 				.eq("WONO",ypCode));
 		return R.data(wo);
 	}
-
+	/**
+	 * 同步采购工单
+	 */
 	@Override
 	public void synPurchase() {
-
+		String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME");
+		String newlevdateMax=mesRbPurtosoService.getNewlevdateMax(selectTime);
+		//apsOrderClient.updateByNewlevdateMax(newlevdateMax, "SYCN_BUYTRANSFER_TIME");
+		List<MesRbPurtoso> purtosoList=mesRbPurtosoService.getMesRbPurtosoList(newlevdateMax);
+		List<YieldOrder> yieldOrderList=new ArrayList<>();
+		purtosoList.forEach(mesRbPurtoso -> {
+			YieldOrder yieldOrder=new YieldOrder();
+			List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno());
+			yieldOrder.setYieldType(12001);
+			if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){
+				yieldOrder.setYieldType(12002);
+			}
+			yieldOrder.setRoamNo("");//当前b号
+			yieldOrder.setRoamNoNext("");//下级b号
+			Long vCount=mesRbPartoplinkService.getVcount(mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq());
+			if(vCount>0){
+				String roamNo=mesRbPartoplinkService.getRoamNo(mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq());
+				yieldOrder.setRoamNo(roamNo);//当前b号
+				String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq());
+				yieldOrder.setRoamNoNext(roamNoNext);//下级b号
+			}
+			yieldOrderList.add(yieldOrder);
+		});
+		apsOrderClient.saveOrderList(yieldOrderList);
+	}
+	/**
+	 * 同步临时工单
+	 */
+	@Override
+	public void synTemporary() {
+		String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME");
+		String newlevdateMax=mesRbPurtosoService.getNewlevdateMax(selectTime);
+		//apsOrderClient.updateByNewlevdateMax(newlevdateMax, "SYCN_BUYTRANSFER_TIME");
+		List<MesRbPacturnrecord> pacturnrecordList=mesRbPacturnrecordService.getMesRbPacturnrecordList(newlevdateMax);
+		List<YieldOrder> yieldOrderList=new ArrayList<>();
+		pacturnrecordList.forEach(mesRbPacturnrecord -> {
+			YieldOrder yieldOrder=new YieldOrder();
+			List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno());
+			yieldOrder.setYieldType(12001);
+			if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){
+				yieldOrder.setYieldType(12002);
+			}
+			yieldOrder.setRoamNoNext("");//下级b号
+			if(StringUtils.isNotEmpty(mesRbPacturnrecord.getFirseq())){
+				String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPacturnrecord.getPrtno(),mesRbPacturnrecord.getFirseq());
+				yieldOrder.setRoamNoNext(roamNoNext);//下级b号
+			}
+			yieldOrderList.add(yieldOrder);
+		});
+		apsOrderClient.saveOrderList(yieldOrderList);
+	}
+	/**
+	 * 同步烧结数据
+	 */
+	@Override
+	public void synSinter() {
+		String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME");
+		String newlevdateMax=mesRbPurtosoService.getNewlevdateMax(selectTime);
+		//apsOrderClient.updateByNewlevdateMax(newlevdateMax, "SYCN_BUYTRANSFER_TIME");
+		List<MesRbSjso> rbtosoList=mesRbSjsoService.getMesRbSjsoList(newlevdateMax);
+		List<YieldOrder> yieldOrderList=new ArrayList<>();
+		rbtosoList.forEach(mesRbtoso -> {
+			YieldOrder yieldOrder=new YieldOrder();
+			yieldOrder.setYieldType(12002);
+			yieldOrder.setRoamNoNext( "");
+			if(StringUtils.isNotEmpty(mesRbtoso.getFirseq())){
+				String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbtoso.getPrtno(),mesRbtoso.getFirseq());
+				yieldOrder.setRoamNoNext(roamNoNext);//下级b号
+			}
+			yieldOrderList.add(yieldOrder);
+		});
+		apsOrderClient.saveOrderList(yieldOrderList);
+	}
+	/**
+	 * 同步采购LOTTJ
+	 */
+	@Override
+	public void synPurchaseLOTTJ() {
+		String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME");
+		String dateMax=mesRbPurtosoService.getNewlevdateMax(selectTime);
+		apsOrderClient.upByDateMax(dateMax,"SYCN_BUYTRANSFER_TIME");
+		List<MesRbWxpromotion> wxpromotionList=mesRbWxpromotionService.getMesRbWxpromotionList(dateMax);
+		List<YieldOrder> yieldOrderList=new ArrayList<>();
+		wxpromotionList.forEach(mesRbWxpromotion -> {
+			YieldOrder yieldOrder=new YieldOrder();
+			List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno());
+			yieldOrder.setYieldType(12001);
+			if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){
+				yieldOrder.setYieldType(12002);
+			}
+			yieldOrder.setRoamNo("");//当前b号
+			yieldOrder.setRoamNoNext("");//下级b号
+			Long vCount=mesRbPartoplinkService.getVcount(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq());
+			if(vCount>0){
+				String roamNo=mesRbPartoplinkService.getRoamNo(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq());
+				yieldOrder.setRoamNo(roamNo);//当前b号
+				String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq());
+				yieldOrder.setRoamNoNext(roamNoNext);//下级b号
+			}
+			yieldOrderList.add(yieldOrder);
+		});
+		apsOrderClient.saveOrderList(yieldOrderList);
 	}
 }

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

@@ -4,9 +4,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.desk.order.feign.IApsClient;
 import org.springblade.erpdata.mapper.ErpMesRbWxpromotionMapper;
+import org.springblade.erpdata.pojo.dto.view.MesRbWxpromotion;
 import org.springblade.erpdata.service.IErpMesRbWxpromotionService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author lqk
  * @date 2025-11-26 9:39
@@ -25,4 +28,14 @@ public class ErpMesRbWxpromotionServiceImpl implements IErpMesRbWxpromotionServi
 	public void synMesRbWxpromotion() {
 
 	}
+	/**
+	 * 获取ERP数据
+	 *
+	 * @param newlevdateMax
+	 * @return
+	 */
+	@Override
+	public List<MesRbWxpromotion> getMesRbWxpromotionList(String newlevdateMax) {
+		return mesRbWxpromotionMapper.getMesRbWxpromotionList(newlevdateMax);
+	}
 }