订单模块修改

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

@@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -44,9 +43,8 @@ public class AssayContentController extends BladeController {
 	 */
 	@GetMapping("/page")
 	@Parameters({
-		@Parameter(name = "wcId", description = "作业中心", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+			@Parameter(name = "wcId", description = "作业中心", in = ParameterIn.QUERY),
-		@Parameter(name = "status", description = "状态(10000:未使用;10001:已使用;10002:已过期)", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
+			@Parameter(name = "status", description = "状态(10000:未使用;10001:已使用;10002:已过期)", in = ParameterIn.QUERY)})
-	})
 	@Operation(summary = "分页", description = "")
 	public R<IPage<AssayContentVo>> page(@Parameter(hidden = true) AssayContent entity, Query query) {
 		IPage<AssayContent> page = assayContentService.selectPage(Condition.getPage(query), entity);
@@ -110,7 +108,7 @@ public class AssayContentController extends BladeController {
 	 */
 	@GetMapping("/detailListNoUsed")
 	@Operation(summary = "未使用的化验含量明细列表", description = "")
-	public R<List<AssayContentDetail>> detailListNoUsed(@Parameter(hidden = true) Long workCenterId) {
+	public R<List<AssayContentDetail>> detailListNoUsed(@Parameter(description = "作业中心id", required = true) Long workCenterId) {
 		List<AssayContentDetail> detailList = assayContentService.detailListNoUsed(workCenterId);
 		return R.data(detailList);
 	}

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

@@ -5,7 +5,7 @@
 <mapper namespace="org.springblade.desk.order.mapper.AssayContentMapper">
     <select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.AssayContent">
 		SELECT ID, TENANT_ID, CREATE_USER, CREATE_DEPT, CREATE_TIME, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED,
-			WC_ID, ASSAY_MAN, ASSAY_TIME, APPLY_STATUS, GOLD_POTASSIUM, SILVER_POTASSIUM, SILVER_PLATE, IS_USED, APPLY_ID
+            WC_ID, ASSAY_MAN, ASSAY_TIME, APPLY_STATUS, GOLD_POTASSIUM, SILVER_POTASSIUM, SILVER_PLATE, IS_USED, APPLY_ID
 		FROM MES_ASSAY_CONTENT
         WHERE IS_DELETED = 0
 		<if test = "entity.wcId != null and entity.wcId != ''">

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

@@ -66,7 +66,7 @@
         LEFT JOIN MES_PLATE_GOODS_RECORD_DETAIL grd ON yo.id = grd.YO_ID
         WHERE yo.IS_DELETED = 0 AND grd.ID IS NULL
 		<if test = "wcId != null and wcId != ''">
-            AND WORK_CENTER_ID = #{wcId}
+            AND yo.WORK_CENTER_ID = #{wcId}
         </if>
         <!--
                 todo 按照工艺，查询金钾相关的订单
@@ -80,16 +80,16 @@
                 </if>
         -->
         <if test = "overHalfMon != null and overHalfMon == 0 ">
-            AND RECEIVE_TIME >= SYSDATE - INTERVAL '15' DAY
+            AND yo.RECEIVE_TIME >= SYSDATE - INTERVAL '15' DAY
         </if>
         <if test = "yieldTypeList != null and yieldTypeList.size() > 0">
-            AND YIELD_TYPE IN
+            AND yo.YIELD_TYPE IN
             <foreach collection = "yieldTypeList" item = "yieldType" open = "(" separator = "," close = ")">
                 #{yieldType.code}
             </foreach>
         </if>
         <if test = "yieldStatusList != null and yieldStatusList.size() > 0">
-            AND STATUS IN
+            AND yo.STATUS IN
             <foreach collection = "yieldStatusList" item = "yieldStatus" open = "(" separator = "," close = ")">
                 #{yieldStatus.code}
             </foreach>

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

@@ -3,10 +3,9 @@ package org.springblade.desk.order.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 import org.springblade.desk.order.mapper.AssayContentDetailMapper;
+import org.springblade.desk.order.pojo.entity.AssayContentDetail;
 import org.springblade.desk.order.service.IAssayContentDetailService;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +28,6 @@ public class AssayContentDetailServiceImpl extends BaseServiceImpl<AssayContentD
 	@Override
 	public List<AssayContentDetail> getByContentId(Long contentId) {
 		Wrapper wrapper = Wrappers.lambdaQuery(AssayContentDetail.class)
-			.eq(AssayContentDetail::getIsDeleted, CommonConstant.DELETE_FALSE)
 			.eq(AssayContentDetail::getAcId, contentId);
 		List<AssayContentDetail> detailList = baseMapper.selectList(wrapper);
 		return detailList;

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
-import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -68,7 +67,6 @@ public class AssayContentServiceImpl extends BaseServiceImpl<AssayContentMapper,
 	public List<AssayContentDetail> detailListNoUsed(Long workCenterId) {
 		// 1. 查询作业中心下，最新的未被使用的化验明细
 		LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(AssayContent.class)
-			.eq(AssayContent::getIsDeleted, CommonConstant.DELETE_FALSE)
 			.eq(AssayContent::getStatus, AssayContentEnum.STATUS_UNUSED.getCode())
 			.eq(AssayContent::getWcId, workCenterId)
 			.orderByDesc(AssayContent::getCreateTime);

doc/sql/mes/increase-260120.sql

@@ -37,3 +37,7 @@ COMMENT ON COLUMN MES_PLATE_GOODS_RECORD.INVOLVING_RECORD_CODE IS '本次添加
 ALTER TABLE MES_PLATE_GOODS_RECORD ADD NOT_ADD_VAL NUMBER(20,10) NULL;
 COMMENT ON COLUMN MES_PLATE_GOODS_RECORD.NOT_ADD_VAL IS '本次剩余单号余量';
 
+ALTER TABLE MES_ASSAY_CONTENT_DETAIL ADD ADD_VAL NUMBER(20,10) NULL;
+COMMENT ON COLUMN MES_ASSAY_CONTENT_DETAIL.ADD_VAL IS '添加量值';
+
+