Commit Graph

534 Commits

Author SHA1 Message Date
ljw
574478862b fix:外销合同变更单合同签章问题处理 2024-10-09 17:47:34 +08:00
ljw
fcc5e56c1a fix:外销合同变更单合同签章问题处理 2024-10-09 09:55:03 +08:00
ljw
13efa4b391 fix:外销合同变更单合同签章问题处理 2024-10-09 09:44:06 +08:00
ljw
27415a86b2 fix:外销合同变更单合同签章问题处理 2024-10-09 09:43:43 +08:00
ljw
d2a272e0bb fix:外销合同变更单合同签章问题处理 2024-10-09 09:41:25 +08:00
ljw
b94d31f9eb fix:外销合同变更单合同签章问题处理 2024-10-08 18:09:48 +08:00
676b128aa6 1.修改贷记单提交后获取上次贷记单号节点 2024-10-08 15:42:44 +08:00
ljw
9d395b1f7b fix:计算闲置期倒计时 2024-10-08 15:41:49 +08:00
ljw
c9c595ea34 fix:外销合同变更单合同签章问题处理 2024-10-08 10:30:53 +08:00
ljw
b25b2e3495 fix:外销合同变更单合同签章问题处理 2024-10-08 09:53:22 +08:00
ljw
457a73cfd5 fix:外销合同提交服务插件 2024-09-30 16:55:14 +08:00
ljw
f7c690b4f1 fix:配件合同費用分攤報錯處理 2024-09-29 22:08:48 +08:00
ljw
8d91b96515 fix:报关对比 2024-09-29 21:58:59 +08:00
ljw
48a7df38ec Revert "fix:合同签章申请"
This reverts commit ccb7aa4a85.
2024-09-29 21:05:34 +08:00
ljw
8b65c813e1 fix:合同签章申请 2024-09-29 21:02:42 +08:00
ljw
9cc62548d9 fix:配件合同费用分摊 2024-09-29 21:02:40 +08:00
ljw
b721c88053 fix:报关对比 2024-09-29 19:33:01 +08:00
ljw
f222707c63 fix:信保回填报错处理 2024-09-27 22:36:41 +08:00
ljw
be7e31fae5 fix:内审预算单 2024-09-27 22:33:02 +08:00
ljw
c9af91ab5c fix:获取不为空的利息天数 2024-09-27 22:33:02 +08:00
38c1fe1d0f 1.修改收款金额、实际收款金额为0不会填 2024-09-27 22:33:01 +08:00
6e408c4fa6 1.修改输入实际收汇值更新光标数据消失 2024-09-27 22:33:00 +08:00
ljw
94676df392 fix:获取不为空的利息天数 2024-09-27 22:32:59 +08:00
ljw
039b02891e Revert "fix:收款单功能调整(审核时财务确认,调整至审批流)"
This reverts commit 936d3cef4c.
2024-09-27 10:43:24 +08:00
ljw
0f72583101 Revert "fix:收款单功能调整(审核时财务确认,调整至审批流)"
This reverts commit 50b9c137c9.
2024-09-27 10:43:21 +08:00
ljw
50b9c137c9 fix:收款单功能调整(审核时财务确认,调整至审批流) 2024-09-27 10:43:05 +08:00
ljw
936d3cef4c fix:收款单功能调整(审核时财务确认,调整至审批流) 2024-09-27 10:41:35 +08:00
ljw
c07f036840 fix:收款单报错处理 2024-09-26 22:30:14 +08:00
ljw
10aacfb7c0 fix:收款单报错处理 2024-09-26 22:10:54 +08:00
ljw
5f7948991f fix:报关单报关对比 2024-09-26 22:10:53 +08:00
ljw
5d6265f122 fix:产品经理下单确认报错 2024-09-26 14:22:48 +08:00
ljw
36af563da2 Revert "fix:合同签章申请"
This reverts commit 6eddee92ea.
2024-09-25 21:58:52 +08:00
ljw
8050609cad Revert "fix:合同签章申请"
This reverts commit b55fecb7fa.
2024-09-25 21:58:51 +08:00
ljw
b55fecb7fa fix:合同签章申请 2024-09-25 16:02:34 +08:00
ljw
6eddee92ea fix:合同签章申请 2024-09-25 14:44:51 +08:00
ljw
ac07c89372 fix:报关对比日志定时任务问题处理 2024-09-25 11:15:09 +08:00
ljw
a9b0deebb5 fix:报错处理 2024-09-24 21:48:48 +08:00
ljw
1d4466e3e5 fix:时间计算 2024-09-24 21:47:59 +08:00
ljw
060992387b fix:赠品行净重下单确认时不必填 2024-09-24 21:47:22 +08:00
9a6f438937 1.修改明细删除行提示null 2024-09-24 18:04:46 +08:00
ljw
18810f924d fix:单一窗口报关单反写出口报关单下推出口发票问题处理 2024-09-24 18:03:03 +08:00
ljw
8364d05f2a fix:外销合同变更单报错处理 2024-09-24 16:32:21 +08:00
ljw
480b492654 fix:外销合同变更单报错处理 2024-09-24 15:36:34 +08:00
zzs01@yunemao.com
43c5701dbd fix:发货联系书款项到位情况 2024-09-23 22:51:23 +08:00
ljw
978bdb2b26 fix:收款单财务确认功能更改至认领确认后 2024-09-23 22:49:42 +08:00
ljw
ecc9b889ae fix:衣总签章 2024-09-23 22:47:46 +08:00
ljw
3fa79bb04c Revert "fix:合同签章申请服务插件"
This reverts commit b0f6155c4b.
2024-09-23 22:46:54 +08:00
ljw
b0f6155c4b fix:合同签章申请服务插件 2024-09-23 22:46:32 +08:00
ljw
78f5579366 fix:收款单报错处理 2024-09-23 22:45:45 +08:00
ljw
377bb236cf fix:删除衣总签章 2024-09-23 22:44:24 +08:00
ljw
c4596c2bf7 fix:查询库存报错处理 2024-09-23 22:44:19 +08:00
ljw
f6f86c1d28 fix:收款单 2024-09-21 22:09:03 +08:00
a27582fae7 修改表头金额值更新调用保存 提交后调用刷新 2024-09-21 20:43:36 +08:00
ljw
d180dc7f14 fix:询价单审核时,价格库的禁用状态更新为可用 2024-09-21 20:41:49 +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
a878e6015d fix:配件价格库禁用按钮调用 2024-09-21 16:09:05 +08:00
ljw
b142e561f8 fix:装箱单报错处理 2024-09-21 11:05:50 +08:00
eef4daa0e8 1.增加合同签章只同步pdf格式文件
2.增加回签确认必须上传附件校验
2024-09-20 21:44:19 +08:00
28e7e9df7a 修改标签包含ensign盖章 2024-09-20 21:43:29 +08:00
ljw
11e24c935d fix:申报要素 2024-09-20 21:43:26 +08:00
ljw
b137e168b8 fix:配件价格库禁用按钮调用 2024-09-20 21:43:23 +08:00
ljw
449f6a8a8b fix:询价单替换 2024-09-20 21:43:19 +08:00
ee55ddee6c 1.增加外销合同上传附件 只校验 word格式存在标签;
2.增加框架合同上传附件 只校验 word格式存在标签;
3.增加框架合同合同签章同步云之家;
4.增加框架合同签章同步云之家回写;
2024-09-20 21:42:45 +08:00
ljw
68476609dc fix:提交时云之家标题拼接 2024-09-20 20:19:24 +08:00
ljw
d72ac65118 fix:配件价格库禁用按钮调用 2024-09-20 20:19:00 +08:00
ljw
6af1233925 fix:外销合同所有的物料都重新获取一遍申报要素 2024-09-20 20:18:59 +08:00
ljw
ec6e0ae2f3 fix:配件价格库禁用按钮调用 2024-09-20 20:18:59 +08:00
ljw
b4e48b88a8 fix:配件未发货明细表逻辑修改 2024-09-20 20:18:58 +08:00
ljw
e86bf0bb29 fix:保存时,按照 客户所在国 +买方英文名称+类型+信保限额申请 (4个字段,以空格间隔,拼接生成) 2024-09-20 20:18:57 +08:00
ljw
0091e8c9f7 fix:询价单过滤 2024-09-20 20:18:56 +08:00
ljw
ed0b238480 fix:工厂价逻辑取消 2024-09-20 20:18:56 +08:00
ljw
4ea3974eec fix:收款单审核改变单据状态 2024-09-20 20:18:55 +08:00
ljw
8c3730356b fix:配件价格库反审核调用 2024-09-19 19:19:25 +08:00
ljw
88510b0c60 fix:跟单任务控制台整机下拉值控制 2024-09-19 17:08:36 +08:00
ljw
ae2c51e7e0 fix:铭牌数量不允许低于本次非赠品行的整机数量 2024-09-19 15:28:34 +08:00
ljw
80219cf6dd fix:明细信息的销售方式包含CKD时,装柜信息的整机件数不锁定,其他情况都锁定 2024-09-18 22:54:47 +08:00
ljw
727a10a3a3 Revert "fix:明细信息的销售方式包含CKD时,装柜信息的整机件数不锁定,其他情况都锁定"
This reverts commit 93fa1a00
2024-09-18 22:39:47 +08:00
ljw
96e7ad5152 fix:外销合同软提示 2024-09-18 22:38:57 +08:00
ljw
ff033202d9 fix:调拨订单申请单提交效验 2024-09-18 22:38:56 +08:00
ljw
612d85537d fix:外销合同提交效验 2024-09-14 18:13:58 +08:00
ljw
b8eddb1823 fix:外销合同提交效验 2024-09-14 17:51:37 +08:00
ljw
eb2c1c4a3e fix:贷记单客户更改为集团客户 2024-09-14 16:30:25 +08:00
ljw
15361766d5 fix:贷记单客户更改为集团客户 2024-09-13 17:55:45 +08:00
ljw
571bb72581 fix:外销合同数量汇总 2024-09-13 16:13:10 +08:00
ljw
ff56780319 fix:外销合同报错处理 2024-09-13 13:35:16 +08:00
ljw
64faacc5b6 fix:外销合同报错处理 2024-09-13 13:35:15 +08:00
ljw
38287ec1cb fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 13:35:14 +08:00
ljw
95b5de8af1 fix:业务分类为整机并且是否赠品为是的必填 2024-09-13 13:35:13 +08:00
ljw
598d498aaa fix:业务分类为整机并且是否赠品为否的时候汇总 2024-09-13 11:27:26 +08:00
ljw
38b30e43ec fix:外销合同保存效验 2024-09-12 20:36:56 +08:00
ljw
546031f7c1 fix:外销合同保存效验 2024-09-12 20:36:55 +08:00
ljw
05b7799960 fix:云之家获取按钮 2024-09-12 17:37:41 +08:00
ljw
043c719773 fix:云之家获取按钮 2024-09-12 16:58:37 +08:00
zzs01@yunemao.com
91e9efd122 feat:整机价格 2024-09-12 16:11:42 +08:00
zzs01@yunemao.com
85d54a455f feat:整机价格 2024-09-12 16:06:25 +08:00
zzs01@yunemao.com
788f9a2aa8 feat:整机价格 2024-09-12 15:49:08 +08:00
zzs01@yunemao.com
135a1b4b5a fix:贷记单审核校验 2024-09-12 15:15:17 +08:00
ljw
f59cf5c382 fix:礼品领用申请审核 2024-09-12 11:35:29 +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
23ef73e3ac 外销合同:新增单据报错处理 2024-09-11 14:40:22 +08:00
zzs01@yunemao.com
9817b240bf fix:折扣率计算(价格条款)
(cherry picked from commit e039cda4b4)
2024-09-11 14:40:02 +08:00
zzs01@yunemao.com
fecad339e3 fix:折扣率计算
(cherry picked from commit 13c3d63ac2)
2024-09-11 14:40:01 +08:00
zzs01@yunemao.com
e039cda4b4 fix:折扣率计算(价格条款) 2024-09-11 14:39:10 +08:00
zzs01@yunemao.com
13c3d63ac2 fix:折扣率计算 2024-09-11 10:30:18 +08:00
zzs01@yunemao.com
70fefff998 fix:折扣率计算
(cherry picked from commit 9b0ddf97e2)
2024-09-11 09:36:40 +08:00
zzs01@yunemao.com
9b0ddf97e2 fix:折扣率计算 2024-09-11 09:33:35 +08:00
zzs01@yunemao.com
494f1bc86e change:折扣率计算 2024-09-10 19:31:13 +08:00
zzs01@yunemao.com
0cffc88208 Merge branch 'fix-discount-rate' into test 2024-09-10 19:02:00 +08:00
zzs01@yunemao.com
bf656fa44e fix:库区同步定时任务
(cherry picked from commit 618fc6c004)
2024-09-10 19:01:30 +08:00
zzs01@yunemao.com
618fc6c004 fix:库区同步定时任务 2024-09-10 19:00:49 +08:00
zzs01@yunemao.com
ad42a15754 change:折扣率计算 2024-09-10 19:00:19 +08:00
zzs01@yunemao.com
e04dd91174 wip:整机价格 2024-09-10 17:18:11 +08:00
zzs01@yunemao.com
a807b931db Merge branch 'refs/heads/fix-warehouse' into test 2024-09-10 16:46:13 +08:00
zzs01@yunemao.com
f6f7a2185f change:订单产品需求单下推库区库位携带取消 2024-09-10 16:27:39 +08:00
zzs01@yunemao.com
138a2b9a16 Merge branch 'dev-plm' into test 2024-09-10 15:38:59 +08:00
zzs01@yunemao.com
3eb9de8d7b fix:生成替换关系 2024-09-10 15:38:40 +08:00
zzs01@yunemao.com
e8d228de8e fix:贷记单提交报错
(cherry picked from commit 6db339b94f)
2024-09-10 14:37:27 +08:00
zzs01@yunemao.com
6db339b94f fix:贷记单提交报错 2024-09-10 14:36:51 +08:00
ljw
75850fd0e1 外销合同:提交效验附件面板是否有值 2024-09-10 14:29:02 +08:00
ljw
e524223637 销售出库审核效验 2024-09-10 14:29:02 +08:00
zzs01@yunemao.com
7bbd8ddc54 fix:生成替换关系 2024-09-10 14:27:50 +08:00
zzs01@yunemao.com
d195e76bbf fix:生成替换关系 2024-09-10 09:54:15 +08:00
zzs01@yunemao.com
7b5163db99 Merge branch 'dev-plm' into test 2024-09-09 18:14:48 +08:00
ljw
d553b4b1c6 外销合同:提交效验附件面板是否有值 2024-09-09 18:14:43 +08:00
zzs01@yunemao.com
51e0d68059 wip:整机价格 2024-09-09 18:14:04 +08:00
zzs01@yunemao.com
fc74f1b690 wip:PLM匹配 2024-09-09 17:58:30 +08:00
zzs01@yunemao.com
1c5a7e853f wip:获取标准价 2024-09-09 17:54:35 +08:00
zzs01@yunemao.com
a27d050b49 wip:获取标准价:销售FCA标配青岛单价、金额 2024-09-09 17:30:04 +08:00
zzs01@yunemao.com
5a2d7edaa0 wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价 2024-09-09 17:15:34 +08:00
zzs01@yunemao.com
a9e19605a4 wip:PLM匹配,生成替换关系 2024-09-09 16:23:41 +08:00
ljw
c11b14cf95 销售出库审核效验 2024-09-09 15:48:44 +08:00
zzs01@yunemao.com
5b224777e5 wip:PLM匹配,生成替换关系 2024-09-09 15:31:49 +08:00
ljw
e2d3be798e Merge branch 'fix-report-zzs' 2024-09-09 11:47:41 +08:00
zzs01@yunemao.com
9f60bc0f0c wip:PLM匹配,生成替换关系 2024-09-09 11:45:33 +08:00
ljw
532173b6dc Merge branch 'dev-change' into test 2024-09-09 11:29:51 +08:00
ljw
071236a7ef Merge branch 'dev-ljw' into test 2024-09-09 11:29:47 +08:00
zzs01@yunemao.com
2c1de947e9 Merge remote-tracking branch 'origin/test' into test 2024-09-09 10:37:43 +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
ljw
3c938c0b6d Merge branch 'dev-plm' into test 2024-09-09 10:29:12 +08:00
zzs01@yunemao.com
d442546b87 wip:PLM匹配,生成替换关系 2024-09-09 10:27:18 +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
0937b74657 Merge branch 'refs/heads/dev-book-payment' into test 2024-09-06 20:51:34 +08:00
cea38280d9 feat:发货联系书款项信息 2024-09-06 20:51:16 +08:00
d8d13f7dbc Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-06 19:28:09 +08:00
1e25a581d2 feat:发货联系书款项信息 2024-09-06 19:25:18 +08:00
9928b2fb86 change:国贸订单明细 2024-09-06 19:23:43 +08:00
ljw
a26db3adf6 feat:发货联系书款项信息 2024-09-06 19:06:42 +08:00
zzs01@yunemao.com
ddb6ffd8b7 feat:发货联系书款项信息 2024-09-06 19:01:56 +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
13f5145fc2 明细报表开发 2024-09-06 14:02:23 +08:00
ljw
177a6d76b0 发运明细表(提成)修复 2024-09-06 11:40:36 +08:00
ljw
03e2317d6f 明细报表开发 2024-09-06 10:45:02 +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
ljw
3ec42e3ae9 明细报表开发 2024-09-05 22:19:41 +08:00
ljw
36e7cc6dc2 明细报表开发 2024-09-05 22:19:40 +08:00
ljw
b157236768 明细报表开发 2024-09-05 22:17:50 +08:00
a97d42f812 fix:国贸订单详情 2024-09-05 22:11:12 +08:00
ljw
dcd89945fa 明细报表开发 2024-09-05 21:54:57 +08:00
d427f6a104 Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-05 21:39:38 +08:00
fc33b58c8e fix:报表产品分类多选 2024-09-05 21:39:16 +08:00
ljw
883c25593e 明细报表开发 2024-09-05 21:28:20 +08:00
ljw
87c2587c0d 明细报表开发 2024-09-05 21:27:23 +08:00
0ed12d3870 Merge branch 'refs/heads/fix-report-zzs' into test 2024-09-05 21:25:43 +08:00
1d42c39d8c change:报表产品分类多选 2024-09-05 20:44:19 +08:00
0c6cee0fae Merge remote-tracking branch 'origin/dev-ljw' into test 2024-09-05 19:57:31 +08:00
ljw
abaa19acdc 明细报表开发 2024-09-05 19:43:27 +08:00
ljw
8d9af3df5e change:销售提成整机 2024-09-05 19:31:51 +08:00
zzs01@yunemao.com
d65809238c Merge branch 'fix-report-zzs' 2024-09-05 15:56:58 +08:00
zzs01@yunemao.com
8be25973c9 Merge branch 'fix-report-zzs' into test 2024-09-05 15:52:50 +08:00
zzs01@yunemao.com
db5e6c097d Merge branch 'dev-declaration' into test 2024-09-05 15:52:41 +08:00
zzs01@yunemao.com
a8fef3ed3b change:国贸订单明细 2024-09-05 15:51:44 +08:00
zzs01@yunemao.com
fb84350512 change:销售提成整机 2024-09-05 15:39:16 +08:00
zzs01@yunemao.com
33ec5c134e change:国贸订单明细(生产线) 2024-09-05 15:15:15 +08:00
zzs01@yunemao.com
4801a0c93c change:国贸订单明细(生产线) 2024-09-05 14:59:01 +08:00
zzs01@yunemao.com
1997d31018 change:销售提成整机 2024-09-05 14:45:26 +08:00
zzs01@yunemao.com
d1fd8b0efc fix:出口报关明细报表,实际申报要素 2024-09-05 14:32:36 +08:00
zzs01@yunemao.com
ecfcde8156 fix:出口报关明细报表,实际申报要素 2024-09-05 14:18:43 +08:00
zzs01@yunemao.com
3118ea1501 change:销售提成整机 2024-09-05 14:14:17 +08:00
zzs01@yunemao.com
d98169b17b change:整机发运明细表 2024-09-05 11:52:34 +08:00
zzs01@yunemao.com
08a2952879 change:整机发运明细表 2024-09-05 11:51:35 +08:00
zzs01@yunemao.com
8a571e614a fix:出口报关明细报表,订单号 2024-09-05 11:26:30 +08:00
zzs01@yunemao.com
afc3b08ce2 fix:出口报关明细报表 2024-09-05 11:15:56 +08:00
zzs01@yunemao.com
c026971b54 fix:合同号查询错误 2024-09-05 10:31:45 +08:00
zzs01@yunemao.com
021d5560d6 feat:出口报关数据修复 2024-09-05 10:31:33 +08:00
ljw
12a633c0d4 询价单二开
# Conflicts:
#	src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
2024-09-04 20:35:27 +08:00
ljw
0b5ee97851 询价单二开 2024-09-04 20:31:51 +08:00
a6691b4d9b wip:出口报关明细报表 2024-09-04 20:11:03 +08:00
ljw
e7c5b43607 单一窗口报关单给出口报关赋值时同时赋值美元汇率 2024-09-04 18:55:12 +08:00
zzs01@yunemao.com
3899b142bd Reapply "wip:出口报关明细报表"
This reverts commit 714b6f8ce7.
2024-09-04 18:53:48 +08:00
zzs01@yunemao.com
714b6f8ce7 Revert "wip:出口报关明细报表"
This reverts commit 3f669694c9.
2024-09-04 18:53:23 +08:00
zzs01@yunemao.com
ca485cb29d Merge branch 'dev-declaration' into test 2024-09-04 18:52:42 +08:00
zzs01@yunemao.com
3f669694c9 wip:出口报关明细报表 2024-09-04 18:51:59 +08:00
zzs01@yunemao.com
fd75a6a02e wip:出口报关明细报表,计算 2024-09-04 18:18:15 +08:00
zzs01@yunemao.com
9d0393bf46 wip:出口报关明细报表,保费(结算币别) 2024-09-04 17:59:00 +08:00
zzs01@yunemao.com
aaa6982cda wip:出口报关明细报表,海运费(结算币别) 2024-09-04 17:53:54 +08:00
zzs01@yunemao.com
a65e1d2a52 wip:出口报关明细报表,美元保险费 2024-09-04 17:34:16 +08:00
zzs01@yunemao.com
efa308487f wip:出口报关明细报表,原币保险费 2024-09-04 17:26:44 +08:00
zzs01@yunemao.com
7aac46297b wip:出口报关明细报表,原币保险费 2024-09-04 17:24:51 +08:00
zzs01@yunemao.com
92f5446ce8 wip:出口报关明细报表,原币海运费,美元海运费 2024-09-04 17:16:59 +08:00
d428ff953e fix:报表产品机型过滤不生效 2024-09-03 21:56:50 +08:00
ljw
a19eb6c208 订舱通知单,反审核后是否付款变为否 2024-09-03 21:56:33 +08:00
zzs01@yunemao.com
b720b5591f feat:收款单校验取值调整 2024-09-03 21:56:13 +08:00
ljw
40cd3bd4e5 订舱通知单,审核后是否付款变为是 2024-09-03 21:56:13 +08:00
d5c1164669 Merge branch 'refs/heads/dev-zzs' into test 2024-09-03 20:32:10 +08:00
8d4dfbe487 Merge remote-tracking branch 'origin/dev-price' into test
# Conflicts:
#	src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java
2024-09-03 20:32:01 +08:00
d46ad9a63a Merge remote-tracking branch 'origin/dev-zzs' into dev-zzs 2024-09-03 20:17:40 +08:00
ab5ebbda1c fix:报表产品机型过滤不生效 2024-09-03 20:17:14 +08:00
zzs01@yunemao.com
f57d710de6 Merge branch 'dev-zzs' into test 2024-09-03 11:23:55 +08:00
ljw
f70e051b7c 订舱通知单,反审核后是否付款变为否 2024-09-03 11:23:46 +08:00
ljw
5c02fd60c5 订舱通知单,审核后是否付款变为是 2024-09-03 11:23:45 +08:00
zzs01@yunemao.com
c3d07166df feat:收款单校验取值调整 2024-09-03 11:22:40 +08:00
ljw
630b9212d2 订舱通知单,反审核后是否付款变为否 2024-09-03 10:36:01 +08:00
ljw
821ef4e448 订舱通知单,审核后是否付款变为是 2024-09-03 10:31:21 +08:00
ljw
b9d0be7678 订舱通知单,审核后是否付款变为是 2024-09-03 10:30:05 +08:00
025a400ad2 feat:外销合同作废 2024-09-02 21:18:20 +08:00
63f7458267 feat:外销合同是否礼品赠送=是 2024-09-02 21:18:20 +08:00
c891ae2c75 feat:外销合同作废 2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
7678ec974e feat:货代公司,修改字段类型 2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
373148ac90 fix:销售提成整机,首付款支付日为空 2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
f170c82c6b feat:整机合同带出防水布 2024-09-02 21:18:20 +08:00
ljw
0278d6e8e4 运输方式+费用项目+港口唯一 2024-09-02 21:18:20 +08:00
ljw
281f5c5207 至不允许小于等于从
从不能小于前一行的至
2024-09-02 21:18:20 +08:00
zzs01@yunemao.com
3b506f4cca feat:CMMP部件明细表审核校验器 2024-09-02 21:18:20 +08:00
7181e6194c feat:外销合同作废 2024-09-02 20:21:51 +08:00
e4bbc145d8 feat:外销合同是否礼品赠送=是 2024-09-02 20:18:28 +08:00
ljw
30bff50325 询价单二开 2024-09-02 19:46:54 +08:00
8dc728d79f Merge branch 'refs/heads/dev-zzs' into test 2024-09-02 19:46:29 +08:00