原料管理优化

gear-oa/src/main/java/com/gear/oa/service/impl/GearStockIoOrderServiceImpl.java

@@ -177,7 +177,7 @@ public class GearStockIoOrderServiceImpl implements IGearStockIoOrderService {
             update.setOrderId(order.getOrderId());
             update.setExecFlag("1");
             update.setExecuteBy(LoginHelper.getNickName());
-            update.setExecuteTime(new Date());
+            update.setExecuteTime(order.getIoTime() != null ? order.getIoTime() : new Date());
             baseMapper.updateById(update);
         }
         return order.getOrderId();
@@ -347,8 +347,8 @@ public class GearStockIoOrderServiceImpl implements IGearStockIoOrderService {
         update.setOrderId(orderId);
         update.setConfirmInFlag("1");
         update.setConfirmInBy(LoginHelper.getNickName());
-        update.setConfirmInTime(new Date());
+        update.setConfirmInTime(order.getIoTime() != null ? order.getIoTime() : new Date());
-        update.setActualArrivalTime(order.getActualArrivalTime() != null ? order.getActualArrivalTime() : new Date());
+        update.setActualArrivalTime(order.getActualArrivalTime() != null ? order.getActualArrivalTime() : (order.getIoTime() != null ? order.getIoTime() : new Date()));
         update.setExecFlag("1");
         baseMapper.updateById(update);
     }

gear-ui3/src/views/wms/stockIoOrder/in.vue

@@ -38,6 +38,7 @@
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="单据编号" align="center" prop="orderCode" min-width="160" />
+      <el-table-column label="入库时间" align="center" prop="ioTime" min-width="160" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="160" />
       <el-table-column label="物料" align="center" min-width="220">
         <template #default="scope">
@@ -54,7 +55,6 @@
       </el-table-column>
       <el-table-column label="业务类型" align="center" prop="bizType" min-width="120" />
       <el-table-column label="责任人" align="center" prop="responsibleName" min-width="120" />
-      <el-table-column label="实际到货" align="center" prop="actualArrivalTime" min-width="160" />
       <el-table-column label="状态" align="center" width="90">
         <template #default="scope">
           <el-tag v-if="scope.row.revokeFlag === '1'" type="danger">已撤回</el-tag>
@@ -97,6 +97,18 @@
               <el-input v-model="editForm.responsibleName" placeholder="请输入责任人" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="入库时间" prop="ioTime">
+              <el-date-picker
+                v-model="editForm.ioTime"
+                type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                format="YYYY-MM-DD HH:mm:ss"
+                :disabled-date="disabledAfterToday"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="editForm.remark" placeholder="请输入备注" />
@@ -183,8 +195,8 @@
         <el-descriptions :title="'单号：' + (detailData.order.orderCode || '-')" :column="2" border>
           <el-descriptions-item label="类型">入库</el-descriptions-item>
           <el-descriptions-item label="业务类型">{{ detailData.order.bizType }}</el-descriptions-item>
+          <el-descriptions-item label="入库时间">{{ detailData.order.ioTime || '-' }}</el-descriptions-item>
           <el-descriptions-item label="责任人">{{ detailData.order.responsibleName }}</el-descriptions-item>
-          <el-descriptions-item label="实际到货">{{ detailData.order.actualArrivalTime || '-' }}</el-descriptions-item>
           <el-descriptions-item label="确认入库人">{{ detailData.order.confirmInBy || '-' }}</el-descriptions-item>
           <el-descriptions-item label="撤回人">{{ detailData.order.revokeBy || '-' }}</el-descriptions-item>
         </el-descriptions>
@@ -462,6 +474,7 @@ export default {
         ioType: 'I',
         bizType: undefined,
         responsibleName: undefined,
+        ioTime: this.formatDateTime(new Date()),
         remark: undefined
       }
       this.editDetails = []
@@ -520,6 +533,11 @@ export default {
       const ss = pad(d.getSeconds())
       return `${yyyy}-${MM}-${dd} ${HH}:${mm}:${ss}`
     },
+    disabledAfterToday(date) {
+      const end = new Date()
+      end.setHours(23, 59, 59, 999)
+      return date.getTime() > end.getTime()
+    },
     onFlowMaterialChange(material) {
       this.flowItemName = material && material.materialName ? material.materialName : ''
       if (this.flowForm.itemId) {

gear-ui3/src/views/wms/stockIoOrder/out.vue

@@ -35,6 +35,7 @@
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="单据编号" align="center" prop="orderCode" min-width="160" />
+      <el-table-column label="出库时间" align="center" prop="ioTime" min-width="160" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="160" />
       <el-table-column label="物料" align="center" min-width="220">
         <template #default="scope">
@@ -91,6 +92,18 @@
               <el-input v-model="editForm.responsibleName" placeholder="请输入责任人" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="出库时间" prop="ioTime">
+              <el-date-picker
+                v-model="editForm.ioTime"
+                type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                format="YYYY-MM-DD HH:mm:ss"
+                :disabled-date="disabledAfterToday"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="editForm.remark" placeholder="请输入备注" />
@@ -167,6 +180,7 @@
         <el-descriptions :title="'单号：' + (detailData.order.orderCode || '-')" :column="2" border>
           <el-descriptions-item label="类型">出库</el-descriptions-item>
           <el-descriptions-item label="业务类型">{{ detailData.order.bizType }}</el-descriptions-item>
+          <el-descriptions-item label="出库时间">{{ detailData.order.ioTime || '-' }}</el-descriptions-item>
           <el-descriptions-item label="责任人">{{ detailData.order.responsibleName }}</el-descriptions-item>
           <el-descriptions-item label="撤回人">{{ detailData.order.revokeBy || '-' }}</el-descriptions-item>
         </el-descriptions>
@@ -420,6 +434,7 @@ export default {
         ioType: 'O',
         bizType: undefined,
         responsibleName: undefined,
+        ioTime: this.formatDateTime(new Date()),
         remark: undefined
       }
       this.editDetails = []
@@ -478,6 +493,11 @@ export default {
       const ss = pad(d.getSeconds())
       return `${yyyy}-${MM}-${dd} ${HH}:${mm}:${ss}`
     },
+    disabledAfterToday(date) {
+      const end = new Date()
+      end.setHours(23, 59, 59, 999)
+      return date.getTime() > end.getTime()
+    },
     onFlowMaterialChange(material) {
       this.flowItemName = material && material.materialName ? material.materialName : ''
       if (this.flowForm.itemId) {