零件同步增加零件信息

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java

@@ -403,10 +403,11 @@ public class DsTaskingController extends BladeController {
 
 
 	@GetMapping("/syncPart")
-	public R syncPart(@RequestParam String StartTime,
+	public R syncPart(   @RequestParam(required = false)String StartTime,
-						 @RequestParam String endTime) {
+						 @RequestParam(required = false)String endTime,
+						 @RequestParam(required = false)String partCode) {
 
-		boolean b = dsTaskingService.syncPart(StartTime,endTime);
+		boolean b = dsTaskingService.syncPart(StartTime,endTime,partCode);
 		return R.data(b);
 	}
 

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

@@ -130,5 +130,7 @@ public interface DsTaskingMapper extends BaseMapper<DsTaskingEntity> {
 	 */
 	DsPartEntity getOldMesPartByPartCode(@Param("partCode") String partCode);
 
-	List<DsPartEntity> getOldMesAllPart(@Param("startTime") String startTime,@Param("endTime") String endTime);
+	List<DsPartEntity> getOldMesAllPart(@Param("startTime") String startTime,
+										@Param("endTime") String endTime,
+										@Param("partCode") String partCode);
 }

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

@@ -139,8 +139,15 @@
 
     <select id="getOldMesAllPart" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartEntity">
        SELECT * FROM P_RB_SYNC_PART
-        WHERE UPDATE_TIME BETWEEN to_date(#{startTime}, 'YYYY-MM-DD HH24:MI:SS')
+        WHERE 1=1
-            AND to_date(#{endTime}, 'YYYY-MM-DD HH24:MI:SS');
+       <if test="startTime != null and endTime != null">
+          AND UPDATE_TIME BETWEEN to_date(#{startTime}, 'YYYY-MM-DD HH24:MI:SS')
+              AND to_date(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')
+       </if>
+       <if test="partCode != null and partCode !=''">
+           AND part_code = #{partCode}
+       </if>
+
     </select>
 
 </mapper>

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

@@ -234,5 +234,5 @@ public interface IDsTaskingService extends BaseService<DsTaskingEntity> {
 	 * 同步零件
 	 * @return
 	 */
-	boolean syncPart(String startTime, String endTime);
+	boolean syncPart( String startTime, String endTime,String partCode);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -41,10 +41,8 @@ import org.springblade.desk.dashboard.pojo.vo.*;
 import org.springblade.desk.dashboard.excel.DsTaskingExcel;
 import org.springblade.desk.dashboard.mapper.DsTaskingMapper;
 import org.springblade.desk.dashboard.service.*;
-import org.springblade.desk.order.pojo.entity.MoldApply;
 import org.springblade.desk.order.pojo.entity.MoldDemand;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
-import org.springblade.desk.order.service.IMoldApplyService;
 import org.springblade.desk.order.service.IMoldDemandService;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.produce.service.IWorkOrderService;
@@ -1560,9 +1558,9 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	}
 
 	@Override
-	public boolean syncPart(String startTime, String endTime) {
+	public boolean syncPart(String startTime, String endTime,String partCode) {
 		//查询所有老mes零件
-		List<DsPartEntity> dsPartEntityList =  taskingMapper.getOldMesAllPart(startTime,endTime);
+		List<DsPartEntity> dsPartEntityList =  taskingMapper.getOldMesAllPart(startTime,endTime,partCode);
 		for (DsPartEntity partEntity : dsPartEntityList) {
 
 			// 2. 递归处理零件及其子件
@@ -1573,7 +1571,6 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 			}
 
 		}
-
 		return true;
 	}