JiuMuMES.git - Gitblit

			@@ -2,19 +2,15 @@

			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.md.entity.EdgeGrindingLog;
			import com.mes.md.entity.KBBTJPDrawingBP;
			import com.mes.md.entity.PrimitiveTask;
			import com.mes.md.entity.Tasking;
			import com.mes.md.mapper.EdgeGrindingLogMapper;
			import com.mes.md.mapper.KBBTJPDrawingBPMapper;
			import com.mes.md.mapper.PrimitiveTaskMapper;
			import com.mes.md.service.EdgeGrindingLogService;
			import com.mes.md.service.KBBTJPDrawingBPService;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			@@ -99,6 +95,7 @@
			primitiveTask.setSilkScreenY(kBBTJPDrawingBP.getSilkScreenY()==null?0:kBBTJPDrawingBP.getSilkScreenY());
			primitiveTask.setTaskSequence(kBBTJPDrawingBP.getTaskSequence());
			primitiveTask.setTaskQuantity(kBBTJPDrawingBP.getTaskQuantity());
			primitiveTask.setJPZX(kBBTJPDrawingBP.getJPZX());
			primitiveTask.setR_1_1(kBBTJPDrawingBP.getR_1_1()==null?0:kBBTJPDrawingBP.getR_1_1());
			primitiveTask.setR_1_2(kBBTJPDrawingBP.getR_1_2()==null?0:kBBTJPDrawingBP.getR_1_2());
			primitiveTask.setR_2_1(kBBTJPDrawingBP.getR_2_1()==null?0:kBBTJPDrawingBP.getR_2_1());
			@@ -138,6 +135,7 @@
			tasking.setSilkScreenY(kBBTJPDrawingBP.getSilkScreenY()==null?0:kBBTJPDrawingBP.getSilkScreenY());
			tasking.setTaskSequence(kBBTJPDrawingBP.getTaskSequence());
			tasking.setTaskQuantity(kBBTJPDrawingBP.getTaskQuantity());
			tasking.setJPZX(kBBTJPDrawingBP.getJPZX());
			tasking.setR_1_1(kBBTJPDrawingBP.getR_1_1()==null?0:kBBTJPDrawingBP.getR_1_1());
			tasking.setR_1_2(kBBTJPDrawingBP.getR_1_2()==null?0:kBBTJPDrawingBP.getR_1_2());
			tasking.setR_2_1(kBBTJPDrawingBP.getR_2_1()==null?0:kBBTJPDrawingBP.getR_2_1());