Commit Graph

595 Commits

Author SHA1 Message Date
ljw
7ebba9d98b fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:46:06 +08:00
ljw
db3a3eac41 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 22:23:26 +08:00
ljw
0ce7c9102a fix:订舱通知单提交反写客户信保额度申请 2024-10-21 21:26:20 +08:00
ljw
b90525eaa7 fix:订舱通知单提交反写客户信保额度申请 2024-10-21 19:59:48 +08:00
ljw
fefb9a0d1a fix:订舱通知单提交反写客户信保额度申请 2024-10-21 19:57:07 +08:00
ljw
fe675f250f fix:订舱通知单审核反写客户信保额度申请 2024-10-21 19:42:26 +08:00
e435d4442f 1.增加合同提交是校验【合同提交附件】中的word是否包含ensign标签 2024-10-21 16:09:52 +08:00
ljw
fabfdf41f6 fix:框架合同反审核清空
(cherry picked from commit 8e1fdec8d3)
2024-10-19 17:58:08 +08:00
ljw
9f1ecfc5c1 fix:合同签章 2024-10-19 16:48:28 +08:00
ljw
8e4ab9ea29 fix:合同签章 2024-10-19 16:45:14 +08:00
ljw
cef522fbd2 fix:收款单财务确认 2024-10-19 15:45:27 +08:00
ljw
114feb4ef7 fix:收款单财务确认
(cherry picked from commit fbf6338866)
2024-10-19 15:40:59 +08:00
ljw
0a6cfa8091 fix:合同签章 2024-10-19 14:59:07 +08:00
ljw
7ad4258cf6 fix:合同签章 2024-10-19 14:55:22 +08:00
ljw
e3828c8e3a fix:收款单财务确认 2024-10-19 14:14:11 +08:00
ljw
8791d3ad5f fix:收款单问题处理 2024-10-18 21:12:04 +08:00
ljw
fb7b088d1c fix:价格库配件问题调整 2024-10-18 19:46:30 +08:00
ljw
9a00961183 fix:二开公共类 2024-10-18 18:27:08 +08:00
ljw
9b987aa882 fix:
云之家获取逻辑修改
2024-10-18 16:54:29 +08:00
ljw
eca195901d fix:
-整机编号校验时,在原判断逻辑增加条件:是否赠品为否;
2024-10-18 10:39:02 +08:00
ljw
4c6bf5aa90 fix:
信保合同生成订舱通知单时,应收款金额(本位币)默认等于信保本位币金额;
2024-10-18 10:23:46 +08:00
ljw
f70896224b fix:
外销合同变更单审核生成资金池
2024-10-16 19:49:22 +08:00
ljw
56bf193ea9 fix:
外销合同变更单审核生成资金池
2024-10-16 18:59:01 +08:00
ljw
e9f0827d16 fix:
外销合同变更单审核生成资金池
2024-10-16 18:49:14 +08:00
ljw
751b7f7169 fix:
销售提成配件报表处理
2024-10-16 18:44:10 +08:00
ljw
53c94dbe80 fix:
1.装箱单,回填配件装柜时配件货物描述和货物(描述)拼接
2024-10-16 18:33:55 +08:00
ljw
5306a321af fix:
1.装箱单,回填配件装柜时配件货物描述和货物(描述)拼接
2024-10-16 18:19:10 +08:00
ljw
9869d3a4a1 fix:
1.储运脱单审核更新礼品资金池
2024-10-16 18:16:29 +08:00
ljw
21dc1df101 fix:
1.装箱单,回填配件装柜时配件货物描述和货物(描述)拼接
2024-10-16 17:50:25 +08:00
ljw
dc7fdcb706 fix:
1.储运脱单审核更新礼品资金池
2.装箱单,回填配件装柜时配件货物描述和货物(描述)拼接
2024-10-16 17:05:07 +08:00
ljw
9a964a26be fix:
1.储运脱单审核更新礼品资金池
2024-10-15 21:14:17 +08:00
ljw
e92b0692a4 fix:
1.储运脱单审核更新礼品资金池
2024-10-15 20:54:28 +08:00
ljw
783c5f7850 fix:
1.储运脱单审核更新礼品资金池
2024-10-15 20:21:15 +08:00
ljw
a4a7a9f313 fix:
1.外销合同审核更新礼品资金池
2024-10-15 19:12:23 +08:00
ljw
3efa5d3e76 fix:
1.外销合同报错处理
2024-10-15 18:50:18 +08:00
ljw
23692d6e49 Merge remote-tracking branch 'orinin/test' into test 2024-10-15 18:38:52 +08:00
ljw
9ee1b51688 fix:
1.外销合同审核更新礼品资金池
2024-10-15 18:38:34 +08:00
zzs
5a1295b274 fix:计算内陆运费报错 2024-10-15 18:17:45 +08:00
ljw
1ba5f2849a fix:
1.外销合同审核更新礼品资金池
2024-10-15 17:46:29 +08:00
ljw
6c385638de fix:
1.填写基础机型时携带方数
2024-10-15 16:39:53 +08:00
ljw
0da67e73a7 fix:
1.订舱通知单打开报错
2024-10-15 16:00:07 +08:00
ljw
5b7b0ed8fa fix:
1.订舱通知单打开报错
2.外销合同填写数量报错
2024-10-15 15:32:48 +08:00
ljw
6f42d858a8 fix:订舱通知单值更新反写台数 2024-10-15 12:04:24 +08:00
ljw
8f38abe738 fix:订舱通知单值更新反写台数 2024-10-15 12:03:59 +08:00
ljw
7bc09049fd fix:订舱通知单审核反写礼品资金池 2024-10-15 11:00:32 +08:00
ljw
4417094943 fix:外销合同审核反写礼品资金池 2024-10-15 10:38:50 +08:00
ljw
e13b784ce8 Merge remote-tracking branch 'orinin/test' into test 2024-10-15 10:38:14 +08:00
ljw
680f0a89d9 fix:外销合同审核反写礼品资金池 2024-10-15 10:38:05 +08:00
zzs
fdee718201 fix:合同复制报错 2024-10-14 22:18:09 +08:00
zzs
5a537f4a1b fix:合同复制报错 2024-10-14 22:11:17 +08:00
zzs
ea60566c97 fix:物料长宽高检查
(cherry picked from commit d666656ff4)
2024-10-14 22:06:28 +08:00
zzs
cfee129bf2 wip(fix):获取价格 2024-10-14 21:55:37 +08:00
zzs
850db5c8f1 wip(fix):获取价格 2024-10-14 20:43:48 +08:00
zzs
ba08ad9172 feat:物料长宽高赠品不判断 2024-10-14 18:52:41 +08:00
zzs
6fc1cafbba Merge branch 'dev-comp-price' into test 2024-10-14 18:06:57 +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
890964f91a fix(version1011):整机价格 2024-10-14 16:01:19 +08:00
zzs
d228be2fb9 Merge remote-tracking branch 'origin/test' into test 2024-10-14 15:51:23 +08:00
zzs
de74b712aa fix(version1011):整机价格 2024-10-14 15:51:15 +08:00
bd1f866fbe 1.增加回填字段【预计入库日期】 2024-10-14 15:50:19 +08:00
ljw
973a11838b fix:发运明细申报要素 2024-10-14 12:02:03 +08:00
ljw
bcb90bd469 Merge remote-tracking branch 'orinin/test' into test 2024-10-14 10:59:14 +08:00
ljw
ffb583d288 fix:内审预算单撤销附件 2024-10-14 10:58:58 +08:00
zzs
c7c0222cf3 Merge branch 'dev-comp-price' into test 2024-10-14 10:56:34 +08:00
zzs
4ed38d065c feat(version1011):整机价格 2024-10-14 10:55:42 +08:00
ljw
40c873034a fix:内审预算单上传附件 2024-10-14 10:15:12 +08:00
zzs
b3780baa97 feat(version1011):整机价格 2024-10-14 10:12:48 +08:00
ljw
dca9f3f93d fix:外销合同变更单费用分摊增加限制 2024-10-12 20:46:44 +08:00
ljw
727734e38b fix:销售出库审核编码汇总 2024-10-12 19:34:58 +08:00
ljw
f71760fa6a fix:
1.内审预算单生成附件
2.销售出库审核编码汇总
3.销售出库反审核编码消除
2024-10-12 17:53:58 +08:00
zzs
8137198072 wip(version1011):整机价格 2024-10-12 16:50:26 +08:00
ljw
49e81dc22d Merge remote-tracking branch 'orinin/test' into test 2024-10-12 16:45:42 +08:00
ljw
d24248ab27 fix:内审预算单附件回填 2024-10-12 16:45:30 +08:00
zzs
800c4994da fix:发货联系书云之家提交标题拼接
(cherry picked from commit d5128f866d)
2024-10-12 15:55:32 +08:00
459cb72ddd 1.修改合同签章同步云之家发起人为销售员逻辑 2024-10-12 15:49:52 +08:00
ljw
f4c25d5fce fix:销售出库反审核功能处理 2024-10-12 11:55:12 +08:00
a96872df21 1.禁用外销合同提交时已审批人提交
2.增加人员选择字段空间拼接
2024-10-11 19:38:22 +08:00
ljw
4d18f36fc6 fix:销售出库审核功能处理 2024-10-11 18:38:25 +08:00
ljw
84c64e6c6d fix:销售出库审核功能处理 2024-10-11 18:27:42 +08:00
ljw
c0a3d7207d fix:外销合同价格核算问题处理 2024-10-11 16:00:28 +08:00
ljw
69028e3d9a fix:外销合同提交效验取消 2024-10-11 15:48:08 +08:00
ljw
ee02591bea fix:外销合同变更单提交报错问题处理 2024-10-11 14:52:25 +08:00
ljw
685326f706 fix:外销合同变更单合同签章问题处理 2024-10-09 18:52:06 +08:00
ljw
a11eb92bea fix:外销合同变更单合同签章问题处理 2024-10-08 18:11:56 +08:00
ljw
eea2e3c614 fix:外销合同变更单合同签章问题处理
(cherry picked from commit c9c595ea34)
2024-10-08 15:43:02 +08:00
ljw
58a697a691 fix:计算闲置期倒计时
(cherry picked from commit 9d395b1f7b)
2024-10-08 15:42:58 +08:00
2731e382f0 1.修改贷记单提交后获取上次贷记单号节点 2024-10-08 14:15:01 +08:00
ljw
82f62fcc41 fix:外销合同变更单合同签章问题处理
(cherry picked from commit b25b2e3495)
2024-10-08 09:53:55 +08:00
ljw
e860dd03ca fix:合同签章申请 2024-09-29 20:58:59 +08:00
ljw
907ea73905 fix:报关对比 2024-09-29 19:33:28 +08:00
ljw
4f83e6c995 fix:配件合同费用分摊 2024-09-29 17:13:51 +08:00
ljw
ed7dfe051f fix:内审预算单 2024-09-27 22:05:53 +08:00
ljw
f7bc2dbaef fix:获取不为空的利息天数 2024-09-27 21:58:48 +08:00
e89c386dbe 1.修改收款金额、实际收款金额为0不会填 2024-09-27 21:41:20 +08:00
e1dd657c55 Merge remote-tracking branch 'origin/test' into test 2024-09-27 20:48:40 +08:00
e6074461bc 1.修改输入实际收汇值更新光标数据消失 2024-09-27 20:48:28 +08:00
ljw
94ffdd96d7 fix:获取不为空的利息天数 2024-09-27 20:37:31 +08:00
ljw
ae7730afd0 fix:收款单报错处理 2024-09-26 22:34:20 +08:00