Commit Graph

869 Commits

Author SHA1 Message Date
ljw
81e5b92518 fix:
1.外销合同提交获取标准价

(cherry picked from commit 32e006e6b6)
2024-12-19 18:46:39 +08:00
zzs
05ae9fc383 improve:优化下推变更中逻辑,提交查询效率
(cherry picked from commit 40a3632539)
2024-12-19 17:18:30 +08:00
zzs
79b03b73cd feat:云之家回写代码优化,增加日志
(cherry picked from commit 8927475eab)
2024-12-19 17:18:22 +08:00
zzs
77f353fa05 feat:云之家回写代码优化,增加日志
(cherry picked from commit bdd2761c16)
2024-12-19 17:18:19 +08:00
zzs
bd08eb9de2 feat:调用单据操作接口,不启用网控检查
(cherry picked from commit 4efe0c8126)
2024-12-19 09:30:54 +08:00
ljw
1cd6ca3e06 fix:
1.出口发票保存备注字段汇总

(cherry picked from commit 6a717fa9f8)
2024-12-17 19:52:08 +08:00
ljw
d252add538 fix:
1.销售出库审核传EAS备注更改逻辑

(cherry picked from commit ae3724ef64)
2024-12-17 18:27:40 +08:00
zzs
f3cf73bd72 feat:云之家回写增加日志输出 2024-12-16 15:02:18 +08:00
zzs
b435904f38 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitsValidator.java
2024-12-16 10:04:07 +08:00
zzs
5a9da8ba97 feat:寄单放单申请提交收款校验改为改成应收款日期1小于当前日期 2024-12-16 10:03:42 +08:00
zzs
5b7d163d30 feat:寄单放单申请提交收款校验改为改成应收款日期1小于当前日期 2024-12-16 10:00:30 +08:00
ljw
09830c3536 fix:
1.订舱通知单提交同步EAS、逻辑增加
2024-12-14 10:52:50 +08:00
ljw
69671a833f fix:
1.订舱通知单提交同步EAS、逻辑增加
2024-12-14 10:27:12 +08:00
ljw
9a0201a104 fix:
1.订舱通知单提交同步EAS、逻辑增加
2024-12-13 19:46:45 +08:00
ljw
7e274a9867 fix:
1.订舱通知单提交同步EAS、逻辑增加
2024-12-13 19:09:33 +08:00
ljw
120a6c9f4b Merge remote-tracking branch 'orinin/test' into test
# Conflicts:
#	src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java
2024-12-13 17:17:11 +08:00
ljw
e3a3aae56f fix:
1.订舱通知单提交同步EAS、逻辑增加
2024-12-13 17:15:18 +08:00
199f167bd8 fix:禁用字段yem_sale_type
(cherry picked from commit 06e8ec3025)
2024-12-13 12:48:25 +08:00
ljw
f2bd115a93 fix:
1.发运明细过滤处理

(cherry picked from commit e63328acdc)
2024-12-12 19:11:07 +08:00
ljw
a184cb5203 fix:
1.发运明细过滤处理

(cherry picked from commit 062a58eb37)
2024-12-12 19:11:02 +08:00
ljw
570002b229 fix:
1.下单审批报错处理

(cherry picked from commit 5b6d440270)
2024-12-11 18:04:04 +08:00
zzs
6ab7f7e856 feat:获取CMMP BOM变更单增加参数,只获取指定类型 2024-12-11 15:47:22 +08:00
ljw
38a1374d36 fix:
1.外销合同报错处理
2024-12-10 22:09:26 +08:00
ljw
a76a28aded fix:
1.发运明细单提交效验
2024-12-10 20:53:32 +08:00
zzs
b605a14bed fix:BOM变更单创建组织为空 2024-12-10 18:19:35 +08:00
zzs
27569211d1 feat:替换关系提交,数量不用必录 2024-12-10 17:49:59 +08:00
6385212fab fix:更新总成图册明细备注取值 2024-12-09 21:27:56 +08:00
6b49aeadfb fix:生成替换关系备注取值 2024-12-09 18:56:23 +08:00
ljw
e4d4c3acd9 fix:
1.订舱通知单,发运明细单 获取整机信息功能增加
2024-12-09 17:56:49 +08:00
ljw
9c352e3b6c Merge remote-tracking branch 'orinin/test' into test 2024-12-09 15:34:15 +08:00
ljw
d6daffc86f fix:
1.订舱通知单,发运明细单 获取整机信息功能增加
2024-12-09 15:33:49 +08:00
zzs
b8e7b9c96e Merge remote-tracking branch 'origin/test' into test 2024-12-09 15:10:00 +08:00
zzs
c7db4573bd feat:总成图册明细生成时,备注取替换关系中的备注字段 2024-12-09 15:09:42 +08:00
zzs
dd68449040 Merge remote-tracking branch 'origin/test' into test 2024-12-09 15:04:56 +08:00
zzs
4d6b20371e feat:总成图册明细生成时,备注取替换关系中的备注字段 2024-12-09 15:04:30 +08:00
zzs
12fd8fcea3 feat:总成图册明细生成时,备注取替换关系中的备注字段2 2024-12-09 15:01:42 +08:00
zzs
e900a79bfc feat:总成图册明细生成时,备注取替换关系中的备注字段 2024-12-09 14:56:08 +08:00
zzs
ac7d1621fc feat:PLM生成替换关系,增加备注字段 2024-12-09 11:10:52 +08:00
zzs
a67ba60754 fix:变更对照表匹配BOM变更单取消数量字段 2024-12-09 11:09:17 +08:00
zzs
8fa83a4d14 fix:CMMP BOM变更单改为分录更新 2024-12-09 11:08:41 +08:00
ljw
982a2ed932 fix:
1.已存在的数据不在生成

(cherry picked from commit 37857e0346)
2024-12-07 17:57:57 +08:00
ljw
3c0c5b7826 fix:
1.配件发货明细表(已发货)逻辑修改
2024-12-06 17:35:26 +08:00
ljw
2e8c259d1b fix:
1.取消收款单打开视图默认为标准收款单
2024-12-06 16:41:21 +08:00
zzs
4159d174c2 fix:智能审批单据注册,子单据体修改会清空父分录标识 2024-12-06 14:22:41 +08:00
ljw
761d00dacd fix:
1.发运提交的时候  如果该合同下发运明细单的历史总数量+本次发运总数量等于  关联合同的总数量,那么历史发运金额+当前发运金额的汇总值必须等于合同金额
  否则,不需判断
2024-12-05 19:07:21 +08:00
ljw
5d7a984fd5 Merge remote-tracking branch 'orinin/test' into test 2024-12-05 15:46:10 +08:00
ljw
0d04e01345 fix:
1.发运提交的时候  如果该合同下发运明细单的历史总数量+本次发运总数量等于  关联合同的总数量,那么历史发运金额+当前发运金额的汇总值必须等于合同金额
  否则,不需判断
2024-12-05 15:45:26 +08:00
zzs
79132a6658 feat:定时任务获取到BOM变更单后自动审核 2024-12-05 15:39:05 +08:00
zzs
f54e3c92ab fix:出口报关,保存前不能进行报关合并 2024-12-05 15:14:35 +08:00
zzs
3b218758d9 fix:出口报关明细,合同号不显示 2024-12-05 14:48:33 +08:00