Skip to content

D
dsyerp
Commit 272f55eb authored by wxl's avatar wxl
Browse files
Options

添加出入库备注

parent d217ba86
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 80 deletions
module/Store/src/Controller/GoodsController.php
View file @ 272f55eb
......@@ -505,6 +505,7 @@ class GoodsController extends AbstractActionController
$value->otherAddTime = $otherWarehouseOrderInfo->getOtherAddTime();
$value->WarehouseOrderSn = $otherWarehouseOrderInfo->getWarehouseOrderSn();
$value->WarehouseName = $otherWarehouseOrderInfo->getOneWarehouse()->getWarehouseName();
$value->WarehouseOrderInfo = $otherWarehouseOrderInfo->getWarehouseOrderInfo();
}
}
return ['goodsInfo' => $goodsInfo, 'otherWarehouseOrder' => $otherWarehouseOrderInfo, 'orderGoods'=>$orderGoods];
......@@ -534,6 +535,7 @@ class GoodsController extends AbstractActionController
$value->exAddTime = $exWarehouseOrderInfo->getExAddTime();
$value->ExWarehouseOrderSn = $exWarehouseOrderInfo->getExWarehouseOrderSn();
$value->WarehouseName = $exWarehouseOrderInfo->getOneWarehouse()->getWarehouseName();
$value->ExWarehouseOrderInfo = $exWarehouseOrderInfo->getExWarehouseOrderInfo();
}
}
return ['goodsInfo' => $goodsInfo, 'exWarehouseOrder' => $exWarehouseOrderInfo, 'orderGoods' => $orderGoods];
......
module/Store/view/store/goods/export-goods.phtml
View file @ 272f55eb
<div class="content-wrapper">
<section class="content-header">
<?php echo $this->partial('layout/breadcrumb'); ?>
<h1 class="pull-right" id="dbshop-menu-top">
<a href="<?php echo $this->url('goods');?>" class="btn btn-default btn-sm"><i class="fa fa-arrow-left"></i> <?php echo $this->translate('返回商品列表'); ?></a>
<?php echo $this->HelpUrl('importGoods'); ?>
</h1>
</section>
<section class="content">
<div class="row">
<div class="col-md-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title"><?php echo $this->translate('批量导入商品'); ?></h3>
</div>
<?php
$form = $this->form;
$form->prepare();
?>
<?php echo $this->form()->openTag($form); ?>
<div class="box-body">
<?php echo $this->partial('layout/messages'); ?>
<div class="form-group">
<label class="col-sm-2 control-label"><?php echo $this->translate('上传Excel文件'); ?><span class="must_add_value">*</span></label>
<div class="col-sm-4">
<?php echo $this->formElement($form->get('importFile')); ?>
<?php echo $this->formElementErrors($form->get('importFile'), ['class'=>'error-message']); ?>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><?php echo $this->translate('例子文件'); ?></label>
<div class="col-sm-6">
<a href="<?php echo $this->basePath('upload/common/importGoods.xlsx'); ?>" class="btn btn-default"><i class="fa fa-cloud-download" aria-hidden="true"></i> <?php echo $this->translate('点击下载例子文件'); ?></a>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"></label>
<div class="col-sm-6">
<button type="submit" class="btn btn-primary"><i class="fa fa-check"></i> <?php echo $this->translate('点击导入商品'); ?></button>
</div>
</div>
</div>
<?php echo $this->form()->closeTag(); ?>
</div>
</div>
</div>
</section>
</div>
<script type="text/javascript">
$(document).ready(function() {
$("#<?php echo $form->getName(); ?>").validate({
rules: {
importFile: {
required: true
}
},
messages: {
importFile: {
required: "<?php echo $this->translate('导入文件不能为空!'); ?>"
}
},
submitHandler:function(form){
layer.msg('商品正在导入……，请不要关闭当前页面', {
icon: 16
,shade: 0.01
,time: 900000
});
form.submit();
}
});
});
</script>
\ No newline at end of file
module/Store/view/store/goods/exwarehousegoods.phtml
View file @ 272f55eb
......@@ -34,10 +34,11 @@
<th><?php echo $this->translate('单位'); ?></th>
<th><?php echo $this->translate('出库单价'); ?></th>
<th><?php echo $this->translate('出库数量'); ?></th>
<th width="10%"><?php echo $this->translate('出库总价'); ?></th>
<th><?php echo $this->translate('出库单号'); ?></th>
<th><?php echo $this->translate('仓库'); ?></th>
<th><?php echo $this->translate('出库时间'); ?></th>
<th width="10%"><?php echo $this->translate('出库总价'); ?></th>
<th><?php echo $this->translate('出库备注'); ?></th>
</tr>
</thead>
<?php foreach ($this->orderGoods as $goodsValue) { ?>
......@@ -48,10 +49,11 @@
<td><?php echo $this->escapeHtml($goodsValue->getGoodsUnit()); ?></td>
<td><?php echo $this->erpCurrencyFormat($goodsValue->getWarehouseGoodsPrice()); ?></td>
<td><?php echo $goodsValue->getWarehouseGoodsExNum(); ?></td>
<td><?php echo $this->erpCurrencyFormat($goodsValue->getWarehouseGoodsAmount()); ?></td>
<td><?php echo $goodsValue->ExWarehouseOrderSn; ?></td>
<td><?php echo $goodsValue->WarehouseName; ?></td>
<td><?php echo date("Y-m-d H:i:s", $goodsValue->exAddTime); ?></td>
<td><?php echo $this->erpCurrencyFormat($goodsValue->getWarehouseGoodsAmount()); ?></td>
<td><?php echo $goodsValue->ExWarehouseOrderInfo; ?></td>
</tr>
<?php } ?>
......
module/Store/view/store/goods/otherwarehousegoods.phtml
View file @ 272f55eb
......@@ -33,10 +33,11 @@
<th><?php echo $this->translate('单位'); ?></th>
<th><?php echo $this->translate('入库单价'); ?></th>
<th><?php echo $this->translate('入库数量'); ?></th>
<th width="10%"><?php echo $this->translate('入库总价'); ?></th>
<th><?php echo $this->translate('入库单号'); ?></th>
<th><?php echo $this->translate('仓库'); ?></th>
<th><?php echo $this->translate('入库时间'); ?></th>
<th width="10%"><?php echo $this->translate('入库总价'); ?></th>
<th><?php echo $this->translate('入库备注'); ?></th>
</tr>
</thead>
<?php foreach ($this->orderGoods as $goodsValue) { ?>
......@@ -47,10 +48,11 @@
<td><?php echo $this->escapeHtml($goodsValue->getGoodsUnit()); ?></td>
<td><?php echo $this->erpCurrencyFormat($goodsValue->getWarehouseGoodsPrice()); ?></td>
<td><?php echo $goodsValue->getWarehouseGoodsBuyNum(); ?></td>
<td><?php echo $this->erpCurrencyFormat($goodsValue->getWarehouseGoodsAmount()); ?></td>
<td><?php echo $goodsValue->WarehouseOrderSn; ?></td>
<td><?php echo $goodsValue->WarehouseName; ?></td>
<td><?php echo date("Y-m-d H:i:s", $goodsValue->otherAddTime); ?></td>
<td><?php echo $this->erpCurrencyFormat($goodsValue->getWarehouseGoodsAmount()); ?></td>
<td><?php echo $goodsValue->WarehouseOrderInfo; ?></td>
</tr>
<?php } ?>
......
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