From 6f7531deb9cea138b705f0f613c1ecf8e045f97a Mon Sep 17 00:00:00 2001 From: mzl Date: Wed, 22 Oct 2025 16:16:27 +0800 Subject: [PATCH 1/2] Merge branch 'develop' --- .../utils/pdf/template/stockOrder copy 2.stub | 336 ++++++++++++++++++ app/common/utils/pdf/template/stockOrder.stub | 165 +++++---- 2 files changed, 436 insertions(+), 65 deletions(-) create mode 100644 app/common/utils/pdf/template/stockOrder copy 2.stub diff --git a/app/common/utils/pdf/template/stockOrder copy 2.stub b/app/common/utils/pdf/template/stockOrder copy 2.stub new file mode 100644 index 0000000..20b10b3 --- /dev/null +++ b/app/common/utils/pdf/template/stockOrder copy 2.stub @@ -0,0 +1,336 @@ + + + + + 合塑实业-汽车事业部-备货单(客户下定) + + + +
+ +
+

合塑实业-汽车事业部-备货单(客户下定)

+
+ 备货单号: + 业务员: +
+
+ + + + + + + + + + + + + + + + + + + + + +
阿里订单号/PI号: 日期: 清关目的国: 客户来源: 客户名称: 客户所在国:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0): ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
编号车型数量/台颜色/外颜色/内收款价总价官方指导价/二手挂牌价优惠利润
+ + + + 0): ?> + () + + + +
改装费FOB运费车价海运费佣金挂账港杂
+ 备注: + + +
+ 合同汇率: + + 合计到岸价: +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
清关人: 全款收齐日: 预计发运日期: 出运方式: 国内收货港: 贸易条款/清关目的港: /提车日期: 最迟到港时间:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
计划收款信息序号汇款国日期币种账户汇款人金额
+ + +
+ +
+ +
+ 业务员签字： + + + + + +
+ +
+ 备发货负责人签字： + + + + + +
+
+ + +
+
+ 组长签字： + + + + + +
+ +
+ 日期： + +
+
+ +
+
+ + +
+ + \ No newline at end of file diff --git a/app/common/utils/pdf/template/stockOrder.stub b/app/common/utils/pdf/template/stockOrder.stub index 20b10b3..697b8eb 100644 --- a/app/common/utils/pdf/template/stockOrder.stub +++ b/app/common/utils/pdf/template/stockOrder.stub @@ -124,81 +124,116 @@ 编号 车型 - 数量/台 - 颜色/外 - 颜色/内 - 收款价 - 总价 - 官方指导价/二手挂牌价 - 优惠 - 利润 + 数量 + 颜色 + 费用明细 + - - - - - - - 0): ?> - () + + + + + + + + + + + + 0): ?> + (km) + + + + + + + + + + + 外饰：

+ 内饰： + + + + 改装费 + 配件费 + 收款价 + 总价 + 官方指导价/二手挂牌价 + 优惠 + 利润 + + + + + + + + + + 0): ?> + + + + + + + - - - - - - - - - - 0): ?> - - - - - - - - - - - 改装费 - FOB运费 - 车价 - 海运费 - 佣金 - 挂账 - 港杂 - - - - - - - - - - - - - 备注: - - - - - + + + + + + + 报关价 + FOB运费 + 车价 + 海运费 + 佣金 + 挂账 + 港杂 + + + + + + + + + + + + + + + + 备注 + + + + + + + + - - 合同汇率: + + + 合同汇率: + - - 合计到岸价: + + 合计到岸价: + From 30ffb87811a23158271d000099c5ffcb838f46cc Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 23 Oct 2025 14:18:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B8=AF=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/SysPortService.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/common/service/SysPortService.php b/app/common/service/SysPortService.php index 530fcbf..5235638 100644 --- a/app/common/service/SysPortService.php +++ b/app/common/service/SysPortService.php @@ -27,8 +27,6 @@ class SysPortService if(isset($params['scene']) && $params['scene']) { if($params['scene'] == 'domestic'){ $where['country_id'] = 45; - }else{ - $where[] = ['country_id', '<>', 45]; } } return $this->logic->getList($where);