Commit Graph

138 Commits

Author SHA1 Message Date
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
135a1b4b5a fix:贷记单审核校验 2024-09-12 15:15:17 +08:00
ljw
f59cf5c382 fix:礼品领用申请审核 2024-09-12 11:35:29 +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
70fefff998 fix:折扣率计算
(cherry picked from commit 9b0ddf97e2)
2024-09-11 09:36:40 +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
ad42a15754 change:折扣率计算 2024-09-10 19:00:19 +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
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
ljw
d553b4b1c6 外销合同:提交效验附件面板是否有值 2024-09-09 18:14:43 +08:00
ljw
c11b14cf95 销售出库审核效验 2024-09-09 15:48:44 +08:00
ljw
532173b6dc Merge branch 'dev-change' into test 2024-09-09 11:29:51 +08:00
cea38280d9 feat:发货联系书款项信息 2024-09-06 20:51:16 +08:00
1e25a581d2 feat:发货联系书款项信息 2024-09-06 19:25:18 +08:00
ljw
a26db3adf6 feat:发货联系书款项信息 2024-09-06 19:06:42 +08:00
zzs01@yunemao.com
ddb6ffd8b7 feat:发货联系书款项信息 2024-09-06 19:01:56 +08:00
zzs01@yunemao.com
0c6187c580 Merge branch 'fix-report-zzs' into test 2024-09-06 14:05:47 +08:00
ljw
13f5145fc2 明细报表开发 2024-09-06 14:02:23 +08:00
ljw
12a633c0d4 询价单二开
# Conflicts:
#	src/main/java/com/yem/wm/im/inquirylist/form/InquirylistEdit.java
2024-09-04 20:35:27 +08:00
ljw
a19eb6c208 订舱通知单,反审核后是否付款变为否 2024-09-03 21:56:33 +08:00
zzs01@yunemao.com
b720b5591f feat:收款单校验取值调整 2024-09-03 21:56:13 +08:00
ljw
40cd3bd4e5 订舱通知单,审核后是否付款变为是 2024-09-03 21:56:13 +08:00
8d4dfbe487 Merge remote-tracking branch 'origin/dev-price' into test
# Conflicts:
#	src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_wl.java
2024-09-03 20:32:01 +08:00
zzs01@yunemao.com
f57d710de6 Merge branch 'dev-zzs' into test 2024-09-03 11:23:55 +08:00