ci-plus 1.6.7 → 1.6.9

package/README.md

@@ -1,6 +1,10 @@
 ## 历史更新
 
 ```js
+1.6.9
+  1、微调标识卡模板到 1.6.0 版本:更新检验员检验日期检验结果取值逻辑，更新装配标识卡本批数量取值逻辑
+1.6.8
+  1、微调标识卡模板到 1.5.9 版本:优化单重和净重字段判空逻辑
 1.6.7
   1、微调标识卡模板到 1.5.8 版本:删除产品标识卡和返工标识卡中的'采购单号'字段
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {

package/src/utils/cardPrint.ts

@@ -2,9 +2,9 @@
  * @module cardPrint
  * @author : 卖女孩的小火柴
  * ?description : 11月22日开会重新更新成品工厂标识卡
- * !@version : 1.5.8
+ * !@version : 1.6.0
  * TODO:@since : 创建时间 2024-11-23 09:40:30
- * !update : 2024-11.23 更新标识卡
+ * !update : 2024-11.30 更新检验员检验日期检验结果取值逻辑
  */
 
 import { ElMessage, MessageParamsWithType } from 'element-plus'
@@ -19,6 +19,27 @@ let users = {
   deptId: UserData.deptId || '',
 }
 let user = JSON.parse(JSON.stringify(users))
+const setInspect_status = (val: number | string | undefined) => {
+  if (val == 0) {
+    return { type: 'info', value: '未生成任务' }
+  } else if (val == 1) {
+    return { type: 'info', value: '待检验' }
+  } else if (val == 2) {
+    return { type: 'success', value: '合格' }
+  } else if (val === 3) {
+    return { type: 'info', value: '不合格' }
+  } else if (val === 4) {
+    return { type: 'warning', value: '待评审' }
+  } else if (val === 5) {
+    return { type: 'danger', value: '挑选使用' }
+  } else if (val === 6) {
+    return { type: 'danger', value: '让步接收' }
+  } else if (val === 7) {
+    return { type: 'danger', value: '退货' }
+  } else {
+    return { type: '', value: '' }
+  }
+}
 
 let baseUrls = storageModule //new URL(storageModule).origin + '/' // 图片的地址前缀
 let apiurl = storageModule + 'scan_card_code_get/'
@@ -55,6 +76,13 @@ export const cardPrint = (
         let dataInfo: any[] = []
         data.forEach((item: any) => {
           let obj = {}
+          let weight1 = item.net_weight ? item.net_weight : ''
+          let weight_unit1 = item.net_weight_unit ? item.net_weight_unit : ''
+          let net_weight = weight1 ? weight1 + weight_unit1 : '' // 净重+净重单位
+          let weight2 = item.piece_weight ? item.piece_weight : ''
+          let weight_unit2 = item.piece_weight_unit ? item.piece_weight_unit : ''
+          let piece_weight = weight2 ? weight2 + weight_unit2 : '' // 单重+单重单位
+
           //  成品工厂-产品标识卡
           if (item.card_state == 'CHANPIN' && item.is_finished_goods == 2) {
             obj = {
@@ -90,12 +118,12 @@ export const cardPrint = (
               r9c2: item.value,
               r9c3: '材料厂商',
               r9c4: item.center_data[0]?.material_manufacturer,
-              r10c1: '巡检员',
-              r10c2: item.center_data[0]?.inspector,
+              r10c1: '检验员',
+              r10c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
               r10c3: '材料炉号',
               r10c4: item.center_data[0]?.material_heat_number,
               r11c1: '检验日期',
-              r11c2: item.center_data[0]?.inspect_time,
+              r11c2: item.inspect_time ? item.inspect_time : item.center_data[0]?.inspect_time,
               r11c3: '热处理批号',
               r11c4: item.center_data[0]?.heat_batch_number,
               r12c1: '流转批次号',
@@ -150,9 +178,9 @@ export const cardPrint = (
               r9c3: '收货人员',
               r9c4: item.center_data[0]?.consignee,
               r10c1: '净重',
-              r10c2: item.net_weight + item.net_weight_unit,
+              r10c2: net_weight,
               r10c3: '单重',
-              r10c4: item.piece_weight + item.piece_weight_unit,
+              r10c4: piece_weight,
               r11c1: '产线',
               r11c2: item.line_name,
               r11c3: '工单号',
@@ -215,11 +243,11 @@ export const cardPrint = (
               r9c3: '材料厂商',
               r9c4: item.center_data[0]?.material_manufacturer,
               r10c1: '检验员',
-              r10c2: item.center_data[0]?.inspector,
+              r10c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
               r10c3: '材料炉号',
               r10c4: item.center_data[0]?.material_heat_number,
-              r11c1: '检查日期',
-              r11c2: item.center_data[0]?.inspect_time,
+              r11c1: '检验日期',
+              r11c2: item.inspect_time ? item.inspect_time : item.center_data[0]?.inspect_time,
               r11c3: '热处理批号',
               r11c4: item.center_data[0]?.heat_batch_number,
               r12c1: '工单号',
@@ -291,9 +319,9 @@ export const cardPrint = (
               r8c3: '责任人', // 责任人
               r8c4: item.duty_user_name, // 责任人
               r9c1: '检验员',
-              r9c2: item.center_data[0]?.inspector,
+              r9c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
               r9c3: '检验日期',
-              r9c4: item.center_data[0]?.inspect_time,
+              r9c4: item.inspect_time ? item.inspect_time : item.center_data[0]?.inspect_time,
               r10c1: '本箱数量',
               r10c2: item.current_inventory,
               r10c3: '材料炉号',
@@ -351,7 +379,6 @@ export const cardPrint = (
                 return l + ':' + v
               })
               .join(',')
-
             obj = {
               card_state: item.card_state,
               // 工厂类型：1：为尚工厂 | 2：成品工厂
@@ -388,7 +415,7 @@ export const cardPrint = (
               r10c1: '责废总数', // 建
               r10c2: item.storage_scrap_count,
               r10c3: '单重',
-              r10c4: item.piece_weight + item.piece_weight_unit,
+              r10c4: piece_weight,
               r11c1: '工序',
               r11c2: item.process_name,
               r11c3: '本批数量',
@@ -465,9 +492,9 @@ export const cardPrint = (
               r7c3: '生产日期',
               r7c4: item.product_date,
               r8c1: '检验员',
-              r8c2: item.center_data[0]?.inspector,
+              r8c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
               r8c3: '检验日期',
-              r8c4: item.center_data[0]?.inspect_time,
+              r8c4: item.inspect_time ? item.inspect_time : item.center_data[0]?.inspect_time,
               r9c1: '责任团队',
               r9c2: item.duty_team_name,
               r9c3: '返工期限',
@@ -576,6 +603,9 @@ export const cardPrint = (
           }
           //  成品工厂-装配标识卡（为尚工厂无装配标识卡）
           else if (item.card_state == 'ZHUANGPEI' && item.is_finished_goods == 2) {
+            // 检验结果/检验状态
+            let status = item.inspect_status ? item.inspect_status : item.center_data[0]?.inspect_status
+            let inspectStatus = setInspect_status(status).value
             // 如果有children ，就循环获取其中值
             let badNum = item.children?.length || 0
             let badList: {
@@ -657,7 +687,7 @@ export const cardPrint = (
               r50c1: '本箱数量',
               r50c2: item.current_inventory,
               r50c3: '本批数量',
-              r50c4: item.center_data[0]?.batch_count,
+              r50c4: item.batch_count ? item.batch_count : item.center_data[0]?.batch_count,
               r51c1: '本工序',
               r51c2: item.process_name,
               r51c3: '下工序',
@@ -667,11 +697,13 @@ export const cardPrint = (
               r52c3: '生产日期',
               r52c4: item.product_date,
               r53c1: '检验员',
-              r53c2: item.center_data[0]?.inspector,
+              r53c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
               r53c3: '检验日期',
-              r53c4: item.center_data[0]?.inspect_time,
+              r53c4: item.inspect_time ? item.inspect_time : item.center_data[0]?.inspect_time,
               r54c1: '流转批次号',
               r54c2: item.flow_lot_number,
+              r54c3: '检验结果',
+              r54c4: inspectStatus,
               r55c1: '备注',
               r55c2: item.remark,
             }
@@ -741,11 +773,11 @@ export const cardPrint = (
               r8c3: '材料厂商',
               r8c4: item.center_data[0]?.material_manufacturer,
               r9c1: '检验员',
-              r9c2: item.center_data[0]?.inspector,
+              r9c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
               r9c3: '材料炉号',
               r9c4: item.center_data[0]?.material_heat_number,
               r10c1: '检验日期',
-              r10c2: item.center_data[0]?.inspect_time,
+              r10c2: item.inspect_time ? item.inspect_time : item.center_data[0]?.inspect_time,
               r10c3: '热处理批号',
               r10c4: item.center_data[0]?.heat_batch_number,
               r11c1: '采购单号',
@@ -792,7 +824,6 @@ export const cardPrint = (
                 return l + ':' + v
               })
               .join(',')
-
             obj = {
               card_state: item.card_state,
               // 工厂类型：1：为尚工厂 | 2：成品工厂
@@ -830,7 +861,7 @@ export const cardPrint = (
               r10c1: '料废总数',
               r10c2: item.storage_scrap_count,
               r10c3: '单重',
-              r10c4: item.piece_weight + item.piece_weight_unit,
+              r10c4: piece_weight,
               r11c1: '工序',
               r11c2: item.process_name,
               r11c3: '本批数量',
@@ -929,9 +960,9 @@ export const cardPrint = (
               r9c3: '收货人员',
               r9c4: item.center_data[0]?.consignee,
               r10c1: '净重',
-              r10c2: item.net_weight + item.net_weight_unit,
+              r10c2: net_weight,
               r10c3: '单重',
-              r10c4: item.piece_weight + item.piece_weight_unit,
+              r10c4: piece_weight,
               r11c1: '产线',
               r11c2: item.line_name,
               r11c3: '工单号',
@@ -998,11 +1029,11 @@ export const cardPrint = (
               r10c1: '本箱数量',
               r10c2: item.current_inventory,
               r10c3: '单重',
-              r10c4: item.piece_weight + item.piece_weight_unit,
+              r10c4: piece_weight,
               r11c1: '总箱数',
               r11c2: item.total_row,
               r11c3: '净重',
-              r11c4: item.net_weight + item.net_weight_unit,
+              r11c4: net_weight,
               r12c1: '包装方式',
               r12c2: item.packaging_specifications_name,
               r12c3: '生产日期',
@@ -1052,11 +1083,11 @@ export const cardPrint = (
               r8c3: '材料炉号',
               r8c4: item.center_data[0]?.material_heat_number,
               r9c1: '检验员',
-              r9c2: item.center_data[0]?.inspector,
+              r9c2: item.inspector ? item.inspector : item.center_data[0]?.inspector,
               r9c3: '采购单号',
               r9c4: item.center_data[0]?.purchase_number,
               r10c1: '检验日期',
-              r10c2: item.center_data[0]?.inspect_time,
+              r10c2: item.inspect_time ? item.inspect_time : item.center_data[0]?.inspect_time,
 
               r40c1: '备注', // 备注
               r40c2: item.remark, // 备注