计划管理增加排序

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -12,9 +12,9 @@ public interface LauncherConstant {
     /**
      * nacos 命名空间
      */
-//	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
+	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 //	 生产环境
-	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 //	 测试环境
 //	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldOrderDto.java

@@ -0,0 +1,36 @@
+package org.springblade.desk.order.pojo.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
+
+import java.io.Serial;
+
+/**
+ * 生产订单-视图类
+ *
+ * @author lqk
+ */
+@Data
+public class YieldOrderDto extends YieldOrder {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键ID
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long id;
+
+	/**
+     * 排序字段
+	 */
+	private String orderByField;
+	/**
+     *  true: 升序，false: 降序
+	 */
+	private boolean isAsc;
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/dto/YieldPlanDto.java

@@ -0,0 +1,35 @@
+package org.springblade.desk.order.pojo.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import org.springblade.desk.order.pojo.entity.YieldPlan;
+
+import java.io.Serial;
+
+/**
+ * 生产计划-视图类
+ *
+ * @author lqk
+ */
+@Data
+public class YieldPlanDto extends YieldPlan {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键ID
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long id;
+
+	/**
+	 * 排序字段
+	 */
+	private String orderByField;
+	/**
+	 *  true: 升序，false: 降序
+	 */
+	private boolean isAsc;
+
+}

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

@@ -36,7 +36,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart;
 import org.springblade.desk.basic.service.ICraftAbilityService;
+import org.springblade.desk.basic.service.ILocallyPlatedPartService;
 import org.springblade.desk.common.constant.BizTypeConstant;
 import org.springblade.desk.common.service.IMesNotifyMessageService;
 import org.springblade.desk.dashboard.constant.DsPartConstant;
@@ -166,6 +168,9 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	@Autowired
 	IMesNotifyMessageService mesNotifyMessageService;
 
+	@Autowired
+	ILocallyPlatedPartService locallyPlatedPartService;
+
 	@Override
 	public IPage<DsTaskingVO> selectAssignList(IPage<DsTaskingVO> page, DsTaskingVO dsTasking) {
 		List<DsTaskingVO> dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking);
@@ -787,6 +792,11 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 
 			dsPartSynthesisVO.setDsPartVOList(dsPartVOList);
 		}
+		//查询镀金标识
+		LocallyPlatedPart locallyPlatedPart = locallyPlatedPartService.selectLocallyPlatedPartByPartCode(partEntity.getPartCode());
+		if(null != locallyPlatedPart){
+			partEntity.setGoldMark("1");
+		}
 		dsPartSynthesisVO.setDsPartEntity(partEntity);
 
 		//查询零件版本号

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

@@ -16,6 +16,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.desk.order.pojo.dto.YieldOrderDto;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
@@ -24,6 +25,7 @@ import org.springblade.desk.order.service.IPlateGoodsRecordService;
 import org.springblade.desk.order.service.IYieldOrderCraftService;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.order.wrapper.YieldOrderWrapper;
+import org.springblade.desk.produce.pojo.dto.YieldOrderDTO;
 import org.springblade.scheduling.feign.IWorkOrderClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -65,7 +67,7 @@ public class YieldOrderController extends BladeController {
 		@Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int"))
 	})
 	@Operation(summary = "分页查询列表-电镀", description = "")
-	public R<IPage<YieldOrderVo>> pageElectroplate(@Parameter(hidden = true) YieldOrder entity, Query query) {
+	public R<IPage<YieldOrderVo>> pageElectroplate(@Parameter(hidden = true) YieldOrderDto entity, Query query) {
 		IPage<YieldOrder> page = yieldOrderService.selectPageElectroplate(Condition.getPage(query), entity);
 		return R.data(YieldOrderWrapper.build().pageVO(page));
 	}
@@ -85,7 +87,7 @@ public class YieldOrderController extends BladeController {
 			@Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int"))
 	})
 	@Operation(summary = "分页查询列表-烧结", description = "")
-	public R<IPage<YieldOrderVo>> pageSintering(@Parameter(hidden = true) YieldOrder entity, Query query) {
+	public R<IPage<YieldOrderVo>> pageSintering(@Parameter(hidden = true) YieldOrderDto entity, Query query) {
 		IPage<YieldOrder> page = yieldOrderService.selectPageSintering(Condition.getPage(query), entity);
 		return R.data(YieldOrderWrapper.build().pageVO(page));
 	}
@@ -101,7 +103,7 @@ public class YieldOrderController extends BladeController {
 					in = ParameterIn.QUERY, schema = @Schema(type = "string"))
 	})
 	@Operation(summary = "分页-异常订单", description = "")
