diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 35c78224b..d2214b234 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -1446,53 +1446,87 @@ export const ProductReceiptScrapNote =  [
   // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
-// 半成品上架记录 已调整
+// 半成品上架记录 20230415
 export const partiallyPreparedProductsNote =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
-  { label: "批次", prop: "toLot" },
-  { label: "箱码", prop: "toPackingCode" },
   { label: "来源库位", prop: "fromLocationCode" },
   { label: "目标库位", prop: "toLocationCode" },
-  { label: "ERP库位", prop: "toLocationErpCode" },
-  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "操作员", prop: 'worker' },
+  { label: "供应商批次", prop: 'supplierBatch' },
   // -----------------------------------------------------------------------
-  { label: "记录单号", prop: 'number',width:orderWidth },
-  { label: "发货单号", prop: "asnNumber",width:orderWidth },
-  { label: "订单号", prop: 'poNumber',width:orderWidth },
-  { label: "任务编号", prop: 'jobNumber',width:orderWidth },
-  { label: "生效时间", prop: 'arriveDate', type: "dateTime" },
-  { label: "生产时间", prop: 'produceDate', type: "dateTime" },
-  { label: "过期时间", prop: 'expireDate', type: "dateTime" },
+  { label: "单据号", prop: 'number' },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "备注", prop: 'remark' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
-  { label: "标包数量", prop: 'stdPackQty' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
+  { label: "采购订单号", prop: "poNumber",width: orderWidth },
   { label: "来源箱码", prop: 'fromPackingCode' },
   { label: "目标箱码", prop: 'toPackingCode' },
   { label: "来源批次", prop: 'fromLot' },
   { label: "目标批次", prop: 'toLot' },
-  { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "来源库位组", prop: 'fromLocationGroup' },
-  { label: "目标库位组", prop: 'toLocationGroup' },
-  { label: "来源库位", prop: 'fromLocationCode' },
-  { label: "目标库位", prop: 'toLocationCode' },
+  { label: "完成时间", prop: 'arriveDate', type: "dateTime" },
+  { label: "生产时间", prop: 'produceDate', type: "dateTime" },
+  { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "来源库区", prop: 'fromLocationArea' },
   { label: "目标库区", prop: 'toLocationArea' },
+  { label: "来源库位组", prop: 'fromLocationGroup' },
+  { label: "目标库位组", prop: 'toLocationGroup' },
   { label: "来源ERP库位", prop: 'fromLocationErpCode' },
   { label: "目标ERP库位", prop: 'toLocationErpCode' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "来源仓库", prop: 'fromWarehouseCode' },
   { label: "目标仓库", prop: 'toWarehouseCode' },
+  { label: "订单行", prop: 'poLine' },
+  { label: "标包数量", prop: 'stdPackQty' },
+  { label: "任务编号", prop: 'jobNumber' },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际供应商批次", prop: "handledSupplierBatch" },
+  { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" },
+  { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" },
+  { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" },
+  { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" },
+  { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" },
+  { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
+  { label: "推荐批次", prop: "recommendLot" },
+  { label: "实际批次", prop: "handledLot" },
+  { label: "推荐库位", prop: "recommendToLocationCode" },
+  { label: "实际库位", prop: "handledToLocationCode" },
+  { label: "推荐库区", prop: "recommendToLocationArea" },
+  { label: "实际库区", prop: "handledToLocationArea" },
+  { label: "推荐库位组", prop: "recommendToLocationGroup" },
+  { label: "实际库位组", prop: "handledToLocationGroup" },
+  { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
+  { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+  { label: "推荐仓库", prop: "recommendToWarehouseCode" },
+  { label: "实际仓库", prop: "handledToWarehouseCode" },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "备注", prop: 'remark' },
+  { label: "ID", prop: 'id' },
+  { label: "主表ID", prop: "masterID" },
   { label: "fromStatus", prop: 'fromStatus' },
   { label: "toStatus", prop: 'toStatus' },
-  { label: "订单行", prop: 'poLine' },
-  { label: "供应商包装计量单位", prop: 'supplierPackUom' },
-  { label: "供应商包装数量", prop: 'supplierPackQty' },
+  // { label: "完工收货单号", prop: 'productReceiptNumber',width: orderWidth },
+  // { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
+  // { label: "标包单位", prop: 'stdPackUom' },
+  // { label: "供应商包装单位", prop: 'supplierPackUom' },
+  // { label: "供应商包装数量", prop: 'supplierPackQty' },
+  // { label: "到货数", prop: 'shippedQty' },
+  // { label: "操作员", prop: 'worker' },
+  // { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth },
+  // { label: "发货单号", prop: "asnNumber",width: orderWidth },
+  // { label: "检验单号", prop: "inspectNumber",width: orderWidth },
+  // { label: "要求到货日期", prop: 'planArriveDate', type:'dateTime' },
+  // { label: "筹措员代码", prop: 'planUserCode' },
+  // { label: "收货单号", prop: "receiptNumber",width: orderWidth },
+  // { label: "供应商代码", prop: "supplierCode" },
+  // { label: "供应商描述", prop: "supplierSimpleName" },
   // -----------------------------------------------------------------------
 ]
 // 成品发货申请 20230414
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 4ae31128d..1bf379e46 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2172,32 +2172,36 @@ export const ProductReceiptScrapNote =  [
   // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 半成品上架记录 已调整
+// 半成品上架记录 20230415
 export const partiallyPreparedProductsNote =  [
   {
     label: "上架记录单号",
     prop: "number",
     fixed: "left",
     type: "name",
+    fixed: "left",
     width: orderWidth
   },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "备注", prop: 'remark' },
+  { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+  { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "备注", prop: 'remark' },
-  { label: "公司", prop: 'company' },
-  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "供应商代码", prop: 'supplierCode' },
-  { label: "任务ID", prop: 'jobNumber',width: orderWidth },
-  { label: "检验单号", prop: 'inspectNumber',width: orderWidth },
-  { label: "收货单号", prop: 'receiptNumber',width: orderWidth },
-  { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth },
-  { label: "发货单号", prop: 'asnNumber',width: orderWidth },
-  { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
-  { label: "完工收货单号", prop: 'productReceiptNumber',width: orderWidth },
-  { label: "type", prop: 'type' },
+  { label: "检验单号", prop: 'inspectNumber' },
+  { label: "收货单号", prop: 'receiptNumber' },
+  { label: "发货单号", prop: 'asnNumber' },
+  { label: "要货计划单号", prop: 'rpNumber' },
+  { label: "完工收货单号", prop: 'productReceiptNumber' },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "type", prop: "type" },
+  // { label: "到货单号", prop: 'arriveNoticeNumber' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 成品发货申请 20230414
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index aa5740ede..ad89b8026 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1566,30 +1566,31 @@ export const ProductReceiptScrapNote = [
   // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 半成品上架记录 已调整 1
+// 半成品上架记录 20230415
 export const partiallyPreparedProductsNote =  [
   { label: "上架记录单号", prop: 'number' },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
+  { label: "任务单号", prop: 'jobNumber' },
+  { label: "供应商代码", prop: 'supplierCode' },
+  { label: "检验单号", prop: 'inspectNumber' },
+  { label: "收货单号", prop: 'receiptNumber' },
+  { label: "发货单号", prop: 'asnNumber' },
+  { label: "要货计划单号", prop: 'rpNumber' },
+  { label: "完工收货单号", prop: 'productReceiptNumber' },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "创建者ID", prop: "creatorId" },
-  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "事务ID", prop: "tenantId" },
-  { label: "公司", prop: 'company' },
-  { label: "仓库代码", prop: 'warehouseCode' },
-  { label: "供应商代码", prop: 'supplierCode' },
-  { label: "任务ID", prop: 'jobNumber' },
-  { label: "检验单号", prop: 'inspectNumber' },
-  { label: "收货单号", prop: 'receiptNumber' },
-  { label: "到货单号", prop: 'arriveNoticeNumber' },
-  { label: "发货单号", prop: 'asnNumber' },
-  { label: "要货计划单号", prop: 'rpNumber' },
-  { label: "完工收货单号", prop: 'productReceiptNumber' },
-  { label: "类型", prop: 'type' },
   { label: "ID", prop: 'id' },
+  { label: "type", prop: 'type' },
+  // { label: "公司", prop: 'company' },
+  // { label: "到货单号", prop: 'arriveNoticeNumber' },
+  // { label: "仓库代码", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 成品发货申请 20230414