Merge remote-tracking branch 'origin/master'

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

@@ -24,7 +24,7 @@ public class SynCraftProcessor implements BasicProcessor {
     @Override
     public ProcessResult process(TaskContext taskContext) throws Exception {
         log.info("同步正式工艺订单定时任务开始");
-        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synCraft());
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synCraft(null));
         runFuture.whenComplete((result, exception) -> {
             if (exception != null) {
                 log.error("同步正式工艺订单定时任务失败", exception);

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

@@ -24,7 +24,7 @@ public class SynOutsourcingProcessor implements BasicProcessor {
     @Override
     public ProcessResult process(TaskContext taskContext) throws Exception {
         log.info("同步外协订单定时任务开始");
-        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synOutsourcing());
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synOutsourcing(null));
         runFuture.whenComplete((result, exception) -> {
             if (exception != null) {
                 log.error("同步外协订单定时任务失败", exception);

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

@@ -24,7 +24,7 @@ public class SynPurchaseLOTTJProcessor implements BasicProcessor {
     @Override
     public ProcessResult process(TaskContext taskContext) throws Exception {
         log.info("同步采购LOTTJ订单定时任务开始");
-        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synPurchaseLOTTJ());
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synPurchaseLOTTJ(null));
         runFuture.whenComplete((result, exception) -> {
             if (exception != null) {
                 log.error("同步采购LOTTJ订单定时任务失败", exception);

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

@@ -24,7 +24,7 @@ public class SynSinterProcessor implements BasicProcessor {
     @Override
     public ProcessResult process(TaskContext taskContext) throws Exception {
         log.info("同步烧结订单定时任务开始");
-        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synSinter());
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synSinter(null));
         runFuture.whenComplete((result, exception) -> {
             if (exception != null) {
                 log.error("同步烧结订单定时任务失败", exception);

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

@@ -24,7 +24,7 @@ public class SynSupportingFacilitiesProcessor implements BasicProcessor {
     @Override
     public ProcessResult process(TaskContext taskContext) throws Exception {
         log.info("同步配套订单定时任务开始");
-        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synSupportingFacilities());
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synSupportingFacilities(null));
         runFuture.whenComplete((result, exception) -> {
             if (exception != null) {
                 log.error("同步配套订单定时任务失败", exception);

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

@@ -24,7 +24,7 @@ public class SynTemporaryProcessor implements BasicProcessor {
     @Override
     public ProcessResult process(TaskContext taskContext) throws Exception {
         log.info("同步临时订单定时任务开始");
-        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synTemporary());
+        CompletableFuture<Void> runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synTemporary(null));
         runFuture.whenComplete((result, exception) -> {
             if (exception != null) {
                 log.error("同步临时订单定时任务失败", exception);

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

@@ -64,17 +64,17 @@ public interface IErpMesRbWoClient {
 	@GetMapping(SYN_PURCHASE)
 	R<Void> synPurchase(@RequestParam("yoCode") String yoCode);
 	@GetMapping(SYN_TEMPORARY)
-	R<Void> synTemporary();
+	R<Void> synTemporary(@RequestParam("yoCode") String yoCode);
 	@GetMapping(SYN_SINTER)
-	R<Void> synSinter();
+	R<Void> synSinter(@RequestParam("yoCode") String yoCode);
 	@GetMapping(SYN_PURCHASELOTTJ)
-	R<Void> synPurchaseLOTTJ();
+	R<Void> synPurchaseLOTTJ(@RequestParam("yoCode") String yoCode);
 	@GetMapping(SYN_OUTSOURCING)
-	R<Void> synOutsourcing();
+	R<Void> synOutsourcing(@RequestParam("yoCode") String yoCode);
 	@GetMapping(SYN_CRAFT)
-	R<Void> synCraft();
+	R<Void> synCraft(@RequestParam("yoCode") String yoCode);
 	@GetMapping(SYN_SUPPORTING_FACILITIES)
-	R<Void> synSupportingFacilities();
+	R<Void> synSupportingFacilities(@RequestParam("yoCode") String yoCode);
 
 	/**
 	 * 根据工作订单号查询ERP需求日期

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

@@ -47,32 +47,32 @@ public class IErpMesRbWoClientFallback implements IErpMesRbWoClient {
 	}
 
 	@Override
-	public R<Void> synTemporary() {
+	public R<Void> synTemporary(String ypCode) {
 		return R.fail("获取数据失败");
 	}
 
 	@Override
-	public R<Void> synSinter() {
+	public R<Void> synSinter(String ypCode) {
 		return R.fail("获取数据失败");
 	}
 
 	@Override
-	public R<Void> synPurchaseLOTTJ() {
+	public R<Void> synPurchaseLOTTJ(String ypCode) {
 		return R.fail("获取数据失败");
 	}
 
 	@Override
-	public R<Void> synOutsourcing() {
+	public R<Void> synOutsourcing(String ypCode) {
 		return R.fail("获取数据失败");
 	}
 
 	@Override
-	public R<Void> synCraft() {
+	public R<Void> synCraft(String ypCode) {
 		return R.fail("获取数据失败");
 	}
 
 	@Override
-	public R<Void> synSupportingFacilities() {
+	public R<Void> synSupportingFacilities(String ypCode) {
 		return R.fail("获取数据失败");
 	}
 

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

@@ -2032,8 +2032,20 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
     @Override
     public Boolean syncYieldOrder(String yoCode) {
-        R<Void> voidR = mesRbWoClient.synPurchase(yoCode);
-
+        //物资转车间协作加工转订单
+        mesRbWoClient.synPurchase(yoCode);
+        //临时转订单
+        mesRbWoClient.synTemporary(yoCode);
+        //烧结转订单
+        mesRbWoClient.synSinter(yoCode);
+        //采购部推进计划转订单
+        mesRbWoClient.synPurchaseLOTTJ(yoCode);
+        //外协转订单
+        mesRbWoClient.synOutsourcing(yoCode);
+        //正式工艺转工转订单
+        mesRbWoClient.synCraft(yoCode);
+        //配套转订单
+        mesRbWoClient.synSupportingFacilities(yoCode);
         return null;
     }
 

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

@@ -63,47 +63,47 @@ public class ErpMesRbWoClient implements IErpMesRbWoClient {
     }
 
     @Override
-    public R<Void> synTemporary() {
-        erpMesRbWoService.synTemporary();
+    public R<Void> synTemporary(String yoCode) {
+        erpMesRbWoService.synTemporary(yoCode);
         return R.success();
     }
 
     @Override
-    public R<Void> synSinter() {
+    public R<Void> synSinter(String yoCode) {
         log.info("同步烧结订单定时任务开始");
-        erpMesRbWoService.synSinter();
+        erpMesRbWoService.synSinter(yoCode);
         log.info("同步烧结订单定时任务结束");
         return R.success();
     }
 
     @Override
-    public R<Void> synPurchaseLOTTJ() {
+    public R<Void> synPurchaseLOTTJ(String yoCode) {
         log.info("同步采购LOTTJ订单定时任务开始");
-        erpMesRbWoService.synPurchaseLOTTJ();
+        erpMesRbWoService.synPurchaseLOTTJ(yoCode);
         log.info("同步采购LOTTJ订单定时任务结束");
         return R.success();
     }
 
     @Override
-    public R<Void> synOutsourcing() {
+    public R<Void> synOutsourcing(String yoCode) {
         log.info("同步外协订单定时任务开始");
-        erpMesRbWoService.synOutsourcing();
+        erpMesRbWoService.synOutsourcing(yoCode);
         log.info("同步外协订单定时任务结束");
         return R.success();
     }
 
     @Override
-    public R<Void> synCraft() {
+    public R<Void> synCraft(String yoCode) {
         log.info("同步正式工艺订单定时任务开始");
-        erpMesRbWoService.synCraft();
+        erpMesRbWoService.synCraft(yoCode);
         log.info("同步正式工艺订单定时任务结束");
         return R.success();
     }
 
     @Override
-    public R<Void> synSupportingFacilities() {
+    public R<Void> synSupportingFacilities(String ypCode) {
         log.info("同步配套订单定时任务开始");
-        erpMesRbWoService.synSupportingFacilities();
+        erpMesRbWoService.synSupportingFacilities(ypCode);
         log.info("同步配套订单定时任务结束");
         return R.success();
     }

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

@@ -1,6 +1,7 @@
 package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.erpdata.pojo.dto.view.MesRbPacturnrecord;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public interface ErpMesRbPacturnrecordMapper extends Mapper {
 	 *
 	 * @return
 	 */
-	List<MesRbPacturnrecord> getMesRbPacturnrecordList(String newlevdateMax);
+	List<MesRbPacturnrecord> getMesRbPacturnrecordList(@Param("newlevdateMax") String newlevdateMax,@Param("yoCode") String yoCode);
 	/**
 	 * 获取ERP数据中最新的时间
 	 *

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

@@ -34,6 +34,9 @@
             <if test="newlevdateMax != null">
                 AND a.cdate <![CDATA[ > ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
+            <if test="yoCode != null and yoCode != ''">
+                AND a.sono = #{yoCode}
+            </if>
             AND a.wono IS NOT NULL
             AND a.prtlotno IS NOT NULL
             AND a.rouclp IS NOT NULL

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

@@ -1,6 +1,7 @@
 package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.erpdata.pojo.dto.view.MesRbPk;
 import org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg;
 
@@ -31,5 +32,5 @@ public interface ErpMesRbPkMapper extends Mapper {
 	 *
 	 * @return
 	 */
-	List<MesRbPk> getMesRbPkList(String dateMax);
+	List<MesRbPk> getMesRbPkList(@Param("dateMax") String dateMax,@Param("yoCode")  String yoCode);
 }

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

@@ -45,6 +45,9 @@
             <if test="newlevdateMax != null">
                 AND a.newlevdate <![CDATA[ > ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
+            <if test="yoCode != null and yoCode !=''">
+                AND a.sono = #{yoCode}
+            </if>
         </where>
         order by a.newlevdate desc
        /* WHERE

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

@@ -1,6 +1,7 @@
 package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.erpdata.pojo.dto.view.MesRbSjso;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public interface ErpMesRbSjsoMapper extends Mapper {
 	 *
 	 * @return
 	 */
-    List<MesRbSjso> getMesRbSjsoList(String newlevdateMax);
+    List<MesRbSjso> getMesRbSjsoList(@Param("newlevdateMax") String newlevdateMax,@Param("yoCode") String yoCode);
 	/**
 	 * 获取推送计划转工单的推送时间
 	 *

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

@@ -34,6 +34,9 @@
             <if test="newlevdateMax != null">
                 AND a.newlevdate <![CDATA[ > ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
+            <if test="yoCode != null and yoCode != ''">
+                AND a.sono = #{yoCode}
+            </if>
         </where>
         order by a.newlevdate desc
        /* WHERE

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

@@ -1,6 +1,7 @@
 package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.erpdata.pojo.dto.view.MesRbSodelrecwx;
 
 import java.util.List;
@@ -26,5 +27,5 @@ public interface ErpMesRbSodelrecwxMapper extends Mapper {
 	 */
     String getNewlevdateMax(String selectTime);
 
-	List<MesRbSodelrecwx> getMesRbSodelrecwxList(String dateMax);
+	List<MesRbSodelrecwx> getMesRbSodelrecwxList(@Param("dateMax") String dateMax, @Param("yoCode") String yoCode);
 }

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

@@ -44,6 +44,9 @@
             <if test="newlevdateMax != null">
                 AND a.newlevdate <![CDATA[ > ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
+            <if test="yoCode != null and yoCode !=''">
+                AND a.sono  = #{yoCode}
+            </if>
         </where>
         order by a.newlevdate desc
         /*WHERE

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

@@ -1,6 +1,7 @@
 package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg;
 
 import java.util.List;
@@ -26,5 +27,5 @@ public interface ErpMesRbSodelreczgMapper extends Mapper {
 	 * @param dateMax
 	 * @return
 	 */
-	List<MesRbSodelreczg> getMesRbSodelreczgList(String dateMax);
+	List<MesRbSodelreczg> getMesRbSodelreczgList(@Param("dateMax") String dateMax,@Param("yoCode") String yoCode);
 }

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

@@ -44,6 +44,9 @@
             <if test="newlevdateMax != null">
                 AND a.newlevdate <![CDATA[ > ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
+            <if test="yoCode != null and yoCode != ''">
+                AND a.sono = #{yoCode}
+            </if>
         </where>
         order by a.newlevdate desc
         /*WHERE

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

@@ -1,6 +1,7 @@
 package org.springblade.erpdata.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.erpdata.pojo.dto.view.MesRbSjso;
 import org.springblade.erpdata.pojo.dto.view.MesRbWxpromotion;
 
@@ -24,7 +25,7 @@ public interface ErpMesRbWxpromotionMapper extends Mapper {
 	 *
 	 * @return
 	 */
-    List<MesRbWxpromotion> getMesRbWxpromotionList(String newlevdateMax);
+    List<MesRbWxpromotion> getMesRbWxpromotionList(@Param("newlevdateMax") String newlevdateMax, @Param("yoCode") String yoCode);
 	/**
 	 * 获取ERP数据最新时间
 	 *

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

@@ -33,6 +33,9 @@
             <if test="newlevdateMax != null">
                 AND a.newlevdate <![CDATA[ > ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
+            <if test="yoCode != null and yoCode != ''">
+                AND a.sono = #{yoCode}
+            </if>
         </where>
         order by a.newlevdate desc
         /*WHERE

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

@@ -21,7 +21,7 @@ public interface IErpMesRbPacturnrecordService {
 	 * @return
 	 */
 
-	List<MesRbPacturnrecord> getMesRbPacturnrecordList(String newlevdateMax);
+	List<MesRbPacturnrecord> getMesRbPacturnrecordList(String newlevdateMax,String yoCode);
 	/**
 	 * 获取ERP数据中推进计划转工单最新时间
 	 *

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

@@ -26,5 +26,5 @@ public interface IErpMesRbPkService {
 	 * @param dateMax
 	 * @return
 	 */
-	List<MesRbPk> getMesRbPkList(String dateMax);
+	List<MesRbPk> getMesRbPkList(String dateMax,String yoCode);
 }

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

@@ -21,7 +21,7 @@ public interface IErpMesRbSjsoService {
 	 * @param newlevdateMax
 	 * @return
 	 */
-    List<MesRbSjso> getMesRbSjsoList(String newlevdateMax);
+    List<MesRbSjso> getMesRbSjsoList(String newlevdateMax,String yoCode);
 	/**
 	 * 获取推送计划最大时间
 	 *

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

@@ -26,5 +26,5 @@ public interface IErpMesRbSodelrecwxService {
 	 * @param dateMax
 	 * @return
 	 */
-	List<MesRbSodelrecwx> getMesRbSodelrecwxList(String dateMax);
+	List<MesRbSodelrecwx> getMesRbSodelrecwxList(String dateMax,String yoCode);
 }

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

@@ -26,5 +26,5 @@ public interface IErpMesRbSodelreczgService {
 	 * @param dateMax
 	 * @return
 	 */
-	List<MesRbSodelreczg> getMesRbSodelreczgList(String dateMax);
+	List<MesRbSodelreczg> getMesRbSodelreczgList(String dateMax,String yoCode);
 }

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

@@ -35,27 +35,27 @@ public interface IErpMesRbWoService {
 	/**
 	 * 同步临时数据
 	 */
-    void synTemporary();
+    void synTemporary(String yoCode);
 	/**
 	 * 同步烧结数据
 	 */
-	void synSinter();
+	void synSinter(String yoCode);
 	/**
 	 * 同步采购订单LOTTJ数据
 	 */
-	void synPurchaseLOTTJ();
+	void synPurchaseLOTTJ(String yoCode);
 	/**
 	 * 同步外协数据
 	 */
-    void synOutsourcing();
+    void synOutsourcing(String yoCode);
 	/**
 	 * 同步工艺数据
 	 */
-    void synCraft();
+    void synCraft(String yoCode);
 	/**
 	 * 同步配套数据
 	 */
-    void synSupportingFacilities();
+    void synSupportingFacilities(String yoCode);
 
 	/**
 	 * 根据工作订单号查询ERP需求日期

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

@@ -21,7 +21,7 @@ public interface IErpMesRbWxpromotionService {
 	 * @param newlevdateMax
 	 * @return
 	 */
-	List<MesRbWxpromotion> getMesRbWxpromotionList(String newlevdateMax);
+	List<MesRbWxpromotion> getMesRbWxpromotionList(String newlevdateMax,String yoCode);
 	/**
 	 * 获取最新时间
 	 *

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

@@ -35,8 +35,8 @@ public class ErpMesRbPacturnrecordServiceImpl implements IErpMesRbPacturnrecordS
 	 * @return
 	 */
 	@Override
-	public List<MesRbPacturnrecord> getMesRbPacturnrecordList(String newlevdateMax) {
-		return mesRbPacturnrecordMapper.getMesRbPacturnrecordList(newlevdateMax);
+	public List<MesRbPacturnrecord> getMesRbPacturnrecordList(String newlevdateMax,String yoCode) {
+		return mesRbPacturnrecordMapper.getMesRbPacturnrecordList(newlevdateMax,yoCode);
 	}
 
 	@Override

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

@@ -39,7 +39,7 @@ public class ErpMesRbPkServiceImpl implements IErpMesRbPkService {
 	}
 
 	@Override
-	public List<MesRbPk> getMesRbPkList(String dateMax) {
-		return mesRbPkMapper.getMesRbPkList(dateMax);
+	public List<MesRbPk> getMesRbPkList(String dateMax,String yoCode) {
+		return mesRbPkMapper.getMesRbPkList(dateMax,yoCode);
 	}
 }

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

@@ -35,8 +35,8 @@ public class ErpMesRbSjsoServiceImpl implements IErpMesRbSjsoService {
 	 * @return
 	 */
 	@Override
-	public List<MesRbSjso> getMesRbSjsoList(String newlevdateMax) {
-		return mesRbSjsoMapper.getMesRbSjsoList(newlevdateMax);
+	public List<MesRbSjso> getMesRbSjsoList(String newlevdateMax,String yoCode) {
+		return mesRbSjsoMapper.getMesRbSjsoList(newlevdateMax,yoCode);
 	}
 
 	@Override

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

@@ -33,7 +33,7 @@ public class ErpMesRbSodelrecwxServiceImpl implements IErpMesRbSodelrecwxService
 	}
 
 	@Override
-	public List<MesRbSodelrecwx> getMesRbSodelrecwxList(String dateMax) {
-		return mesRbSodelrecwxMapper.getMesRbSodelrecwxList(dateMax);
+	public List<MesRbSodelrecwx> getMesRbSodelrecwxList(String dateMax,String yoCode) {
+		return mesRbSodelrecwxMapper.getMesRbSodelrecwxList(dateMax,yoCode);
 	}
 }

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

@@ -36,7 +36,7 @@ public class ErpMesRbSodelreczgServiceImpl implements IErpMesRbSodelreczgService
 	}
 
 	@Override
-	public List<MesRbSodelreczg> getMesRbSodelreczgList(String dateMax) {
-		return mesRbSodelreczgMapper.getMesRbSodelreczgList(dateMax);
+	public List<MesRbSodelreczg> getMesRbSodelreczgList(String dateMax,String yoCode) {
+		return mesRbSodelreczgMapper.getMesRbSodelreczgList(dateMax,yoCode);
 	}
 }

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

@@ -343,17 +343,23 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void synTemporary() {
+	public void synTemporary(String yoCode) {
+		List<MesRbPacturnrecord> pacturnrecordList = null;
+		if(StringUtils.isNotEmpty(yoCode)){
+			pacturnrecordList=mesRbPacturnrecordService.getMesRbPacturnrecordList(null,yoCode);
+		}else {
 			//用字典的code查更新日期
 			String selectTime=apsOrderClient.getSelectTime("SYCN_PACTURNRECORD_TIME");
 			//从ERP视图查询最大日期
-//		String newlevdateMax=mesRbPacturnrecordService.getNewlevdateMax(selectTime);
-//		apsOrderClient.upByDateMax(newlevdateMax, "SYCN_PACTURNRECORD_TIME");
-		List<MesRbPacturnrecord> pacturnrecordList=mesRbPacturnrecordService.getMesRbPacturnrecordList(selectTime);
+			//String newlevdateMax=mesRbPacturnrecordService.getNewlevdateMax(selectTime);
+			//apsOrderClient.upByDateMax(newlevdateMax, "SYCN_PACTURNRECORD_TIME");
+			pacturnrecordList=mesRbPacturnrecordService.getMesRbPacturnrecordList(selectTime,null);
 			if(!CollectionUtils.isEmpty(pacturnrecordList)){
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				apsOrderClient.upByDateMax(sdf.format(pacturnrecordList.get(0).getCdate()), "SYCN_PACTURNRECORD_TIME");
 			}
+		}
+
 		Gson gson = new Gson();
 		String jsonString = gson.toJson(pacturnrecordList);
 		log.info("qyl:同步临时工单 data: {}", jsonString);
@@ -419,16 +425,21 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void synSinter() {
+	public void synSinter(String yoCode) {
+		List<MesRbSjso> rbtosoList = null;
+		if(StringUtils.isNotEmpty(yoCode)){
+			rbtosoList=mesRbSjsoService.getMesRbSjsoList(null,yoCode);
+		}else {
 			//用字典的code查更新日期
 			String selectTime=apsOrderClient.getSelectTime("SYCN_TRANSFERSJ_TIME");
 			//从ERP视图查询最大日期
-//		String newlevdateMax=mesRbSjsoService.getNewlevdateMax(selectTime);
-//		apsOrderClient.upByDateMax(newlevdateMax, "SYCN_TRANSFERSJ_TIME");
-		List<MesRbSjso> rbtosoList=mesRbSjsoService.getMesRbSjsoList(selectTime);
+			rbtosoList=mesRbSjsoService.getMesRbSjsoList(selectTime,null);
 			if(!CollectionUtils.isEmpty(rbtosoList)){
 				apsOrderClient.upByDateMax(DateFormatUtils.format(rbtosoList.get(0).getNewlevdate(),"yyyy-MM-dd HH:mm:ss"), "SYCN_TRANSFERSJ_TIME");
 			}
+		}
+
+
 		Gson gson = new Gson();
 		String jsonString = gson.toJson(rbtosoList);
 		log.info("qyl:同步烧结数据 data: {}", jsonString);
@@ -488,16 +499,20 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void synPurchaseLOTTJ() {
+	public void synPurchaseLOTTJ(String yoCode) {
+		List<MesRbWxpromotion> wxpromotionList=  null;
+		if(StringUtils.isNotEmpty(yoCode)){
+			wxpromotionList=mesRbWxpromotionService.getMesRbWxpromotionList(null,yoCode);
+		}else {
 			//用字典的code查更新日期
 			String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME");
 			//从ERP视图查询最大日期
-//		String dateMax=mesRbWxpromotionService.getNewlevdateMax(selectTime);
-//		apsOrderClient.upByDateMax(dateMax,"SYCN_BUYTRANSFER_TIME");
-		List<MesRbWxpromotion> wxpromotionList=mesRbWxpromotionService.getMesRbWxpromotionList(selectTime);
+			wxpromotionList=mesRbWxpromotionService.getMesRbWxpromotionList(selectTime,null);
 			if(!CollectionUtils.isEmpty(wxpromotionList)){
 				apsOrderClient.upByDateMax(DateFormatUtils.format(wxpromotionList.get(0).getNewlevdate(),"yyyy-MM-dd HH:mm:ss"),"SYCN_BUYTRANSFER_TIME");
 			}
+		}
+
 		Gson gson = new Gson();
 		String jsonString = gson.toJson(wxpromotionList);
 		log.info("qyl:同步采购LOTTJ data: {}", jsonString);
@@ -571,16 +586,21 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void synOutsourcing() {
+	public void synOutsourcing(String yoCode) {
+		List<MesRbSodelrecwx> mesRbSodelrecwxList=  null;
+		if(StringUtils.isNotEmpty(yoCode)){
+			mesRbSodelrecwxList=erpMesRbSodelrecwxService.getMesRbSodelrecwxList(null,yoCode);
+		}else {
 			//用字典的code查更新日期
 			String selectTime=apsOrderClient.getSelectTime("SYCN_TRANSFERWX_TIME");
 			//从ERP视图查询最大日期
-//		String dateMax=erpMesRbSodelrecwxService.getNewlevdateMax(selectTime);
-//		apsOrderClient.upByDateMax(dateMax,"SYCN_TRANSFERWX_TIME");
-		List<MesRbSodelrecwx> mesRbSodelrecwxList=erpMesRbSodelrecwxService.getMesRbSodelrecwxList(selectTime);
+			mesRbSodelrecwxList=erpMesRbSodelrecwxService.getMesRbSodelrecwxList(selectTime,null);
 			if(!CollectionUtils.isEmpty(mesRbSodelrecwxList)){
 				apsOrderClient.upByDateMax(DateFormatUtils.format(mesRbSodelrecwxList.get(0).getNewlevdate(),"yyyy-MM-dd HH:mm:ss"),"SYCN_TRANSFERWX_TIME");
 			}
+		}
+
+
 		Gson gson = new Gson();
 		String jsonString = gson.toJson(mesRbSodelrecwxList);
 		log.info("qyl:同步外协工单 data: {}", jsonString);
@@ -649,17 +669,19 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void synCraft() {
+	public void synCraft(String yoCode) {
+		List<MesRbSodelreczg> mesRbSodelreczgList=  null;
+		if(StringUtils.isNotEmpty(yoCode)){
+			mesRbSodelreczgList=erpMesRbSodelreczgService.getMesRbSodelreczgList(null,yoCode);
+		}else {
 			//用字典的code查更新日期
 			String selectTime=apsOrderClient.getSelectTime("SYCN_TRANSFERZG_TIME1");
 			//从ERP视图查询最大日期
-//		String dateMax=erpMesRbSodelreczgService.getNewlevdateMax(selectTime);
-//		//更新配置表的基准时间
-//		apsOrderClient.upByDateMax(dateMax,"SYCN_TRANSFERZG_TIME1");
-		List<MesRbSodelreczg> mesRbSodelreczgList=erpMesRbSodelreczgService.getMesRbSodelreczgList(selectTime);
+			mesRbSodelreczgList=erpMesRbSodelreczgService.getMesRbSodelreczgList(selectTime,null);
 			if(!CollectionUtils.isEmpty(mesRbSodelreczgList)){
 				apsOrderClient.upByDateMax(DateFormatUtils.format(mesRbSodelreczgList.get(0).getNewlevdate(),"yyyy-MM-dd HH:mm:ss"),"SYCN_TRANSFERZG_TIME1");
 			}
+		}
 		Gson gson = new Gson();
 		String jsonString = gson.toJson(mesRbSodelreczgList);
 		log.info("qyl:同步工艺工单 data: {}", jsonString);
@@ -736,16 +758,20 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void synSupportingFacilities() {
+	public void synSupportingFacilities(String yoCode) {
+		List<MesRbPk> mesRbPkList=  null;
+		if(StringUtils.isNotEmpty(yoCode)){
+			mesRbPkList=erpMesRbPkService.getMesRbPkList(null,yoCode);
+		}else {
 			//用字典的code查更新日期
 			String selectTime=apsOrderClient.getSelectTime("SYCN_TRANSFERPK_TIME");
 			//从ERP视图查询最大日期
-//		String dateMax=erpMesRbPkService.getNewlevdateMax(selectTime);
-//		apsOrderClient.upByDateMax(dateMax,"SYCN_TRANSFERPK_TIME");
-		List<MesRbPk> mesRbPkList=erpMesRbPkService.getMesRbPkList(selectTime);
+			mesRbPkList=erpMesRbPkService.getMesRbPkList(selectTime,null);
 			if(!CollectionUtils.isEmpty(mesRbPkList)){
 				apsOrderClient.upByDateMax(DateFormatUtils.format(mesRbPkList.get(0).getNewlevdate(),"yyyy-MM-dd HH:mm:ss"),"SYCN_TRANSFERPK_TIME");
 			}
+		}
+
 		Gson gson = new Gson();
 		String jsonString = gson.toJson(mesRbPkList);
 		log.info("qyl:同步配套工单 data: {}", jsonString);

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

@@ -35,8 +35,8 @@ public class ErpMesRbWxpromotionServiceImpl implements IErpMesRbWxpromotionServi
 	 * @return
 	 */
 	@Override
-	public List<MesRbWxpromotion> getMesRbWxpromotionList(String newlevdateMax) {
-		return mesRbWxpromotionMapper.getMesRbWxpromotionList(newlevdateMax);
+	public List<MesRbWxpromotion> getMesRbWxpromotionList(String newlevdateMax,String yoCode) {
+		return mesRbWxpromotionMapper.getMesRbWxpromotionList(newlevdateMax,yoCode);
 	}
 
 	@Override