-	public R<IPage<YieldOrderVo>> pageException(@Parameter(hidden = true) YieldOrder entity, Query query) {
+	public R<IPage<YieldOrderVo>> pageException(@Parameter(hidden = true) YieldOrderDto entity, Query query) {
 		IPage<YieldOrder> page = Condition.getPage(query);
 		page.setRecords(new ArrayList<>());
 

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

@@ -15,6 +15,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.order.pojo.dto.YieldPlanDto;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
 import org.springblade.desk.order.pojo.vo.YieldPlanVo;
@@ -51,7 +52,7 @@ public class YieldPlanController extends BladeController {
 		@Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int"))
 	})
 	@Operation(summary = "分页查询列表-电镀", description = "")
-	public R<IPage<YieldPlanVo>> pageElectroplate(@Parameter(hidden = true) YieldPlan entity, Query query) {
+	public R<IPage<YieldPlanVo>> pageElectroplate(@Parameter(hidden = true) YieldPlanDto entity, Query query) {
 		IPage<YieldPlan> page = yieldPlanService.selectPageElectroplate(Condition.getPage(query), entity);
 		return R.data(YieldPlanWrapper.build().pageVO(page));
 	}
@@ -66,7 +67,7 @@ public class YieldPlanController extends BladeController {
 		@Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int"))
 	})
 	@Operation(summary = "分页查询列表-烧结", description = "")
-	public R<IPage<YieldPlanVo>> pageSintering(@Parameter(hidden = true) YieldPlan entity, Query query) {
+	public R<IPage<YieldPlanVo>> pageSintering(@Parameter(hidden = true) YieldPlanDto entity, Query query) {
 		IPage<YieldPlan> page = yieldPlanService.selectPageSintering(Condition.getPage(query), entity);
 		return R.data(YieldPlanWrapper.build().pageVO(page));
 	}

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

@@ -2,8 +2,11 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.order.pojo.dto.YieldOrderDto;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
+import org.springblade.desk.order.pojo.vo.YieldOrderVo;
 
 import java.util.List;
 
@@ -23,7 +26,7 @@ public interface YieldOrderMapper extends BaseMapper<YieldOrder> {
 	 * @param yieldTypeList
 	 * @return
 	 */
-	List<YieldOrder> selectPage(IPage page, YieldOrder entity, List<YieldOrderEnum> yieldTypeList);
+	List<YieldOrder> selectPage(IPage page, @Param("entity") YieldOrderDto entity, List<YieldOrderEnum> yieldTypeList);
 
 	/**
 	 * 自定义分页 - 用于需求申报

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

@@ -67,7 +67,17 @@
         <if test = "entity.releaseDateEnd != null and entity.releaseDateEnd != ''">
             AND release_date <![CDATA[ <= ]]> to_date(concat(#{entity.releaseDateEnd},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')
         </if>
-		order by CREATE_TIME desc
+
+        <choose>
+            <when test="entity.orderByField != null and entity.orderByField != ''">
+                ORDER BY ${entity.orderByField}
+                <if test="entity.isAsc">ASC</if>
+                <if test="!entity.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME DESC
+            </otherwise>
+        </choose>
     </select>
 
     <select id = "pageMaterialApply" resultType = "org.springblade.desk.order.pojo.entity.YieldOrder">

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

@@ -2,6 +2,8 @@ package org.springblade.desk.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.order.pojo.dto.YieldPlanDto;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
 import org.springblade.desk.order.pojo.vo.LineMemoVo;
@@ -24,7 +26,7 @@ public interface YieldPlanMapper extends BaseMapper<YieldPlan> {
 	 * @param planTypeList
 	 * @return
 	 */
-	List<YieldPlan> selectPage(IPage page, YieldPlan entity, List<YieldPlanEnum> planTypeList);
+	List<YieldPlan> selectPage(IPage page, @Param("entity") YieldPlanDto entity, List<YieldPlanEnum> planTypeList);
 
 	/**
 	 * 获取最大优先级

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

@@ -26,7 +26,16 @@
         <if test = "entity.status != null and entity.status != ''">
             AND status = #{entity.status}
         </if>
-        ORDER BY RELEASE_DATE DESC
+        <choose>
+            <when test="entity.orderByField != null and entity.orderByField != ''">
+                ORDER BY ${entity.orderByField}
+                <if test="entity.isAsc">ASC</if>
+                <if test="!entity.isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME DESC
+            </otherwise>
+        </choose>
     </select>
     <select id="getMaxPriority" resultType="java.lang.Long">
         select nvl(max(a.priority),1) as vPriority

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

@@ -7,9 +7,11 @@ import org.springblade.common.exception.BusinessException;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
+import org.springblade.desk.order.pojo.dto.YieldOrderDto;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
+import org.springblade.desk.order.pojo.vo.YieldOrderVo;
 
 import java.util.List;
 
@@ -27,7 +29,7 @@ public interface IYieldOrderService extends BaseService<YieldOrder> {
 	 * @param entity
 	 * @return
 	 */
-	IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrder entity);
+	IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrderDto entity);
 
 	/**
 	 * 自定义分页
@@ -36,7 +38,7 @@ public interface IYieldOrderService extends BaseService<YieldOrder> {
 	 * @param entity
 	 * @return
 	 */
-	IPage<YieldOrder> selectPageElectroplate(IPage<YieldOrder> page, YieldOrder entity);
+	IPage<YieldOrder> selectPageElectroplate(IPage<YieldOrder> page, YieldOrderDto entity);
 
 	/**
 	 * 自定义分页
@@ -45,7 +47,7 @@ public interface IYieldOrderService extends BaseService<YieldOrder> {
 	 * @param entity
 	 * @return
 	 */
-	IPage<YieldOrder> selectPageSintering(IPage<YieldOrder> page, YieldOrder entity);
+	IPage<YieldOrder> selectPageSintering(IPage<YieldOrder> page, YieldOrderDto entity);
 
 	/**
 	 * 自定义分页 - 物料申请

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

@@ -3,6 +3,7 @@ package org.springblade.desk.order.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.desk.order.pojo.dto.YieldPlanDto;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 
 import java.util.List;
@@ -21,7 +22,7 @@ public interface IYieldPlanService extends BaseService<YieldPlan> {
 	 * @param entity
 	 * @return
 	 */
-	IPage<YieldPlan> selectPageElectroplate(IPage<YieldPlan> page, YieldPlan entity);
+	IPage<YieldPlan> selectPageElectroplate(IPage<YieldPlan> page, YieldPlanDto entity);
 
 	/**
 	 * 自定义分页
@@ -30,7 +31,7 @@ public interface IYieldPlanService extends BaseService<YieldPlan> {
 	 * @param entity
 	 * @return
 	 */
-	IPage<YieldPlan> selectPageSintering(IPage<YieldPlan> page, YieldPlan entity);
+	IPage<YieldPlan> selectPageSintering(IPage<YieldPlan> page, YieldPlanDto entity);
 
 	/**
 	 * 根据编码查询生产计划

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

@@ -38,6 +38,7 @@ import org.springblade.desk.order.constant.YieldOrderConst;
 import org.springblade.desk.order.mapper.MoldDemandMapper;
 import org.springblade.desk.order.mapper.YieldOrderMapper;
 import org.springblade.desk.order.mapper.YieldPlanMapper;
+import org.springblade.desk.order.pojo.dto.YieldOrderDto;
 import org.springblade.desk.order.pojo.entity.MoldDemand;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
@@ -45,6 +46,7 @@ import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.pojo.enums.MoldDemandEnum;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
 import org.springblade.desk.order.pojo.vo.LineMemoVo;
+import org.springblade.desk.order.pojo.vo.YieldOrderVo;
 import org.springblade.desk.order.service.IPlateGoodsRecordService;
 import org.springblade.desk.order.service.IYieldOrderCraftService;
 import org.springblade.desk.order.service.IYieldOrderService;
@@ -133,13 +135,13 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	private String addrPushSyncResult;
 
 	@Override
-	public IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrder entity) {
+	public IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrderDto entity) {
 		List<YieldOrder> dataList = baseMapper.selectPage(page, entity, null);
 		return page.setRecords(dataList);
 	}
 
 	@Override
-	public IPage<YieldOrder> selectPageElectroplate(IPage<YieldOrder> page, YieldOrder entity) {
+	public IPage<YieldOrder> selectPageElectroplate(IPage<YieldOrder> page, YieldOrderDto entity) {
 		List<YieldOrderEnum> yieldTypeList = new ArrayList<>();
 		yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_1);
 		List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList);
@@ -147,7 +149,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	}
 
 	@Override
-	public IPage<YieldOrder> selectPageSintering(IPage<YieldOrder> page, YieldOrder entity) {
+	public IPage<YieldOrder> selectPageSintering(IPage<YieldOrder> page, YieldOrderDto entity) {
 		List<YieldOrderEnum> yieldTypeList = new ArrayList<>();
 		if (ObjectUtil.isEmpty(entity.getYieldType())) {
 			yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_2);

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

@@ -17,6 +17,7 @@ import org.springblade.desk.dashboard.constant.DsPartConstant;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
 import org.springblade.desk.dashboard.service.IDsPartService;
 import org.springblade.desk.order.mapper.YieldPlanMapper;
+import org.springblade.desk.order.pojo.dto.YieldPlanDto;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
@@ -55,7 +56,7 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
 	private final StRealtimeStockClient stRealtimeStockClient;
 
 	@Override
-	public IPage<YieldPlan> selectPageElectroplate(IPage<YieldPlan> page, YieldPlan entity) {
+	public IPage<YieldPlan> selectPageElectroplate(IPage<YieldPlan> page, YieldPlanDto entity) {
 		List<YieldPlanEnum> planTypeList = new ArrayList<>();
 		planTypeList.add(YieldPlanEnum.PLAN_TYPE_1);
 		List<YieldPlan> dataList = baseMapper.selectPage(page, entity, planTypeList);
@@ -63,7 +64,7 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
 	}
 
 	@Override
-	public IPage<YieldPlan> selectPageSintering(IPage<YieldPlan> page, YieldPlan entity) {
+	public IPage<YieldPlan> selectPageSintering(IPage<YieldPlan> page, YieldPlanDto entity) {
 		List<YieldPlanEnum> planTypeList = new ArrayList<>();
 		planTypeList.add(YieldPlanEnum.PLAN_TYPE_2);
 		planTypeList.add(YieldPlanEnum.PLAN_TYPE_3);

blade-service/blade-desk/src/main/resources/application-dev.yml

@@ -70,3 +70,7 @@ request:
     url: "http://192.168.169.69"
 logging:
     config: classpath:logback.xml
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl