Commit Graph

93 Commits

Author SHA1 Message Date
ljw
cd4b0d7f9d Merge remote-tracking branch 'orinin/main' 2024-11-26 16:35:56 +08:00
ljw
975ba7f974 fix:
1.配件发货明细表数据重复修复
2024-11-26 16:35:32 +08:00
zzs
9a81a8781f fix:报表国贸订单明细数据错误 2024-11-26 14:14:48 +08:00
zzs
03844240a0 feat:出口报关明细,海运费、保费改为取结算币别 2024-11-25 18:49:58 +08:00
zzs
e99e3380d3 fix:国贸订单明细重复行 2024-11-25 18:49:42 +08:00
ljw
f35fdecc63 fix:
1.整机发货明细表
2024-11-22 18:48:03 +08:00
ljw
31386ef6dc fix:
1.发运明细单(单证)报表日期汇总显示
2024-11-15 23:56:06 +08:00
ljw
813c72a5db fix:
1.发运明细单(单证)报表日期汇总显示
2024-11-15 23:32:22 +08:00
ljw
c62ff30599 fix:
1.报表处理
2.订舱通知单增加效验
2024-11-14 18:50:08 +08:00
ljw
9102995aa3 fix:
1.国贸订单生产线缺少值
2024-11-14 15:16:37 +08:00
ljw
873234cfda fix:
1.发货明细表(未发货)起运港  目的港没有带出来
2024-11-13 20:34:46 +08:00
ljw
dece3cf388 fix:
1.业务分类为整机、提成分类为整机且是否赠品为否
2024-11-13 20:34:39 +08:00
ljw
8098107719 fix:
1.销售提成-整机 功能完善
2024-11-13 20:34:14 +08:00
ljw
9abd286265 fix:
外销合同变更单审核生成资金池
2024-10-16 19:20:55 +08:00
ljw
07d8562ae2 fix:
销售提成配件报表处理
2024-10-16 18:58:20 +08:00
ljw
194d791d62 fix:发运明细表报错处理 2024-09-21 20:41:48 +08:00
ljw
6b2bb8715e fix:发运明细表报错处理 2024-09-21 16:09:06 +08:00
ljw
b4e48b88a8 fix:配件未发货明细表逻辑修改 2024-09-20 20:18:58 +08:00
ljw
6f77354be4 配件已发货明细表逻辑修改 2024-09-11 20:05:08 +08:00
ljw
52391d9725 Merge branch 'test' 2024-09-11 15:34:24 +08:00
ljw
5446b00e36 配件已发货明细表逻辑修改 2024-09-11 15:34:19 +08:00
ljw
b5671aea9f 配件未发货明细表逻辑修改 2024-09-11 15:34:18 +08:00
ljw
e2d3be798e Merge branch 'fix-report-zzs' 2024-09-09 11:47:41 +08:00
ljw
071236a7ef Merge branch 'dev-ljw' into test 2024-09-09 11:29:47 +08:00
ljw
a70870989d Revert "配件发货明细表(已发货)"
This reverts commit d2f0ee555b.
2024-09-09 10:34:54 +08:00
ljw
d2f0ee555b 配件发货明细表(已发货) 2024-09-09 10:33:07 +08:00
zzs01@yunemao.com
a3757c38ed Merge branch 'fix-report-zzs' into test 2024-09-09 10:30:55 +08:00
zzs01@yunemao.com
17228240da fix:出口报关明细报表 2024-09-09 09:53:12 +08:00
ljw
f80ab3761c 出口报关明细开票金额更换 2024-09-09 09:31:17 +08:00
zzs01@yunemao.com
68359ed3dd Revert "fix:出口报关明细报表"
This reverts commit 9783f6cbb0.
2024-09-09 09:31:04 +08:00
zzs01@yunemao.com
9783f6cbb0 fix:出口报关明细报表 2024-09-09 09:17:29 +08:00
zzs01@yunemao.com
5d2c224238 Merge branch 'dev-declaration' into fix-report-zzs 2024-09-09 09:14:41 +08:00
ljw
9be8a84a57 配件发货明细表(已发货) 2024-09-07 14:07:21 +08:00
ljw
1c85620d5b 出口报关明细开票金额更换 2024-09-07 14:07:21 +08:00
ljw
671b33287d 配件发货明细表(已发货) 2024-09-07 11:20:47 +08:00
ljw
26d48a62e2 出口报关明细开票金额更换 2024-09-07 10:40:01 +08:00
ljw
22da2d8574 Merge branch 'test' into dev-ljw 2024-09-07 10:36:07 +08:00
d8d13f7dbc Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-06 19:28:09 +08:00
9928b2fb86 change:国贸订单明细 2024-09-06 19:23:43 +08:00
ljw
dea7868d6b 发运明细表(未发货)修复 2024-09-06 17:37:23 +08:00
zzs01@yunemao.com
752f50ebc3 Merge branch 'fix-report-zzs' into test 2024-09-06 15:34:52 +08:00
zzs01@yunemao.com
7f3dcb4e65 Merge branch 'fix-report-zzs' 2024-09-06 15:34:43 +08:00
zzs01@yunemao.com
51d8af6a7d change:整机发运明细表 2024-09-06 15:34:25 +08:00
ljw
fbe6d5d043 配件发货明细表(未发货) 2024-09-06 15:23:03 +08:00
zzs01@yunemao.com
0c6187c580 Merge branch 'fix-report-zzs' into test 2024-09-06 14:05:47 +08:00
zzs01@yunemao.com
3a8c70150c Merge branch 'fix-report-zzs' 2024-09-06 14:02:36 +08:00
ljw
50f0645265 发运明细表(提成)修复 2024-09-06 14:02:23 +08:00
ljw
177a6d76b0 发运明细表(提成)修复 2024-09-06 11:40:36 +08:00
zzs01@yunemao.com
b5900ccd56 change:整机发运明细表 2024-09-06 10:22:15 +08:00
8dc3b760ed Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-05 22:19:49 +08:00