Commit Graph

1472 Commits

Author SHA1 Message Date
ljw
6911427d0a fix:
1.收款单修改认领金额更新
2024-11-01 20:28:53 +08:00
ljw
f087aea531 fix:
1.收款单修改认领金额更新
2024-11-01 17:41:18 +08:00
ljw
762ecf3414 fix:
1.收款单修改认领金额更新

(cherry picked from commit 97004d94bb)
2024-11-01 17:03:21 +08:00
ljw
97004d94bb fix:
1.收款单修改认领金额更新
2024-11-01 17:02:56 +08:00
ljw
6cee3a4d7f fix:
1.收款单修改认领金额更新
2024-11-01 16:21:08 +08:00
ljw
c1907a51e1 fix:
1.收款单修改认领金额更新
2024-11-01 16:20:10 +08:00
ljw
a7236d8feb fix:
1.外销合同合同回签
2024-11-01 11:11:33 +08:00
ljw
ce36ea9758 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 21:37:22 +08:00
ljw
870e5512d8 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 21:30:44 +08:00
ljw
5d09ac27c6 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 21:25:42 +08:00
ljw
9f4522a0d5 Merge remote-tracking branch 'orinin/test' into test 2024-10-31 20:48:32 +08:00
ljw
39fa056aa4 fix:
1.装箱单效验
2.发运明细审核效验
2024-10-31 20:48:07 +08:00
3e92771397 Merge remote-tracking branch 'origin/test' into test 2024-10-31 20:06:36 +08:00
963efc52d0 1.修改同步云之家拼接json中存在空行数据问题 2024-10-31 20:06:08 +08:00
ljw
67fec9f726 fix:
1.收款单认领查询回款金额
2024-10-31 20:05:38 +08:00
21316e6fe9 Merge remote-tracking branch 'origin/main' 2024-10-31 20:04:10 +08:00
8246928024 1.修改同步云之家拼接json中存在空行数据问题 2024-10-31 20:03:26 +08:00
ljw
a5fcb2d853 fix:
1.收款单认领查询回款金额
2.发运明细审核效验
2024-10-31 18:37:29 +08:00
ljw
2e3cd377af fix:
1.发运明细单保存生成储运汇总
2024-10-30 19:05:04 +08:00
ljw
329239927a fix:
1.发运明细单保存生成储运汇总
2024-10-30 19:00:25 +08:00
ljw
735f1345d9 fix:
1.内审预算单上传附件

(cherry picked from commit 60aa3d46cc)
2024-10-30 18:41:03 +08:00
ljw
60aa3d46cc fix:
1.内审预算单上传附件
2024-10-30 18:40:34 +08:00
ljw
0396aab3e5 fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件

(cherry picked from commit 1986782dc4)
2024-10-30 18:26:49 +08:00
ljw
1986782dc4 fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件
2024-10-30 18:26:03 +08:00
ljw
46050525c3 fix:
1.删除订单产品需求单业务类型
2024-10-29 19:35:00 +08:00
ljw
8969e35ee9 fix:
1.删除订单产品需求单业务类型
2024-10-29 18:54:08 +08:00
0befcddf00 1.修改询价单审核缺失字段属性 2024-10-29 18:03:48 +08:00
de3ad95380 Merge remote-tracking branch 'origin/test' into test 2024-10-29 18:00:00 +08:00
bd491adc69 1.修改询价单审核缺失字段属性 2024-10-29 17:59:29 +08:00
ljw
a19f1e43ac fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科,业务类型默认普通采购
2024-10-29 16:28:00 +08:00
ljw
c836e4f7ba fix:
1.外销合同删除国贸经理签批附件
2024-10-29 15:56:01 +08:00
ljw
6e8255715c fix:
1.框架合同反审核删除国贸经理签批附件
2024-10-29 15:20:25 +08:00
ljw
7c1f573ad6 fix:
1.外销合同赠送配件分录赋值
2024-10-29 11:46:41 +08:00
ljw
0ce59ea7cd fix:
1.外销合同销售FOB单价金额计算
2024-10-28 20:17:32 +08:00
ljw
314d9b51bc fix:
1.外销合同起运港英文名称赋值
2024-10-28 19:31:53 +08:00
ljw
3c27d895e3 fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科,业务类型默认普通采购
2024-10-28 17:44:14 +08:00
ljw
60981f994d fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科,业务类型默认普通采购
2024-10-28 17:43:33 +08:00
ljw
5e53a39e68 fix:
1.内审预算单上传合同附件
2024-10-28 16:25:00 +08:00
ljw
d62d767f6e fix:
1.内审预算单上传合同附件
2024-10-28 15:15:12 +08:00
ljw
49acc4eee8 fix:
1.外销合同销售FOB单价金额计算
2024-10-28 14:52:19 +08:00
ljw
96a8138473 fix:
1.外销合同起运港英文名称赋值
2024-10-28 11:26:53 +08:00
ljw
89c6723d26 fix:
1.外销合同起运港英文名称赋值
2024-10-28 11:25:44 +08:00
f888460175 1.修改分录价格条款不更新任何数据 2024-10-26 23:26:42 +08:00
b5edfd40e4 1.修改分录价格条款不更新任何数据 2024-10-26 23:03:36 +08:00
46a4c39cdd 1.修改方数不计算港杂费 2024-10-26 19:59:10 +08:00
c6f7d5dd48 1.内审预算单附件 2024-10-26 19:40:58 +08:00
ljw
f7377c1479 fix:内审预算单附件回填 2024-10-26 19:36:06 +08:00
f71b5c2161 1.修改合同计算港杂费、内陆运输费
2.携带方数、吨数
2024-10-26 19:30:20 +08:00
bd1b8d819d fix:补充折扣率计算 2024-10-26 17:20:28 +08:00
c40404a5e5 Merge remote-tracking branch 'origin/dev-comp-price'
# Conflicts:
#	src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
#	src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
2024-10-26 17:16:56 +08:00