查询玻璃饼订单-sjx

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java

@@ -1,6 +1,9 @@
 package org.springblade.scheduling.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,6 +26,8 @@ public interface IWorkOrderClient {
     String SCHEDULING = API_PREFIX + "/scheduling";
     String INIT_RESOURCE = API_PREFIX + "/initResource";
 
+    String GLASS_CAKE_ORDER = API_PREFIX + "/glassCakeOrderPage";
+
     /**
      * 排产
      *
@@ -32,4 +37,7 @@ public interface IWorkOrderClient {
 
     @GetMapping(INIT_RESOURCE)
     R<Void> initResource();
+
+    @GetMapping(GLASS_CAKE_ORDER)
+    R<IPage<WorkOrderVO>> selectGlassCakeOrderPage(WorkOrderVO WorkOrder, Query query);
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java

@@ -25,7 +25,10 @@
  */
 package org.springblade.scheduling.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springframework.stereotype.Component;
 
 /**
@@ -45,4 +48,9 @@ public class IWorkOrderClientFallback implements IWorkOrderClient {
 	public R<Void> initResource() {
 		return R.fail("初始化资源失败");
 	}
+
+	@Override
+	public R<IPage<WorkOrderVO>> selectGlassCakeOrderPage(WorkOrderVO WorkOrder, Query query) {
+		return R.fail("获取玻璃饼订单失败");
+	}
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/vo/WorkOrderVO.java

@@ -23,7 +23,7 @@
  * <p>
  * Author: Chill Zhuang (bladejava@qq.com)
  */
-package org.springblade.scheduling.scheduling.vo;
+package org.springblade.scheduling.pojo.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -45,6 +45,13 @@ public class WorkOrderVO extends WorkOrderEntity {
 
 	private String type;
 
+	private String partName;
+
+	private String isPrint;
+
+	private String powderWeight;
+
+
 
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java

@@ -109,7 +109,7 @@ public class LiquidTankTaskSetVoService {
         // 领药人
         if (IdUtil.isValid(vo.getReceiveDrugUserId())) {
             UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData();
-            if (receiveUI != null) {
+            if (receiveUI != null && receiveUI.getUser() != null) {
                 vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
             }
         }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java

@@ -36,7 +36,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @author Chill
  */
 @BladeCloudApplication
-@EnableScheduling
 public class SchedulingApplication {
 
 	public static void main(String[] args) {

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java

@@ -48,7 +48,7 @@ import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.scheduling.scheduling.dto.WorkOrderDto;
 import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel;
-import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
 import org.springblade.scheduling.scheduling.service.IWorkOrderService;
 import org.springblade.scheduling.scheduling.wrapper.WorkOrderWrapper;
@@ -79,8 +79,8 @@ public class WorkOrderController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@Operation(summary = "详情", description  = "传入WorkOrder")
-	public R<WorkOrderVO> detail(WorkOrderEntity WorkOrder) {
+	public R<WorkOrderVO> detail(WorkOrderEntity workOrder) {
-		WorkOrderEntity detail = workOrderService.getOne(Condition.getQueryWrapper(WorkOrder));
+		WorkOrderEntity detail = workOrderService.getOne(Condition.getQueryWrapper(workOrder));
 		return R.data(WorkOrderWrapper.build().entityVO(detail));
 	}
 	/**
@@ -89,8 +89,8 @@ public class WorkOrderController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@Operation(summary = "分页", description  = "传入WorkOrder")
-	public R<IPage<WorkOrderVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> WorkOrder, Query query) {
+	public R<IPage<WorkOrderVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> workOrder, Query query) {
-		IPage<WorkOrderEntity> pages = workOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(WorkOrder, WorkOrderEntity.class));
+		IPage<WorkOrderEntity> pages = workOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(workOrder, WorkOrderEntity.class));
 		return R.data(WorkOrderWrapper.build().pageVO(pages));
 	}
 
@@ -100,8 +100,8 @@ public class WorkOrderController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@Operation(summary = "分页", description  = "传入WorkOrder")
-	public R<IPage<WorkOrderVO>> page(WorkOrderVO WorkOrder, Query query) {
+	public R<IPage<WorkOrderVO>> page(WorkOrderVO workOrder, Query query) {
-		IPage<WorkOrderVO> pages = workOrderService.selectWorkOrderPage(Condition.getPage(query), WorkOrder);
+		IPage<WorkOrderVO> pages = workOrderService.selectWorkOrderPage(Condition.getPage(query), workOrder);
 		return R.data(pages);
 	}
 
@@ -111,8 +111,8 @@ public class WorkOrderController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入WorkOrder")
-	public R save(@Valid @RequestBody WorkOrderEntity WorkOrder) {
+	public R save(@Valid @RequestBody WorkOrderEntity workOrder) {
-		return R.status(workOrderService.save(WorkOrder));
+		return R.status(workOrderService.save(workOrder));
 	}
 
 	/**
@@ -121,8 +121,8 @@ public class WorkOrderController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入WorkOrder")
-	public R update(@Valid @RequestBody WorkOrderEntity WorkOrder) {
+	public R update(@Valid @RequestBody WorkOrderEntity workOrder) {
-		return R.status(workOrderService.updateById(WorkOrder));
+		return R.status(workOrderService.updateById(workOrder));
 	}
 
 	/**
@@ -131,8 +131,8 @@ public class WorkOrderController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@Operation(summary = "新增或修改", description  = "传入WorkOrder")
-	public R submit(@Valid @RequestBody WorkOrderEntity WorkOrder) {
+	public R submit(@Valid @RequestBody WorkOrderEntity workOrder) {
-		return R.status(workOrderService.saveOrUpdate(WorkOrder));
+		return R.status(workOrderService.saveOrUpdate(workOrder));
 	}
 
 	/**
@@ -153,8 +153,8 @@ public class WorkOrderController extends BladeController {
 	@GetMapping("/export")
 	@ApiOperationSupport(order = 9)
 	@Operation(summary = "导出数据", description  = "传入WorkOrder")
-	public void exportWorkOrder(@Parameter(hidden = true) @RequestParam Map<String, Object> WorkOrder, BladeUser bladeUser, HttpServletResponse response) {
+	public void exportWorkOrder(@Parameter(hidden = true) @RequestParam Map<String, Object> workOrder, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<WorkOrderEntity> queryWrapper = Condition.getQueryWrapper(WorkOrder, WorkOrderEntity.class);
+		QueryWrapper<WorkOrderEntity> queryWrapper = Condition.getQueryWrapper(workOrder, WorkOrderEntity.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(WorkOrder::getTenantId, bladeUser.getTenantId());
 		//}

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java

@@ -26,14 +26,18 @@
 package org.springblade.scheduling.scheduling.feign;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.scheduling.feign.IWorkOrderClient;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springblade.scheduling.scheduling.service.IEquipResourceService;
 import org.springblade.scheduling.scheduling.service.IPersonResourceService;
 import org.springblade.scheduling.scheduling.service.IWorkOrderService;
@@ -77,4 +81,9 @@ public class WorkOrderClient implements IWorkOrderClient {
 		log.info("初始化资源结束：" + DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
 		return R.success();
 	}
+
+	@Override
+	public R<IPage<WorkOrderVO>> selectGlassCakeOrderPage(WorkOrderVO workOrder, Query query) {
+		return R.data(workOrderService.selectGlassCakeOrderPage(Condition.getPage(query), workOrder));
+	}
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java

@@ -33,7 +33,7 @@ import org.springblade.scheduling.scheduling.dto.WorkOrderDto;
 import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel;
 import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
-import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 
 import java.util.List;
 
@@ -78,4 +78,7 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrderEntity> {
 
 	List<String> selectTeamMember(@Param("teamId") Long teamId,@Param("certificateId") Long certificateId);
 
+
+	List<WorkOrderVO> selectGlassCakeOrderPage(IPage page, WorkOrderVO workOrder);
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml

@@ -299,4 +299,22 @@
           AND ct.id = #{certificateId}
     </select>
 
+    <select id="selectGlassCakeOrderPage" resultType="org.springblade.scheduling.pojo.vo.WorkOrderVO">
+        SELECT
+            a.WO_CODE as "woCode",
+            a.part_code as "partCode",
+            c.part_name as "partName",
+            b.batch_no as "batchNo",
+            b.card_no as "cardNo",
+            a.make_qty as "makeQty",
+            c.is_print as "isPrint",
+            c.POWDER_WEIGHT as "powderWeight"
+        FROM
+            MES_WORK_ORDER a
+                LEFT JOIN MES_YIELD_ORDER b ON a.YO_ID = b.ID
+                LEFT JOIN DS_PART c ON a.part_code = c.part_code
+        WHERE
+            b.YIELD_TYPE = 12003
+    </select>
+
 </mapper>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IWorkOrderService.java

@@ -32,7 +32,7 @@ import org.springblade.scheduling.scheduling.dto.WorkOrderDto;
 import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
 import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel;
 import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
-import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 
 import java.util.List;
 
@@ -50,7 +50,7 @@ public interface IWorkOrderService extends BaseService<WorkOrderEntity> {
 	 * @param WorkOrder 查询参数
 	 * @return IPage<WorkOrderVO>
 	 */
-	IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderVO WorkOrder);
+	IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderVO workOrder);
 
 
 	/**
@@ -95,4 +95,6 @@ public interface IWorkOrderService extends BaseService<WorkOrderEntity> {
 	 * @param userId
 	 */
 	void receiveDispatcherFromOldMes(Long id, Long userId);
+
+	IPage<WorkOrderVO> selectGlassCakeOrderPage(IPage<WorkOrderVO> page, WorkOrderVO workOrder);
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -46,7 +46,7 @@ import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
 import org.springblade.scheduling.scheduling.mapper.WorkOrderMapper;
 import org.springblade.scheduling.scheduling.service.*;
 import org.springblade.scheduling.scheduling.vo.SameTroughVO;
-import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -1303,7 +1303,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public Map<String,Object> sameFurnace(YieldOrderEntity order,YieldOrderCraftEntity craft,List<WorkPlanEntity> workPlanList,LocalDateTime prevProcessEnd,String glassCodeStr,Map<Long, List<SintTempCurveEntity>> sintMap){
         Map<String,Object> map = new HashMap<>();
         Boolean isSameFurnace = false;
-        if(order.getYieldType() == 2 || order.getYieldType() == 3){//烧结订单
+        if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_2.getCode() || order.getYieldType() == YieldOrderEnum.YIELD_TYPE_3.getCode()){//烧结订单
             //获取当前工序的所有温度曲线
             List<SintTempCurveEntity> sintList = sintMap.get(craft.getPpsId());
             List<List<String>> sintMaterialList = new ArrayList<>();
@@ -1384,4 +1384,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         return map;
     }
 
+    @Override
+    public IPage<WorkOrderVO> selectGlassCakeOrderPage(IPage<WorkOrderVO> page, WorkOrderVO workOrder) {
+        return page.setRecords(baseMapper.selectGlassCakeOrderPage(page, workOrder));
+    }
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/WorkOrderWrapper.java

@@ -28,7 +28,7 @@ package org.springblade.scheduling.scheduling.wrapper;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.scheduling.pojo.entity.WorkOrderEntity;
-import org.springblade.scheduling.scheduling.vo.WorkOrderVO;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 
 import java.util.Objects;