检验记录字段整体及接口修改

fe/PC/src/utils/detailsTableColumns/index.js

@@ -268,30 +268,24 @@ export const InspectRequest =  [
   // { label: "其他属性", prop: 'otherPropertyJson' },
   // -----------------------------------------------------------------------
 ]
-// 检验记录 字段需要确定
+// 检验记录 20230407
 export const InspectNote =  [
-  // { label: "其他详情", fixed: "left", type: "button" },
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "收货数量", prop: "receiveQty" },
-  { label: "物品单位", prop: "receiveUom" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "库位", prop: 'locationCode' },
   { label: "ERP库位", prop: 'locationErpCode' },
   { label: "合格数量", prop: 'goodQty' },
   { label: "不合格数量", prop: 'failedQty' },
-  { label: "外观", prop: 'appearance' },
-  { label: "尺寸", prop: 'volume' },
-  { label: "重量", prop: 'weight' },
-  { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
-  // { label: "不合格原因代码", prop: 'failedReason' },
-  // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
+  { label: "检验人", prop: 'inspectUser' },
   // -----------------------------------------------------------------------
   { label: "盘点标签", prop: "containerCode" },
   { label: "破坏数量", prop: 'crackQty' },
+  { label: "异常照片", prop: 'photos' },
   { label: "最终不合格数量", prop: 'notPassedQty' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "创建者Id", prop: 'creatorId' },
@@ -308,20 +302,29 @@ export const InspectNote =  [
   { label: "库区", prop: 'locationArea' },
   { label: "订单号", prop: 'poNumber' },
   { label: "订单行", prop: 'poLine' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  { label: "计量单位", prop: 'uom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "样品率", prop: 'samplePercent' },
   { label: "检验数量", prop: 'inspectQty' },
   { label: "AbcClass类别", prop: 'abcClass' },
   { label: "事务ID", prop: "tenantId" },
-  { label: "检验人邮件", prop: 'inspectUserEmail' },
-  { label: "检验人姓名", prop: 'inspectUserName' },
-  { label: "检验人电话", prop: 'inspectUserPhone' },
   { label: "status", prop: 'status' },
   { label: "masterID", prop: "masterID" },
   { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
   { label: "ID", prop: "id" },
-  // { label: "其他属性", prop: 'otherPropertyJson' },
+  { label: "其他属性", prop: 'otherPropertyJson' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "检验人邮件", prop: 'inspectUserEmail' },
+  // { label: "检验人姓名", prop: 'inspectUserName' },
+  // { label: "检验人电话", prop: 'inspectUserPhone' },
+  // { label: "其他详情", fixed: "left", type: "button" },
+  // { label: "物品单位", prop: "receiveUom" },
+  // { label: "外观", prop: 'appearance' },
+  // { label: "尺寸", prop: 'volume' },
+  // { label: "重量", prop: 'weight' },
+  // { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
+  // { label: "不合格原因代码", prop: 'failedReason' },
+  // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
   // -----------------------------------------------------------------------
 ]
 

fe/PC/src/utils/summaryTableColumns/index.js

@@ -56,22 +56,19 @@ export const InspectRequest =  [
 export const InspectNote =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
-  { label: "物品单位", prop: 'receiveUom' },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "生产批次", prop: "lot" },
+  { label: "计量单位", prop: 'uom' },
   { label: "收货数量", prop: 'receiveQty' },
   { label: "检验数量", prop: 'inspectQty' },
   { label: "合格数量", prop: 'goodQty' },
   { label: "不合格数量", prop: 'failedQty' },
-  { label: "外观", prop: 'appearance' },
-  { label: "尺寸", prop: 'volume' },
-  { label: "重量", prop: 'weight' },
-  // { label: "不合格原因代码", prop: 'failedReason' },
-  // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
+  { label: "检验人", prop: 'inspectUser' },
+  { label: "不合格原因代码", prop: 'failedReason' },
+  { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
   // -----------------------------------------------------------------------
   { label: "单据号", prop: "number" },
-  { label: "物品描述2", prop: "itemDesc2" },
-  { label: "创建时间", prop: "completeTime",type: "dateTime" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -83,16 +80,23 @@ export const InspectNote =  [
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "订单号", prop: 'poNumber' },
   { label: "订单行", prop: 'poLine' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "样品率", prop: 'samplePercent' },
   { label: "破坏数量", prop: 'crackQty' },
   { label: "最终不合格数量", prop: 'notPassedQty' },
   { label: "事务ID", prop: "tenantId" },
-  { label: "检验人邮件", prop: 'inspectUserEmail' },
-  { label: "检验人姓名", prop: 'inspectUserName' },
-  { label: "检验人电话", prop: 'inspectUserPhone' },
   { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
   { label: "masterID", prop: "masterID" },
+  { label: "ID", prop: "id" },
+  // { label: "物品描述2", prop: "itemDesc2" },
+  // { label: "创建时间", prop: "completeTime",type: "dateTime" },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "检验人邮件", prop: 'inspectUserEmail' },
+  // { label: "检验人姓名", prop: 'inspectUserName' },
+  // { label: "检验人电话", prop: 'inspectUserPhone' },
+  // { label: "物品单位", prop: 'receiveUom' },
+  // { label: "外观", prop: 'appearance' },
+  // { label: "尺寸", prop: 'volume' },
+  // { label: "重量", prop: 'weight' },
   // -----------------------------------------------------------------------
 ]

fe/PC/src/utils/tableColumns/index.js

@@ -1489,7 +1489,7 @@ export const InspectRequest =  [
   // { label: "nextAction", prop: 'nextAction' },
   // -----------------------------------------------------------------------
 ]
-// 检验记录 字段需要确定
+// 检验记录 20230407
 export const InspectNote = [
   {
     label: "检验单号",
@@ -1499,10 +1499,11 @@ export const InspectNote = [
     width: orderWidth
   },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "筹措员代码", prop: "worker" },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
   { label: "采购订单号", prop: "poNumber" ,width: orderWidth },
   { label: "发货单号", prop: "asnNumber",width: orderWidth },
-  { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth },
   { label: "收货单号", prop: "receiptNumber",width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "备注", prop: 'remark' },
@@ -1510,10 +1511,14 @@ export const InspectNote = [
   { label: "检验单号", prop: 'inspectNumber',width: orderWidth },
   { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" },
+  { label: "ID", prop: 'id' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 不合格库存（不合格转合格） 已调整

fe/PC/src/utils/tabsDesTions/index.js

@@ -1031,14 +1031,14 @@ export const InspectRequest = [
   // { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
   // -----------------------------------------------------------------------
 ]
-// 检验记录 字段需要确定
+// 检验记录 20230407
 export const InspectNote = [
   { label: "检验单号", prop: "number" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "筹措员代码", prop: "worker" },
   { label: "采购订单号", prop: "poNumber" },
   { label: "发货单号", prop: "asnNumber" },
-  { label: "到货单号", prop: "arriveNoticeNumber" },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
   { label: "收货单号", prop: "receiptNumber" },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "备注", prop: 'remark' },
@@ -1051,9 +1051,10 @@ export const InspectNote = [
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "事务ID", prop: "tenantId" },
   { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "到货单号", prop: "arriveNoticeNumber" },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 不合格转合格记录 已调整 20221220