Commit Graph

534 Commits

Author SHA1 Message Date
ljw
8f3b26351f fix:收款单问题处理 2024-10-18 21:15:35 +08:00
ljw
0def669bb1 fix:价格库配件问题调整 2024-10-18 20:15:36 +08:00
ljw
f43eb8d02f fix:销售出库审核编码 2024-10-18 19:52:54 +08:00
ljw
11795de0e6 fix:销售出库审核编码 2024-10-18 19:52:10 +08:00
ljw
0324f74f0b fix:销售出库审核编码汇总 2024-10-18 19:50:22 +08:00
ljw
7e67415e2e fix:销售出库反审核功能处理 2024-10-18 19:49:29 +08:00
ljw
9ae923a3bf fix:销售出库审核功能处理 2024-10-18 19:49:15 +08:00
ljw
bc0f65d84f fix:销售出库审核功能处理 2024-10-18 19:49:11 +08:00
ljw
a7972c9d0a fix:价格库配件问题调整 2024-10-18 19:47:44 +08:00
ljw
5ea607fe81 Merge remote-tracking branch 'orinin/main' 2024-10-18 19:47:42 +08:00
8e4faa84b4 修改外销合同签章名称包含 ensign 2024-10-18 19:38:44 +08:00
ljw
a5445de5c4 fix:配件价格库获取标准价条件增加 2024-10-18 19:12:57 +08:00
ljw
c6c15c007b fix:二开公共类 2024-10-18 18:28:17 +08:00
zzs01@yunemao.com
d6e971c34f wip:获取标准价:FOB与FCA费用差额标配FOB(青岛)价 2024-10-18 18:20:34 +08:00
ljw
d582ad8ac9 fix:配件价格库反审核调用 2024-10-18 18:19:12 +08:00
ljw
5292248d54 fix:配件价格库禁用按钮调用 2024-10-18 18:17:55 +08:00
ljw
fbff30b432 fix:配件价格库禁用按钮调用 2024-10-18 18:17:42 +08:00
ljw
da6c3a3276 fix:配件价格库禁用按钮调用 2024-10-18 18:17:35 +08:00
ljw
421a81fe4f fix:配件价格库禁用按钮调用 2024-10-18 18:17:26 +08:00
ljw
e84cafc61d fix:审核时根据合同号获取财务信息《价税合计》汇总,将单据编号拼接(包含当前单 2024-10-18 18:15:53 +08:00
ljw
26367aa759 fix:收款单报错处理 2024-10-18 18:14:44 +08:00
ljw
b7515cfc02 fix:收款单报错处理 2024-10-18 18:14:36 +08:00
ljw
edfda79cac fix:收款单报错处理 2024-10-18 18:14:29 +08:00
ljw
eb2542f276 fix:收款单报错处理 2024-10-18 18:14:21 +08:00
ljw
fb1cd71f9d fix:收款单报错处理 2024-10-18 18:13:24 +08:00
ljw
6759ea30d7 fix:收款单报错处理 2024-10-18 18:13:20 +08:00
ljw
5c73612df7 fix:收款单财务确认功能更改至认领确认后 2024-10-18 18:12:22 +08:00
ljw
ccde1671b9 fix:配件价格库获取标准价条件增加 2024-10-18 14:41:59 +08:00
ljw
349940649a fix:
-整机编号校验时,在原判断逻辑增加条件:是否赠品为否;
2024-10-18 14:17:18 +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
2e1d701e06 fix:
1.装箱单,回填配件装柜时配件货物描述和货物(描述)拼接
2024-10-16 18:58:19 +08:00
ljw
0462634b64 fix:
1.外销合同审核更新礼品资金池
2024-10-15 21:18:51 +08:00
ljw
44890ef65f fix:
1.储运脱单审核更新礼品资金池
2024-10-15 21:17:31 +08:00
zzs
d666656ff4 fix:物料长宽高检查 2024-10-14 22:06:06 +08:00
e5370ba618 1.增加回填字段【预计入库日期】 2024-10-14 22:02:13 +08:00
cfa5152cdf first commit 2024-10-14 22:02:12 +08:00
zzs
a09e00a0a2 feat:物料长宽高赠品不判断 2024-10-14 21:58:35 +08:00
zzs
e40d039af2 fix(version1011):整机价格 2024-10-14 18:06:21 +08:00
zzs
69fce54a49 fix(version1011):整机价格 2024-10-14 16:02:07 +08:00
zzs
8b7ccb4e09 fix(version1011):整机价格 2024-10-14 16:02:04 +08:00
zzs
4ed38d065c feat(version1011):整机价格 2024-10-14 10:55:42 +08:00
zzs
b3780baa97 feat(version1011):整机价格 2024-10-14 10:12:48 +08:00
zzs
8137198072 wip(version1011):整机价格 2024-10-12 16:50:26 +08:00
zzs
d5128f866d fix:发货联系书云之家提交标题拼接 2024-10-12 15:54:54 +08:00
ljw
bddafe13d2 fix:云之家智能审批 2024-10-11 16:31:12 +08:00
ljw
37e1d6d5f6 fix:外销合同价格核算问题处理 2024-10-11 16:03:15 +08:00
ljw
08575e89d0 fix:外销合同提交报错问题处理 2024-10-11 09:38:07 +08:00
zzs
e65d62ea53 log:智能审批增加日志输出 2024-10-11 09:18:17 +08:00
ljw
d60d14e2e5 fix:外销合同变更单合同签章问题处理 2024-10-09 18:52:35 +08:00
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