生产管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java

@@ -1,6 +1,3 @@
-/**
- * Author: Tom Shuo
- */
 package org.springblade.desk.quality.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,8 +6,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
-import java.io.Serial;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * [工序检验项] 实体类
@@ -23,82 +21,13 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "WorkPlanItem Entity对象")
 public class WorkPlanItem extends BaseEntity {
+	public static Map<Integer, String> checkResultMap = new HashMap<>(3);
 
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * [作业计划]id
-	 */
-    public static final String COL_WP_ID = "WP_ID";
-	/**
-	 * 检验数
-	 */
-    public static final String COL_CHECK_QTY = "CHECK_QTY";
-	/**
-	 * 试验数量
-	 */
-    public static final String COL_TEST_QTY = "TEST_QTY";
-	/**
-	 * 消耗数量
-	 */
-    public static final String COL_LOSS_QTY = "LOSS_QTY";
-	/**
-	 * [检验项目]编码
-	 */
-    public static final String COL_ITEM_CODE = "ITEM_CODE";
-	/**
-	 * [检验项目]名称
-	 */
-    public static final String COL_ITEM_NAME = "ITEM_NAME";
-	/**
-	 * [质量标准]名称
-	 */
-    public static final String COL_STANDARD_NAME = "STANDARD_NAME";
-	/**
-	 * 检验员[用户]id
-	 */
-    public static final String COL_CHECK_USER_ID = "CHECK_USER_ID";
-	/**
-	 * 检验值
-	 */
-    public static final String COL_CHECK_VALUE = "CHECK_VALUE";
-	/**
-	 * 检验日期
-	 */
-    public static final String COL_CHECK_DATE = "CHECK_DATE";
-	/**
-	 * 检验结果-[0]:未检验;[1]:合格;[2]:不合格;[-1]:NA
-	 */
-    public static final String COL_CHECK_RESULT = "CHECK_RESULT";
-	/**
-	 * 工时定额
-	 */
-    public static final String COL_HOUR_QUOTA = "HOUR_QUOTA";
-	/**
-	 * 准备工时
-	 */
-    public static final String COL_HOUR_PREPARE = "HOUR_PREPARE";
-	/**
-	 * [检验任务]id
-	 */
-    public static final String COL_TASK_ID = "TASK_ID";
-	/**
-	 * [检验项目]id
-	 */
-    public static final String COL_ITEM_ID = "ITEM_ID";
-	/**
-	 * [质量标准]id
-	 */
-    public static final String COL_STANDARD_ID = "STANDARD_ID";
-	/**
-	 * [检验模板]id
-	 */
-    public static final String COL_TEMPLATE_ID = "TEMPLATE_ID";
-    /**
-     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
-     */
-    public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE";
+	static {
+		checkResultMap.put(1, "合格");
+		checkResultMap.put(2, "不合格");
+		checkResultMap.put(-1, "NA");
+	}
 
 	/**
 	 * [作业计划]id

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java

@@ -1,6 +1,3 @@
-/**
- * Author: Tom Shuo
- */
 package org.springblade.desk.quality.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -25,62 +22,6 @@ import java.io.Serial;
 @EqualsAndHashCode(callSuper = true)
 public class WorkPlanItemDetail extends BaseEntity {
 
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * [工序检验项]id
-	 */
-    public static final String COL_WORK_PLAN_ITEM_ID = "WORK_PLAN_ITEM_ID";
-	/**
-	 * 测量类型-[1]镀前;[2]:镀后;
-	 */
-    public static final String COL_TEST_TYPE = "TEST_TYPE";
-	/**
-	 * 尺寸
-	 */
-    public static final String COL_RULE_SIZE = "RULE_SIZE";
-	/**
-	 * 量具
-	 */
-    public static final String COL_TOOLS = "TOOLS";
-	/**
-	 * 测量值1
-	 */
-    public static final String COL_GAUGE_VALUE1 = "GAUGE_VALUE1";
-	/**
-	 * 测量值2
-	 */
-    public static final String COL_GAUGE_VALUE2 = "GAUGE_VALUE2";
-	/**
-	 * 测量值3
-	 */
-    public static final String COL_GAUGE_VALUE3 = "GAUGE_VALUE3";
-	/**
-	 * 测量值4
-	 */
-    public static final String COL_GAUGE_VALUE4 = "GAUGE_VALUE4";
-	/**
-	 * 测量值5
-	 */
-    public static final String COL_GAUGE_VALUE5 = "GAUGE_VALUE5";
-	/**
-	 * 测量值6
-	 */
-    public static final String COL_GAUGE_VALUE6 = "GAUGE_VALUE6";
-	/**
-	 * 测量值7
-	 */
-    public static final String COL_GAUGE_VALUE7 = "GAUGE_VALUE7";
-	/**
-	 * 测量值8
-	 */
-    public static final String COL_GAUGE_VALUE8 = "GAUGE_VALUE8";
-	/**
-	 * [量具]id
-	 */
-    public static final String COL_MT_ID = "MT_ID";
-
 	/**
 	 * [工序检验项]id
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java

@@ -63,17 +63,19 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
             return null;
         }
         List<PrintWarehousingVO> list = new ArrayList<>();
-        HandoverRecord hr;
         PrintWarehousingVO printWarehousing;
         YieldOrder yo;
         Double totalWeight;
         Date date = new Date();
-        for (Long i : longList) {
-            hr = this.getById(i);
-            // 保存打印时间、更新打印标记
-            hr.setPrintTime(date);
-            hr.setPrintFlag(1);
-
+        List<HandoverRecord> updateList = new ArrayList<>();
+        List<HandoverRecord> handoverRecords = baseMapper.selectByIds(longList);
+        for (HandoverRecord hr : handoverRecords) {
+            if (hr.getPrintTime() == null && hr.getPrintFlag() == 0) {
+                // 保存打印时间、更新打印标记
+                hr.setPrintTime(date);
+                hr.setPrintFlag(1);
+                updateList.add(hr);
+            }
             printWarehousing = new PrintWarehousingVO();
             printWarehousing.setHrCode(hr.getHrCode());
             printWarehousing.setHrType(hr.getHrType());
@@ -112,12 +114,11 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
             printWarehousing.setPrimaryCraft(yo.getPrimaryCraft());
             //zxh 20241212 保管员取值根据是否更改接受部门增加分支
             if (hr.getRecDept().matches("[0-9]+")) {
-                // 2025-07-23 线上迁移
-                log.info("getCustodianByRecDept开始时间{}", System.currentTimeMillis());
-//                String custodianByRecDept = this.getCustodianByRecDept(yo.getPartCode(), hr.getRecDept());
-                // 2025-07-23 线上迁移
-                log.info("getCustodianByRecDept结束时间{}", System.currentTimeMillis());
-//                printWarehousing.setCustodian(custodianByRecDept);
+                try {
+                    printWarehousing.setCustodian(this.getCustodianByRecDept(yo.getPartCode(), hr.getRecDept()));
+                } catch (Exception e) {
+                    log.error("erp获取保管员失败,零件号{},接收部门{},错误信息:{}", yo.getPartCode(), hr.getRecDept(), e.getMessage());
+                }
             } else {
                 printWarehousing.setCustodian(yo.getCustodian());
             }
@@ -132,6 +133,7 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
 
             list.add(printWarehousing);
         }
+        this.updateBatchById(updateList);
         return list;
     }
 

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

@@ -1467,6 +1467,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 BeanUtils.copyProperties(workPlanItem, itemVO);
                 itemVO.setCheckMan(UserCache.getUser(workPlanItem.getCheckUserId()) != null ? UserCache.getUser(workPlanItem.getCheckUserId()).getRealName() : "");
                 itemVO.setItemDetailList(itemDetails.stream().filter(itemDetail -> itemDetail.getWorkPlanItemId().equals(workPlanItem.getId())).toList());
+                itemVO.setCheckResult(WorkPlanItem.checkResultMap.get(workPlanItem.getCheckResult()));
                 itemVos.add(itemVO);
             }
             planDataVO.setItemList(itemVos);