|
|
eca195901d
|
fix:
-整机编号校验时，在原判断逻辑增加条件：是否赠品为否；
|
2024-10-18 10:39:02 +08:00 |
|
|
|
4c6bf5aa90
|
fix:
信保合同生成订舱通知单时，应收款金额（本位币）默认等于信保本位币金额；
|
2024-10-18 10:23:46 +08:00 |
|
|
|
f70896224b
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 19:49:22 +08:00 |
|
|
|
56bf193ea9
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 18:59:01 +08:00 |
|
|
|
e9f0827d16
|
fix:
外销合同变更单审核生成资金池
|
2024-10-16 18:49:14 +08:00 |
|
|
|
751b7f7169
|
fix:
销售提成配件报表处理
|
2024-10-16 18:44:10 +08:00 |
|
|
|
53c94dbe80
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:33:55 +08:00 |
|
|
|
5306a321af
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 18:19:10 +08:00 |
|
|
|
9869d3a4a1
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-16 18:16:29 +08:00 |
|
|
|
21dc1df101
|
fix:
1.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 17:50:25 +08:00 |
|
|
|
dc7fdcb706
|
fix:
1.储运脱单审核更新礼品资金池
2.装箱单，回填配件装柜时配件货物描述和货物（描述）拼接
|
2024-10-16 17:05:07 +08:00 |
|
|
|
9a964a26be
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 21:14:17 +08:00 |
|
|
|
e92b0692a4
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 20:54:28 +08:00 |
|
|
|
783c5f7850
|
fix:
1.储运脱单审核更新礼品资金池
|
2024-10-15 20:21:15 +08:00 |
|
|
|
a4a7a9f313
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 19:12:23 +08:00 |
|
|
|
3efa5d3e76
|
fix:
1.外销合同报错处理
|
2024-10-15 18:50:18 +08:00 |
|
|
|
23692d6e49
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-15 18:38:52 +08:00 |
|
|
|
9ee1b51688
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 18:38:34 +08:00 |
|
zzs
|
5a1295b274
|
fix:计算内陆运费报错
|
2024-10-15 18:17:45 +08:00 |
|
|
|
1ba5f2849a
|
fix:
1.外销合同审核更新礼品资金池
|
2024-10-15 17:46:29 +08:00 |
|
|
|
6c385638de
|
fix:
1.填写基础机型时携带方数
|
2024-10-15 16:39:53 +08:00 |
|
|
|
0da67e73a7
|
fix:
1.订舱通知单打开报错
|
2024-10-15 16:00:07 +08:00 |
|
|
|
5b7b0ed8fa
|
fix:
1.订舱通知单打开报错
2.外销合同填写数量报错
|
2024-10-15 15:32:48 +08:00 |
|
|
|
6f42d858a8
|
fix:订舱通知单值更新反写台数
|
2024-10-15 12:04:24 +08:00 |
|
|
|
8f38abe738
|
fix:订舱通知单值更新反写台数
|
2024-10-15 12:03:59 +08:00 |
|
|
|
7bc09049fd
|
fix:订舱通知单审核反写礼品资金池
|
2024-10-15 11:00:32 +08:00 |
|
|
|
4417094943
|
fix:外销合同审核反写礼品资金池
|
2024-10-15 10:38:50 +08:00 |
|
|
|
e13b784ce8
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-15 10:38:14 +08:00 |
|
|
|
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 |
|
|
|
973a11838b
|
fix:发运明细申报要素
|
2024-10-14 12:02:03 +08:00 |
|
|
|
bcb90bd469
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-14 10:59:14 +08:00 |
|
|
|
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 |
|
|
|
40c873034a
|
fix:内审预算单上传附件
|
2024-10-14 10:15:12 +08:00 |
|
zzs
|
b3780baa97
|
feat(version1011):整机价格
|
2024-10-14 10:12:48 +08:00 |
|
|
|
dca9f3f93d
|
fix:外销合同变更单费用分摊增加限制
|
2024-10-12 20:46:44 +08:00 |
|
|
|
727734e38b
|
fix:销售出库审核编码汇总
|
2024-10-12 19:34:58 +08:00 |
|
|
|
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 |
|
|
|
49e81dc22d
|
Merge remote-tracking branch 'orinin/test' into test
|
2024-10-12 16:45:42 +08:00 |
|
|
|
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 |
|
|
|
f4c25d5fce
|
fix:销售出库反审核功能处理
|
2024-10-12 11:55:12 +08:00 |
|
|
|
a96872df21
|
1.禁用外销合同提交时已审批人提交
2.增加人员选择字段空间拼接
|
2024-10-11 19:38:22 +08:00 |
|
|
|
4d18f36fc6
|
fix:销售出库审核功能处理
|
2024-10-11 18:38:25 +08:00 |
|
|
|
84c64e6c6d
|
fix:销售出库审核功能处理
|
2024-10-11 18:27:42 +08:00 |
|
|
|
c0a3d7207d
|
fix:外销合同价格核算问题处理
|
2024-10-11 16:00:28 +08:00 |
|
|
|
69028e3d9a
|
fix:外销合同提交效验取消
|
2024-10-11 15:48:08 +08:00 |
|
|
|
ee02591bea
|
fix:外销合同变更单提交报错问题处理
|
2024-10-11 14:52:25 +08:00 |
|
|
|
685326f706
|
fix:外销合同变更单合同签章问题处理
|
2024-10-09 18:52:06 +08:00 |
|
|
|
a11eb92bea
|
fix:外销合同变更单合同签章问题处理
|
2024-10-08 18:11:56 +08:00 |
|
|
|
eea2e3c614
|
fix:外销合同变更单合同签章问题处理
(cherry picked from commit c9c595ea34)
|
2024-10-08 15:43:02 +08:00 |
|
|
|
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 |
|
|
|
82f62fcc41
|
fix:外销合同变更单合同签章问题处理
(cherry picked from commit b25b2e3495)
|
2024-10-08 09:53:55 +08:00 |
|
|
|
e860dd03ca
|
fix:合同签章申请
|
2024-09-29 20:58:59 +08:00 |
|
|
|
907ea73905
|
fix:报关对比
|
2024-09-29 19:33:28 +08:00 |
|
|
|
4f83e6c995
|
fix:配件合同费用分摊
|
2024-09-29 17:13:51 +08:00 |
|
|
|
ed7dfe051f
|
fix:内审预算单
|
2024-09-27 22:05:53 +08:00 |
|
|
|
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 |
|
|
|
94ffdd96d7
|
fix:获取不为空的利息天数
|
2024-09-27 20:37:31 +08:00 |
|
|
|
ae7730afd0
|
fix:收款单报错处理
|
2024-09-26 22:34:20 +08:00 |
|
|
|
a59da5a261
|
fix:收款单报错处理
|
2024-09-26 18:08:22 +08:00 |
|
|
|
e6ac411ca8
|
fix:信保回填报错处理
|
2024-09-26 18:08:21 +08:00 |
|
|
|
d3ab4271ec
|
fix:报关单报关对比
|
2024-09-26 18:08:20 +08:00 |
|
|
|
6f857727e2
|
fix:合同签章申请
|
2024-09-25 16:01:56 +08:00 |
|
|
|
82406a5786
|
fix:合同签章申请
|
2024-09-25 14:45:05 +08:00 |
|
|
|
fc499f9743
|
fix:报关对比日志定时任务问题处理
|
2024-09-25 11:15:57 +08:00 |
|
|
|
b7a40f76d1
|
fix:禁用状态改为作废状态
|
2024-09-24 21:44:20 +08:00 |
|
|
|
ef49929a52
|
fix:报错处理
|
2024-09-24 21:16:49 +08:00 |
|
|
|
b176d71186
|
fix:报错处理
|
2024-09-24 21:10:41 +08:00 |
|
|
|
66215cbec3
|
fix:时间计算
|
2024-09-24 21:10:41 +08:00 |
|
|
|
7d01667867
|
fix:赠品行净重下单确认时不必填
|
2024-09-24 20:03:01 +08:00 |
|
|
|
a64f4b0f3a
|
fix:配件价格库获取标准价条件增加
|
2024-09-24 20:03:00 +08:00 |
|
|
|
a955344dfa
|
fix:款项类型 = 普通选项 时，判断当前 客户 在 【订舱通知单-信保回填 】中是否存在满足以下条件的信保明细：（应回款倒计时<0 并且投保回款金额<应收款金额）
如果满足， 提示：当前寄单放单客户存在历史合同：***，订舱通知单：****，逾期未收款，请确认！！！
款项类型=特殊情况不判断。
|
2024-09-24 19:37:33 +08:00 |
|
|
|
314a0c65c6
|
fix:赠品行净重下单确认时不必填
|
2024-09-24 19:37:33 +08:00 |
|
|
|
d1dbb66446
|
fix:单一窗口报关单反写出口报关单下推出口发票问题处理
|
2024-09-24 18:03:56 +08:00 |
|
|
|
22e9d11e90
|
fix:外销合同变更单报错处理
|
2024-09-24 16:32:56 +08:00 |
|
|
|
452a04c11b
|
fix:外销合同变更单报错处理
(cherry picked from commit 480b492654)
|
2024-09-24 15:37:08 +08:00 |
|
|
|
4615f3ce68
|
1.修改明细删除行提示null
|
2024-09-24 14:48:53 +08:00 |
|
|
|
2878292488
|
Merge branch 'dev-ljw' into test
|
2024-09-23 22:33:59 +08:00 |
|
|
|
ea4c68c513
|
fix:发运明细单
|
2024-09-23 22:33:46 +08:00 |
|
|
|
b09f2c1666
|
Merge branch 'dev-ljw' into test
# Conflicts:
# src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
|
2024-09-23 21:52:13 +08:00 |
|
|
|
30a4b6e65c
|
fix:删除衣总签章
|
2024-09-23 21:27:17 +08:00 |
|
|
|
5a1dc32804
|
fix:查询库存报错处理
|
2024-09-23 21:27:11 +08:00 |
|
|
|
6887f48742
|
fix:如果询价单中的价格（包括明细信息的价格和多功能配置中的价格）为空，不更新整机价格库
|
2024-09-23 21:27:10 +08:00 |
|
|
|
3695bd063c
|
fix:查询库存报错处理
|
2024-09-23 21:26:54 +08:00 |
|
|
|
4d4bb2a351
|
fix:如果询价单中的价格（包括明细信息的价格和多功能配置中的价格）为空，不更新整机价格库
|
2024-09-23 21:26:21 +08:00 |
|
|
|
7d01e25b7a
|
fix:删除衣总签章
|
2024-09-23 20:37:50 +08:00 |
|
|
|
8d6e76a189
|
fix:审核时根据合同号获取财务信息《价税合计》汇总，将单据编号拼接（包含当前单
|
2024-09-23 20:22:02 +08:00 |
|
|
|
cd55e8e4d3
|
fix:收款单报错处理
|
2024-09-23 20:21:55 +08:00 |
|
|
|
7b440b5d85
|
fix:收款单报错处理
|
2024-09-23 20:16:25 +08:00 |
|
|
|
bf488cc840
|
fix:审核时根据合同号获取财务信息《价税合计》汇总，将单据编号拼接（包含当前单
|
2024-09-23 17:29:25 +08:00 |
|
|
|
934abaa194
|
fix:发运明细单物料查询库存
|
2024-09-23 16:33:30 +08:00 |
|
|
|
5310b017db
|
fix:发运明细单物料查询库存
|
2024-09-23 16:30:44 +08:00 |
|
|
|
33835d1832
|
fix:发运明细单物料查询库存
|
2024-09-23 16:20:12 +08:00 |
|
|
|
019956ce30
|
1.修改云之家审核启动参数只需要上传PDF格式
|
2024-09-23 16:15:32 +08:00 |
|
|
|
c3b9adf1e1
|
fix:收款单报错处理
|
2024-09-23 15:52:46 +08:00 |
|
|
|
21c883fadf
|
fix:收款单报错处理
|
2024-09-23 15:50:56 +08:00 |
|
|
|
c5fa7ca6f7
|
fix:收款单报错处理
|
2024-09-23 15:50:04 +08:00 |
|
|
|
ef8d4e17b0
|
fix:收款单报错处理
|
2024-09-23 15:19:29 +08:00 |
|
|
|
502a342fe7
|
fix:合同签章申请服务插件
|
2024-09-23 14:33:15 +08:00 |
|
|
|
fc67b078e5
|
fix:根据单据注册对象创建JSon实现方法
|
2024-09-23 14:33:15 +08:00 |
|
|
|
b866ded5e9
|
fix:合同签章申请服务插件
|
2024-09-23 12:07:43 +08:00 |
|
|
|
5259803a0d
|
fix:合同签章申请服务插件
|
2024-09-23 12:06:20 +08:00 |
|
|
|
5296c92cdc
|
fix:根据单据注册对象创建JSon实现方法
|
2024-09-23 12:06:10 +08:00 |
|
|
|
49ac119c2d
|
fix:衣总签章
|
2024-09-23 10:50:06 +08:00 |
|
|
|
ec654a8235
|
fix:收款单财务确认功能更改至认领确认后
|
2024-09-23 10:50:06 +08:00 |
|
|
|
2e95529cbe
|
fix:衣总签章
|
2024-09-23 10:49:43 +08:00 |
|
|
|
dc976fd7c6
|
fix:收款单财务确认功能更改至认领确认后
|
2024-09-23 10:11:26 +08:00 |
|
zzs01@yunemao.com
|
ca1bdda16a
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-23 10:06:51 +08:00 |
|
zzs01@yunemao.com
|
a12730aa74
|
fix:发货联系书款项到位情况
|
2024-09-23 10:06:33 +08:00 |
|
|
|
211fffb305
|
fix:收款单
|
2024-09-21 22:08:44 +08:00 |
|
|
|
5c8b50b7a8
|
fix:收款单
|
2024-09-21 22:08:24 +08:00 |
|
|
|
7cb0c8645a
|
fix:询价单审核时，价格库的禁用状态更新为可用
|
2024-09-21 20:37:37 +08:00 |
|
|
|
43ff122ca9
|
fix:发运明细表报错处理
|
2024-09-21 20:37:32 +08:00 |
|
|
|
c907de8ea4
|
fix:询价单审核时，价格库的禁用状态更新为可用
|
2024-09-21 20:36:46 +08:00 |
|
|
|
47058d8885
|
fix:发运明细表报错处理
|
2024-09-21 20:36:20 +08:00 |
|
|
|
ed9735ddd4
|
Merge branch 'dev_zhouc' into test
|
2024-09-21 20:35:29 +08:00 |
|
|
|
cd3b39b2ed
|
修改费用信息携带内陆运输费、港杂费
|
2024-09-21 20:35:07 +08:00 |
|
|
|
e6f3127a83
|
修改表头金额值更新调用保存 提交后调用刷新
|
2024-09-21 19:36:09 +08:00 |
|
|
|
1e2a58675c
|
修改表头金额变化刷新收款计划
|
2024-09-21 19:04:38 +08:00 |
|
|
|
b5d77e8154
|
Merge branch 'dev_zhouc' into test
|
2024-09-21 18:07:29 +08:00 |
|
|
|
3648ca1304
|
修改表头金额变化刷新收款计划
|
2024-09-21 18:07:02 +08:00 |
|
|
|
59f7649d36
|
fix:发运明细表报错处理
(cherry picked from commit 6b2bb8715e)
|
2024-09-21 16:09:36 +08:00 |
|
|
|
d90e101559
|
fix:配件价格库禁用按钮调用
(cherry picked from commit a878e6015d)
|
2024-09-21 16:09:35 +08:00 |
|
|
|
35f1156283
|
fix:发运明细表报错处理
|
2024-09-21 15:49:27 +08:00 |
|
|
|
6d06de8e69
|
fix:配件价格库禁用按钮调用
|
2024-09-21 15:22:06 +08:00 |
|
|
|
8705d697b1
|
Merge branch 'test' into dev-ljw
|
2024-09-21 15:20:28 +08:00 |
|
|
|
163a751eed
|
fix:装箱单报错处理
|
2024-09-21 10:50:17 +08:00 |
|
|
|
7a9fe95e46
|
fix:装箱单报错处理
|
2024-09-21 10:49:42 +08:00 |
|
