添加销售订单时间

module/Sales/src/Entity/SalesOrder.php

@@ -118,6 +118,13 @@ class SalesOrder extends BaseEntity
      */
     private $adminId;
 
+    /**
+     * 采购时间
+     * @ORM\Column(name="create_time", type="integer", length=10)
+     */
+    private $createTime;
+
+
     /**
      * @var
      * @ORM\OneToOne(targetEntity="Customer\Entity\Customer")
@@ -365,6 +372,23 @@ class SalesOrder extends BaseEntity
         $this->adminId = $adminId;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     */
+    public function setCreateTime($createTime)
+    {
+        $this->createTime = $createTime;
+    }
+
+
     /**
      * @return mixed
      */
@@ -380,4 +404,5 @@ class SalesOrder extends BaseEntity
     {
         $this->oneCustomer = $oneCustomer;
     }
+
 }
\ No newline at end of file

module/Sales/src/Form/SearchSalesOrderForm.php

@@ -121,6 +121,26 @@ class SearchSalesOrderForm extends Form
                 'class'         => 'form-control input-sm'
             ]
         ]);
+        $this->add([
+            'type'  => 'text',
+            'name'  => 'start_time',
+            'attributes'    => [
+                'id'            => 'start_time',
+                'class'         => 'form-control input-sm',
+                'placeholder'   => $this->translator->translate('起始时间')
+            ]
+        ]);
+
+        $this->add([
+            'type'  => 'text',
+            'name'  => 'end_time',
+            'attributes'    => [
+                'id'            => 'end_time',
+                'class'         => 'form-control input-sm',
+                'placeholder'   => $this->translator->translate('结束时间')
+            ]
+        ]);
+
     }
 
     public function addInputFilter()
@@ -198,5 +218,23 @@ class SearchSalesOrderForm extends Form
             'name'      => 'return_state',
             'required'  => false
         ]);
+        $inputFilter->add([
+            'name'      => 'start_time',
+            'required'  => false,
+            'filters'   => [
+                ['name' => 'StringTrim'],
+                ['name' => 'StripTags']
+            ]
+        ]);
+
+        $inputFilter->add([
+            'name'      => 'end_time',
+            'required'  => false,
+            'filters'   => [
+                ['name' => 'StringTrim'],
+                ['name' => 'StripTags']
+            ]
+        ]);
+
     }
 }
\ No newline at end of file

module/Sales/src/Repository/SalesOrderRepository.php

@@ -50,6 +50,8 @@ class SalesOrderRepository extends EntityRepository
         if(isset($search['receivables_code']) && !empty($search['receivables_code']))   $queryBuilder->andWhere($queryBuilder->expr()->eq('s.receivablesCode', ':code'))->setParameter('code', $search['receivables_code']);
         if(isset($search['sales_order_state']) && is_numeric($search['sales_order_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.salesOrderState', $search['sales_order_state']));
         if(isset($search['return_state']) && is_numeric($search['return_state']))           $queryBuilder->andWhere($queryBuilder->expr()->eq('s.returnState', $search['return_state']));
+        if(isset($search['start_time']) && !empty($search['start_time']))               $queryBuilder->andWhere($queryBuilder->expr()->gte('s.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
+        if(isset($search['end_time']) && !empty($search['end_time']))                   $queryBuilder->andWhere($queryBuilder->expr()->lte('s.createTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
 
         return $queryBuilder;
     }

module/Sales/src/Service/SalesOrderManager.php

@@ -50,6 +50,7 @@ class SalesOrderManager
         $salesOrder->setReturnState(0);
         $salesOrder->setAdminId($adminId);
         $salesOrder->setOneCustomer($customerInfo);
+        $salesOrder->setCreateTime(time());
 
         $array = ['salesOrderGoodsAmount' => 0, 'salesOrderTaxAmount' => 0, 'salesOrderAmount' => 0];
         foreach ($goodsData['goodsId'] as $key => $value) {

module/Sales/view/sales/sales-order/index.phtml

@@ -29,6 +29,7 @@
                                 <th width="10%"><?php echo $this->translate('收款金额'); ?></th>
                                 <th width="6%"><?php echo $this->translate('状态'); ?></th>
                                 <th width="5%"><?php echo $this->translate('退货'); ?></th>
+                                <th width="10%"><?php echo $this->translate('时间'); ?></th>
                                 <th width="15%"><?php echo $this->translate('操作'); ?></th>
                             </tr>
                             <?php
@@ -77,6 +78,16 @@
                                     <?php echo $this->formElement($sForm->get('return_state')); ?>
                                     <?php echo $this->formElementErrors($sForm->get('return_state'), ['class'=>'error-message']);?>
                                 </td>
+                                <td>
+                                    <p>
+                                        <?php echo  $this->formElement($sForm->get('start_time')); ?>
+                                    </p>
+                                    <div>
+                                        <?php echo  $this->formElement($sForm->get('end_time')); ?>
+                                    </div>
+                                    <?php echo $this->formElementErrors($sForm->get('start_time'), ['class'=>'error-message']); ?>
+                                    <?php echo $this->formElementErrors($sForm->get('end_time'), ['class'=>'error-message']); ?>
+                                </td>
                                 <td>
                                     <button type="submit" class="btn btn-info btn-sm"><i class="fa fa-search"></i></button>
                                     <?php
@@ -101,6 +112,7 @@
                                     <td><?php echo $this->erpCurrencyFormat($order->getSalesOrderAmount());?></td>
                                     <td><?php echo $this->salesHelper()->salesOrderState($order->getSalesOrderState(), 2); ?></td>
                                     <td><?php echo ($order->getReturnState() == 1 ? '<b class="text-danger">'.$this->translate('有').'</b>' : $this->translate('无')); ?></td>
+                                    <td><?php echo date("Y-m-d H:i", $order->getCreateTime()); ?></td>
                                     <td>
                                         <?php if($order->getSalesOrderState() == 0) { ?>
                                             <a href="<?php echo $this->url('sales-order',

module/Sales/view/sales/sales-order/view.phtml

@@ -73,6 +73,13 @@
                                 </div>
                             </div>
                             <div class="col-xs-4 form-group">
+                                <div class="col-sm-12">
+                                    <b><?php echo $this->translate('销售时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->orderInfo->getCreateTime());?>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-xs-8 form-group">
                                 <div class="col-sm-12">
                                     <b><?php echo $this->translate('备注'); ?>：</b><?php echo $this->escapeHtml($this->orderInfo->getSalesOrderInfo());?>
                                 </div>