功能修改-sjx

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/AssayContent.java

@@ -37,10 +37,10 @@ public class AssayContent extends BaseEntity {
 	 * 化验时间
 	 */
 	@DateTimeFormat(
-		pattern = "yyyy-MM-dd"
+		pattern = "yyyy-MM-dd HH:mm:ss"
 	)
 	@JsonFormat(
-		pattern = "yyyy-MM-dd"
+		pattern = "yyyy-MM-dd HH:mm:ss"
 	)
 	@TableField(value = "ASSAY_TIME")
 	private Date assayTime;

blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml

@@ -127,11 +127,31 @@
             a.quantity,
             a.SIR_MONEY,
             a.BUY_CODE,
-                a.CHECK_NO,
+            a.CHECK_NO,
             a.QUANTITY_LEVEL,
             a.SCRAP_CYCLE,
             a.STOVE_PI_NO,
-            a.IN_OUT_REASON,
+            CASE
+                a.IN_OUT_REASON
+                WHEN N'0' THEN
+                    N'报废出库'
+                WHEN N'1' THEN
+                    N'料头出库'
+                WHEN N'2' THEN
+                    N'超额出库'
+                WHEN N'3' THEN
+                    N'复检出库'
+                WHEN N'4' THEN
+                    N'领用出库'
+                WHEN N'5' THEN
+                    N'库转译'
+                WHEN N'6' THEN
+                    N'退货出库'
+                WHEN N'7' THEN
+                    N'物料出库'
+                WHEN N'8' THEN
+                    N'班组提请' ELSE N''
+                END as "inOutReason",
             a.IN_OUT_DATE,
             c.real_name as "userName",
             a.SIR_CODE

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

@@ -124,11 +124,11 @@ public class YieldOrderController extends BladeController {
 		@Parameter(name = "overHalfMon", description = "使用半月以上的数据，0：否，1：是, 以生产订单的下达时间算", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
 	})
 	@Operation(summary = "分页-物料需求申报", description = "")
-	public R<IPage<YieldOrderVo>> pageMaterialApply(Long wcId, Integer materialType, Integer overHalfMon, Query query) {
+	public R<IPage<YieldOrderVo>> pageMaterialApply(Long wcId, String plateGoodsCode, Integer overHalfMon, Query query) {
 		IPage<YieldOrder> page = Condition.getPage(query);
 		page.setRecords(new ArrayList<>());
 
-		page = yieldOrderService.pageMaterialApply(Condition.getPage(query), wcId, materialType, overHalfMon);
+		page = yieldOrderService.pageMaterialApply(Condition.getPage(query), wcId, plateGoodsCode, overHalfMon);
 
 		return R.data(YieldOrderWrapper.build().pageVO(page));
 	}

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

@@ -6,7 +6,6 @@ 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;
 
@@ -33,13 +32,13 @@ public interface YieldOrderMapper extends BaseMapper<YieldOrder> {
 	 *
 	 * @param page
 	 * @param wcId            作业中心
-	 * @param materialType    物料类型，1：金钾，2：银钾
+	 * @param plateGoodsCode    金钾：04-05-023 银钾：04-05-024
 	 * @param overHalfMon     使用半月以上的数据，0：否，1：是
 	 * @param yieldTypeList   订单类型
 	 * @param yieldStatusList 订单状态
 	 * @return
 	 */
-	List<YieldOrder> pageMaterialApply(IPage page, Long wcId, Integer materialType, Integer overHalfMon,
+	List<YieldOrder> pageMaterialApply(IPage page, Long wcId, String plateGoodsCode, Integer overHalfMon,
 									   List<YieldOrderEnum> yieldTypeList, List<YieldOrderEnum> yieldStatusList);
 
     Long getWcId(Long orderId);

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

@@ -84,22 +84,14 @@
     <select id = "pageMaterialApply" resultType = "org.springblade.desk.order.pojo.entity.YieldOrder">
 		SELECT <include refid="baseCommonFields" />
         FROM MES_YIELD_ORDER yo
-        LEFT JOIN MES_PLATE_GOODS_RECORD_DETAIL grd ON yo.id = grd.YO_ID
+        INNER 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 yo.WORK_CENTER_ID = #{wcId}
         </if>
-        <!--
+        <if test = "plateGoodsCode != null and plateGoodsCode != ''">
-                todo 按照工艺，查询金钾相关的订单
+            AND yo.PLATE_GOODS_CODE = #{plateGoodsCode}
-                <if test = "materialType != null and materialType == 1 ">
+        </if>
-                   AND YP_CODE LIKE CONCAT('%', CONCAT(#{entity.ypCode}, '%'))
-                </if>
-
-                todo 银钾
-                <if test = "materialType != null and materialType == 2 ">
-                   AND YP_CODE LIKE CONCAT('%', CONCAT(#{entity.ypCode}, '%'))
-                </if>
-        -->
         <if test = "overHalfMon != null and overHalfMon == 0 ">
             AND yo.RECEIVE_TIME >= SYSDATE - INTERVAL '15' DAY
         </if>

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

@@ -11,7 +11,6 @@ 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;
 
@@ -58,7 +57,7 @@ public interface IYieldOrderService extends BaseService<YieldOrder> {
 	 * @param overHalfMon
 	 * @return
 	 */
-	IPage<YieldOrder> pageMaterialApply(IPage<YieldOrder> page, Long wcId, Integer materialType, Integer overHalfMon);
+	IPage<YieldOrder> pageMaterialApply(IPage<YieldOrder> page, Long wcId, String plateGoodsCode, Integer overHalfMon);
 
 	/**
 	 * 查询是否存在玻璃饼生产订单

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

@@ -383,6 +383,7 @@ public class PlateGoodsRecordServiceImpl extends BaseServiceImpl<PlateGoodsRecor
 				yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_PASS.getCode());
 				yieldOrder.setValidationMomo("");
 			}
+			yieldOrder.setPlateGoodsCode(dsPart.getPlateGoodsCode());
 			yieldOrderMapper.updateById(yieldOrder);
 		}else{
 			return true;

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

@@ -168,7 +168,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	}
 
 	@Override
-	public IPage<YieldOrder> pageMaterialApply(IPage<YieldOrder> page, Long wcId, Integer materialType, Integer overHalfMon) {
+	public IPage<YieldOrder> pageMaterialApply(IPage<YieldOrder> page, Long wcId, String plateGoodsCode, Integer overHalfMon) {
 		// 只有电镀的需要镀层物料，故只查询电镀的订单
 		List<YieldOrderEnum> yieldTypeList = new ArrayList<>();
 		yieldTypeList.add(YieldOrderEnum.YIELD_TYPE_1);
@@ -184,7 +184,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		YieldOrder entity = new YieldOrder();
 		entity.setWorkCenterId(wcId);
 		// TODO 1. 金钾银钾如何区分，使用工艺编制中的物料编号，其中只有金钾、银钾的选项
-		List<YieldOrder> dataList = baseMapper.pageMaterialApply(page, wcId, materialType, overHalfMon, yieldTypeList, yieldStatusList);
+		List<YieldOrder> dataList = baseMapper.pageMaterialApply(page, wcId, plateGoodsCode, overHalfMon, yieldTypeList, yieldStatusList);
 		return page.setRecords(dataList);
 	}