Skip to content

D
dsyerp
Commit c962fe4c authored by sugar's avatar sugar
Browse files
Options

Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/dsyerp into dev

parents 1dfd5233 892612ef
Show whitespace changes
Inline Side-by-side
Showing with 175 additions and 14 deletions
module/Purchase/src/Entity/WarehouseOrder.php
View file @ c962fe4c
......@@ -93,7 +93,7 @@ class WarehouseOrder extends BaseEntity
*/
private $adminId;
/**
* 采购时间
* 时间
* @ORM\Column(name="create_time", type="integer", length=10)
*/
private $createTime;
......
module/Purchase/src/Repository/OrderReturnRepository.php
View file @ c962fe4c
......@@ -47,8 +47,8 @@ class OrderReturnRepository extends EntityRepository
if(isset($search['supplier_phone']) && !empty($search['supplier_phone'])) $queryBuilder->andWhere($queryBuilder->expr()->like('p.supplierPhone', "'%".$search['supplier_phone']."%'"));
if(isset($search['supplier_id']) && $search['supplier_id'] > 0) $queryBuilder->andWhere($queryBuilder->expr()->eq('p.supplierId', $search['supplier_id']));
if(isset($search['return_state']) && !empty($search['return_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.returnState', $search['return_state']));
if(isset($search['start_time']) && !empty($search['start_time'])) $queryBuilder->andWhere($queryBuilder->expr()->gte('o.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
if(isset($search['end_time']) && !empty($search['end_time'])) $queryBuilder->andWhere($queryBuilder->expr()->lte('o.createTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
if(isset($search['start_time']) && !empty($search['start_time'])) $queryBuilder->andWhere($queryBuilder->expr()->gte('o.returnTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
if(isset($search['end_time']) && !empty($search['end_time'])) $queryBuilder->andWhere($queryBuilder->expr()->lte('o.returnTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
return $queryBuilder;
}
......
module/Purchase/view/purchase/order-return/index.phtml
View file @ c962fe4c
......@@ -26,7 +26,8 @@
<th width="10%"><?php echo $this->translate('联系电话'); ?></th>
<th width="10%"><?php echo $this->translate('退货金额'); ?></th>
<th width="6%"><?php echo $this->translate('状态'); ?></th>
<th width="10%"><?php echo $this->translate('退货时间'); ?></th>
<th width="10%"><?php echo $this->translate('申请退货时间'); ?></th>
<th width="10%"><?php echo $this->translate('完成退货时间'); ?></th>
<th width="15%"><?php echo $this->translate('操作'); ?></th>
</tr>
<?php
......@@ -76,6 +77,7 @@
<?php echo $this->formElementErrors($sForm->get('start_time'), ['class'=>'error-message']); ?>
<?php echo $this->formElementErrors($sForm->get('end_time'), ['class'=>'error-message']); ?>
</td>
<td></td>
<td>
<button type="submit" class="btn btn-info btn-sm"><i class="fa fa-search"></i></button>
<?php if(!empty(array_filter($sForm->getData()))) { ?>
......@@ -95,6 +97,7 @@
<td><?php echo $this->erpCurrencyFormat($order->getPOrderReturnAmount());?></td>
<td><?php echo $this->PurchaseHelper()->orderReturnState($order->getReturnState(), 2); ?></td>
<td><?php echo date("Y-m-d H:i", $order->getReturnTime()); ?></td>
<td><?php echo $order->getReturnFinishTime()?date("Y-m-d H:i", $order->getReturnFinishTime()):''; ?></td>
<td>
<a href="<?php echo $this->url('order-return',
['action'=>'view', 'id'=>$order->getOrderReturnId()]); ?>" class="btn btn-xs btn-info"><i class="fa fa-info-circle"></i> <?php echo $this->translate('查看'); ?></a>
......@@ -120,3 +123,7 @@
</section>
</div>
<script type="text/javascript">
laydate.render({elem: '#start_time'});
laydate.render({elem: '#end_time'});
</script>
\ No newline at end of file
module/Purchase/view/purchase/order-return/view.phtml
View file @ c962fe4c
......@@ -65,7 +65,7 @@
<div class="row">
<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->returnInfo->getreturnTime());?>
<b><?php echo $this->translate('退货时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->returnInfo->getReturnFinishTime());?>
</div>
</div>
<div class="col-xs-8 form-group">
......
module/Purchase/view/purchase/warehouse-order/index.phtml
View file @ c962fe4c
......@@ -129,3 +129,7 @@
</section>
</div>
<script type="text/javascript">
laydate.render({elem: '#start_time'});
laydate.render({elem: '#end_time'});
</script>
\ No newline at end of file
module/Purchase/view/purchase/warehouse-order/view.phtml
View file @ c962fe4c
......@@ -93,7 +93,7 @@
<div class="row">
<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());?>
<b><?php echo $this->translate('入库时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->orderInfo->getCreateTime());?>
</div>
</div>
<div class="col-xs-8 form-group">
......
module/Sales/src/Entity/SalesOrder.php
View file @ c962fe4c
......@@ -119,7 +119,7 @@ class SalesOrder extends BaseEntity
private $adminId;
/**
* 采购时间
* 时间
* @ORM\Column(name="create_time", type="integer", length=10)
*/
private $createTime;
......
module/Sales/src/Entity/SalesSendOrder.php
View file @ c962fe4c
......@@ -57,6 +57,11 @@ class SalesSendOrder
*/
private $adminId;
/**
* 时间
* @ORM\Column(name="create_time", type="integer", length=10)
*/
private $createTime;
/**
* 一对一，销售订单
* @ORM\OneToOne(targetEntity="Sales\Entity\SalesOrder")
......@@ -160,4 +165,20 @@ class SalesSendOrder
$this->adminId = $adminId;
}
/**
* @return mixed
*/
public function getCreateTime()
{
return $this->createTime;
}
/**
* @param mixed $createTime
*/
public function setCreateTime($createTime)
{
$this->createTime = $createTime;
}
}
\ No newline at end of file
module/Sales/src/Form/SearchSalesOrderReturnForm.php
View file @ c962fe4c
......@@ -113,6 +113,25 @@ class SearchSalesOrderReturnForm 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()
......@@ -187,6 +206,23 @@ class SearchSalesOrderReturnForm 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/Form/SearchSendOrderForm.php
View file @ c962fe4c
......@@ -112,6 +112,25 @@ class SearchSendOrderForm 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 +217,22 @@ class SearchSendOrderForm 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/SalesOrderReturnRepository.php
View file @ c962fe4c
......@@ -48,6 +48,8 @@ class SalesOrderReturnRepository extends EntityRepository
if(isset($search['customer_phone']) && !empty($search['customer_phone'])) $queryBuilder->andWhere($queryBuilder->expr()->like('o.customerPhone', "'%".$search['customer_phone']."%'"));
if(isset($search['customer_id']) && $search['customer_id'] > 0) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.customerId', $search['customer_id']));
if(isset($search['return_state']) && !empty($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.returnTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
if(isset($search['end_time']) && !empty($search['end_time'])) $queryBuilder->andWhere($queryBuilder->expr()->lte('s.returnTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
return $queryBuilder;
}
......
module/Sales/src/Repository/SalesSendOrderRepository.php
View file @ c962fe4c
......@@ -49,6 +49,9 @@ class SalesSendOrderRepository extends EntityRepository
if(isset($search['receivables_code']) && !empty($search['receivables_code'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.receivablesCode', ':code'))->setParameter('code', $search['receivables_code']);
if(isset($search['sales_order_state']) && is_numeric($search['sales_order_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.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/SalesSendOrderManager.php
View file @ c962fe4c
......@@ -47,6 +47,7 @@ class SalesSendOrderManager
$sendOrder->setReturnState(0);
$sendOrder->setAdminId($adminId);
$sendOrder->setOneSalesOrder($salesOrder);
$sendOrder->setCreateTime(time());
$this->entityManager->persist($sendOrder);
$this->entityManager->flush();
......
module/Sales/view/sales/sales-order-return/index.phtml
View file @ c962fe4c
......@@ -27,6 +27,8 @@
<th width="10%"><?php echo $this->translate('联系电话'); ?></th>
<th width="10%"><?php echo $this->translate('退货金额'); ?></th>
<th width="6%"><?php echo $this->translate('状态'); ?></th>
<th width="10%"><?php echo $this->translate('申请退货时间'); ?></th>
<th width="10%"><?php echo $this->translate('完成退货时间'); ?></th>
<th width="18%"><?php echo $this->translate('操作'); ?></th>
</tr>
<?php
......@@ -70,6 +72,17 @@
<?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></td>
<td>
<button type="submit" class="btn btn-info btn-sm"><i class="fa fa-search"></i></button>
<?php if(!empty(array_filter($sForm->getData()))) { ?>
......@@ -89,6 +102,8 @@
<td><?php echo $this->escapeHtml($order->getOneSalesOrder()->getCustomerPhone()); ?></td>
<td><?php echo $this->erpCurrencyFormat($order->getSalesOrderReturnAmount());?></td>
<td><?php echo $this->salesHelper()->salesOrderReturnState($order->getReturnState(), 2); ?></td>
<td><?php echo date("Y-m-d H:i", $order->getReturnTime()); ?></td>
<td><?php echo $order->getReturnFinishTime()?date("Y-m-d H:i", $order->getReturnFinishTime()):''; ?></td>
<td>
<a href="<?php echo $this->url('sales-order-return',
['action'=>'view', 'id'=>$order->getSalesOrderReturnId()]); ?>" class="btn btn-xs btn-info"><i class="fa fa-info-circle"></i> <?php echo $this->translate('查看'); ?></a>
......@@ -114,3 +129,7 @@
</section>
</div>
<script type="text/javascript">
laydate.render({elem: '#start_time'});
laydate.render({elem: '#end_time'});
</script>
\ No newline at end of file
module/Sales/view/sales/sales-order-return/view.phtml
View file @ c962fe4c
......@@ -75,7 +75,12 @@
<b><?php echo $this->translate('客户座机'); ?>：</b><?php echo $this->escapeHtml($this->returnInfo->getOneSalesOrder()->getCustomerTelephone());?>
</div>
</div>
<div class="col-xs-8 form-group">
<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->returnInfo->getReturnFinishTime());?>
</div>
</div>
<div class="col-xs-4 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('收货地址'); ?>：</b><?php echo $this->escapeHtml($this->returnInfo->getOneSalesOrder()->getCustomerAddress());?>
</div>
......
module/Sales/view/sales/sales-order/index.phtml
View file @ c962fe4c
......@@ -150,3 +150,7 @@
</section>
</div>
<script type="text/javascript">
laydate.render({elem: '#start_time'});
laydate.render({elem: '#end_time'});
</script>
\ No newline at end of file
module/Sales/view/sales/sales-order/view.phtml
View file @ c962fe4c
......@@ -74,7 +74,7 @@
</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());?>
<b><?php echo $this->translate('订单时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->orderInfo->getCreateTime());?>
</div>
</div>
</div>
......
module/Sales/view/sales/sales-send-order/index.phtml
View file @ c962fe4c
......@@ -28,6 +28,7 @@
<th width="10%"><?php echo $this->translate('收款金额'); ?></th>
<th width="6%"><?php echo $this->translate('状态'); ?></th>
<th width="6%"><?php echo $this->translate('退货'); ?></th>
<th width="10%"><?php echo $this->translate('发货时间'); ?></th>
<th width="15%"><?php echo $this->translate('操作'); ?></th>
</tr>
<?php
......@@ -76,6 +77,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
......@@ -98,6 +109,7 @@
<td><?php echo $this->erpCurrencyFormat($order->getOneSalesOrder()->getSalesOrderAmount());?></td>
<td><?php echo $this->salesHelper()->salesOrderState($order->getOneSalesOrder()->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>
<a href="<?php echo $this->url('sales-send-order',
['action'=>'view', 'id'=>$order->getSendOrderId()]); ?>"
......@@ -123,3 +135,7 @@
</section>
</div>
<script type="text/javascript">
laydate.render({elem: '#start_time'});
laydate.render({elem: '#end_time'});
</script>
\ No newline at end of file
module/Sales/view/sales/sales-send-order/view.phtml
View file @ c962fe4c
......@@ -81,6 +81,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->sendOrderInfo->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->sendOrderInfo->getOneSalesOrder()->getSalesOrderInfo());?>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment