Commit Graph

827 Commits

Author SHA1 Message Date
ljw
2701fa9f02 fix:
1.订舱通知单变更效验
2024-11-06 17:47:56 +08:00
ljw
4715899dc5 fix:
1.外销合同,整机行单价取整
2024-11-06 17:40:02 +08:00
ljw
32070bce44 fix:
1.订舱通知单提单日期回填
2024-11-06 17:13:20 +08:00
ljw
9084c2a543 fix:
1.订舱通知物流  根据运输方式判断必录
2024-11-06 11:18:23 +08:00
ljw
36d3d73250 fix:
1.订舱通知变更单删除效验取消

(cherry picked from commit 070a323c28)
2024-11-06 09:18:09 +08:00
ljw
71092fbc70 fix:
1.订舱通知单信保回填更新客户信保额度申请
2024-11-05 17:20:36 +08:00
ljw
ae5989f8fb fix:
1.订舱通知单提交效验迁移
2024-11-05 16:58:51 +08:00
ljw
f90fff0199 fix:
1.外销合同报错处理
2024-11-05 14:30:39 +08:00
ljw
2996f9d6f6 fix:
1.订舱通知单提单日期回填报错处理

(cherry picked from commit dc527ca1a0)
2024-11-05 11:00:26 +08:00
ljw
9ee3459aad fix:
1.订舱通知单提单日期回填报错处理

(cherry picked from commit dc779ed717)
2024-11-05 11:00:21 +08:00
ljw
cad34ebca4 fix:
1.单价四舍五入保留两位小数
2024-11-04 21:03:36 +08:00
582c32cbd8 Merge remote-tracking branch 'origin/test' into test 2024-11-04 20:23:23 +08:00
25dab22e26 Merge remote-tracking branch 'origin/test' into test 2024-11-04 20:22:53 +08:00
ljw
1aba97a804 fix:
1.单价四舍五入保留两位小数
2024-11-04 20:22:35 +08:00
4f0b5bfed9 1.修改发运明细审核生成汇总信息 2024-11-04 20:17:00 +08:00
ljw
0ac2f0532f fix:
1.单价四舍五入
2024-11-04 20:07:12 +08:00
ljw
c46c136239 fix:
1.单价四舍五入
2024-11-04 20:05:36 +08:00
ljw
c281592241 fix:
1.外销合同港口赋值
2024-11-04 19:59:18 +08:00
ljw
4a57b0f90a fix:
1.发运明细变更单删除行效验
2024-11-04 19:57:28 +08:00
ljw
00c31c5890 fix:
1.外销合同港口赋值
2024-11-04 19:44:42 +08:00
ljw
4ae8998b94 fix:
1.装箱单锁定重量是否确认为空效验
2024-11-04 19:16:14 +08:00
ljw
fa5bdfae1c fix:
1.订舱通知单删除行效验
2.装箱单锁定重量是否确认为空效验
2024-11-04 19:02:38 +08:00
ljw
b1ed979906 fix:
1.订舱通知单信保回填赋值
2024-11-04 18:22:09 +08:00
ljw
7b782dd435 fix:
1.外销合同填写港口给起运港英文名称赋值
2024-11-04 18:13:11 +08:00
ljw
8d35981743 fix:
1.装箱单锁定重量是否确认为空逻辑修改
2024-11-04 16:58:00 +08:00
2c5b8105aa Merge remote-tracking branch 'origin/test' into test 2024-11-04 14:58:28 +08:00
b3ce35b484 1.修改发运明细审核生成汇总信息 2024-11-04 14:58:01 +08:00
ljw
325cdc315b fix:
1.外销合同填写港口给起运港英文名称赋值

(cherry picked from commit 7a82912901)
2024-11-04 14:31:29 +08:00
ljw
8e5ad493f5 fix:
1.合同英文名称
2024-11-01 20:36:56 +08:00
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
c1907a51e1 fix:
1.收款单修改认领金额更新
2024-11-01 16:20:10 +08:00
ljw
a7236d8feb fix:
1.外销合同合同回签
2024-11-01 11:11:33 +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
ljw
a5fcb2d853 fix:
1.收款单认领查询回款金额
2.发运明细审核效验
2024-10-31 18:37:29 +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
0396aab3e5 fix:
1.发运明细单保存生成储运汇总
2.内审预算单上传附件

(cherry picked from commit 1986782dc4)
2024-10-30 18:26:49 +08:00
ljw
8969e35ee9 fix:
1.删除订单产品需求单业务类型
2024-10-29 18:54:08 +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
314d9b51bc fix:
1.外销合同起运港英文名称赋值
2024-10-28 19:31:53 +08:00
ljw
3c27d895e3 fix:
1.订单产品需求单整机外购计划财务组织和库存组织默认锐科,业务类型默认普通采购
2024-10-28 17:44:14 +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
89c6723d26 fix:
1.外销合同起运港英文名称赋值
2024-10-28 11:25:44 +08:00
f888460175 1.修改分录价格条款不更新任何数据 2024-10-26 23:26:42 +08:00
ljw
8dc4b0db77 fix:
1.外销合同折扣率计算
2.订舱通知单报关分类携带海关编码和申报要素

(cherry picked from commit 8101851d4c)
2024-10-25 20:42:34 +08:00
ljw
613e7ebe78 fix:外销合同赠送配件生成
(cherry picked from commit 0f861016cd)
2024-10-25 20:42:27 +08:00
ljw
cd515f67d3 fix:外购
(cherry picked from commit c51617528e)
2024-10-25 20:42:24 +08:00
26a0a5a9b2 1.修改合同权杖附件数 生效不携带源单 2024-10-24 19:14:16 +08:00
daf729a12c 1.去除查询CMMP资源号前后空格 2024-10-24 18:44:10 +08:00
0b029535ea 1.修改变更单生效清空回签人 2024-10-24 16:11:20 +08:00
ljw
5bae043614 fix:外销合同是否赠品为否的赠品分录 2024-10-23 20:28:09 +08:00
8bc9e649f3 Merge remote-tracking branch 'origin/test' into test 2024-10-23 20:07:59 +08:00
d7856ccef9 1.修改变更单生效 不清空回签人相关信息 2024-10-23 20:07:47 +08:00
ljw
0444812e3a fix:外销合同是否赠品为否的赠品分录
(cherry picked from commit dc7eafc2c4)
2024-10-23 19:56:05 +08:00
ljw
d9ef332698 fix:订舱通知单是否信保合同功能完善 2024-10-23 11:14:56 +08:00
ljw
84b4d935fe fix:订舱通知单是否信保合同功能完善 2024-10-23 10:53:00 +08:00
ljw
0324937d60 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 22:50:26 +08:00
751c6fbe97 1.修改合同删行汇总表头金额不正确问题 2024-10-22 21:38:28 +08:00
ljw
f73fc7b404 fix:变更单的折扣金额 不需要触发值更新 2024-10-22 20:54:47 +08:00
ljw
d66e10f2a0 fix:铭牌数量不允许低于本次非赠品行的整机数量 2024-10-22 19:02:15 +08:00
ljw
16413251d0 fix:外销合同赠送配件分录条件设置
(cherry picked from commit 7e12e7e7c8)
2024-10-22 19:00:39 +08:00
9dbba5e2af Merge remote-tracking branch 'origin/test' into test 2024-10-22 17:55:12 +08:00
fe8e17ada8 修改价格库接口 2024-10-22 17:54:55 +08:00
ljw
a378f0238b fix:外销合同变更单(配件)的折扣金额 不需要触发值更新 2024-10-22 17:08:24 +08:00
d825633af3 增加获取云之家状态,撤销失败显示原因 2024-10-22 16:40:19 +08:00
073126d9b8 Merge remote-tracking branch 'origin/test' into test 2024-10-22 14:14:45 +08:00
527f22c029 1.EAS调用Cosmic价格库表头分录增加作废状态 2024-10-22 14:14:26 +08:00
ljw
20417cb4fa fix:订舱通知单提交反写客户信保额度申请
(cherry picked from commit 1f86c71340)
2024-10-21 23:12:40 +08:00
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
ljw
a59da5a261 fix:收款单报错处理 2024-09-26 18:08:22 +08:00
ljw
e6ac411ca8 fix:信保回填报错处理 2024-09-26 18:08:21 +08:00
ljw
d3ab4271ec fix:报关单报关对比 2024-09-26 18:08:20 +08:00
ljw
6f857727e2 fix:合同签章申请 2024-09-25 16:01:56 +08:00
ljw
82406a5786 fix:合同签章申请 2024-09-25 14:45:05 +08:00
ljw
fc499f9743 fix:报关对比日志定时任务问题处理 2024-09-25 11:15:57 +08:00
ljw
b7a40f76d1 fix:禁用状态改为作废状态 2024-09-24 21:44:20 +08:00
ljw
ef49929a52 fix:报错处理 2024-09-24 21:16:49 +08:00
ljw
b176d71186 fix:报错处理 2024-09-24 21:10:41 +08:00
ljw
66215cbec3 fix:时间计算 2024-09-24 21:10:41 +08:00
ljw
7d01667867 fix:赠品行净重下单确认时不必填 2024-09-24 20:03:01 +08:00
ljw
a64f4b0f3a fix:配件价格库获取标准价条件增加 2024-09-24 20:03:00 +08:00
ljw
a955344dfa fix:款项类型 = 普通选项 时,判断当前 客户 在 【订舱通知单-信保回填 】中是否存在满足以下条件的信保明细:(应回款倒计时<0 并且投保回款金额<应收款金额)
如果满足, 提示:当前寄单放单客户存在历史合同:***,订舱通知单:****,逾期未收款,请确认!!!
    款项类型=特殊情况不判断。
2024-09-24 19:37:33 +08:00
ljw
314a0c65c6 fix:赠品行净重下单确认时不必填 2024-09-24 19:37:33 +08:00
ljw
d1dbb66446 fix:单一窗口报关单反写出口报关单下推出口发票问题处理 2024-09-24 18:03:56 +08:00
ljw
22e9d11e90 fix:外销合同变更单报错处理 2024-09-24 16:32:56 +08:00
ljw
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
ljw
2878292488 Merge branch 'dev-ljw' into test 2024-09-23 22:33:59 +08:00
ljw
ea4c68c513 fix:发运明细单 2024-09-23 22:33:46 +08:00
ljw
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
ljw
30a4b6e65c fix:删除衣总签章 2024-09-23 21:27:17 +08:00
ljw
5a1dc32804 fix:查询库存报错处理 2024-09-23 21:27:11 +08:00
ljw
6887f48742 fix:如果询价单中的价格(包括明细信息的价格和多功能配置中的价格)为空,不更新整机价格库 2024-09-23 21:27:10 +08:00
ljw
3695bd063c fix:查询库存报错处理 2024-09-23 21:26:54 +08:00
ljw
4d4bb2a351 fix:如果询价单中的价格(包括明细信息的价格和多功能配置中的价格)为空,不更新整机价格库 2024-09-23 21:26:21 +08:00
ljw
7d01e25b7a fix:删除衣总签章 2024-09-23 20:37:50 +08:00
ljw
8d6e76a189 fix:审核时根据合同号获取财务信息《价税合计》汇总,将单据编号拼接(包含当前单 2024-09-23 20:22:02 +08:00
ljw
cd55e8e4d3 fix:收款单报错处理 2024-09-23 20:21:55 +08:00
ljw
7b440b5d85 fix:收款单报错处理 2024-09-23 20:16:25 +08:00
ljw
bf488cc840 fix:审核时根据合同号获取财务信息《价税合计》汇总,将单据编号拼接(包含当前单 2024-09-23 17:29:25 +08:00
ljw
934abaa194 fix:发运明细单物料查询库存 2024-09-23 16:33:30 +08:00
ljw
5310b017db fix:发运明细单物料查询库存 2024-09-23 16:30:44 +08:00
ljw
33835d1832 fix:发运明细单物料查询库存 2024-09-23 16:20:12 +08:00
019956ce30 1.修改云之家审核启动参数只需要上传PDF格式 2024-09-23 16:15:32 +08:00
ljw
c3b9adf1e1 fix:收款单报错处理 2024-09-23 15:52:46 +08:00
ljw
21c883fadf fix:收款单报错处理 2024-09-23 15:50:56 +08:00
ljw
c5fa7ca6f7 fix:收款单报错处理 2024-09-23 15:50:04 +08:00
ljw
ef8d4e17b0 fix:收款单报错处理 2024-09-23 15:19:29 +08:00
ljw
502a342fe7 fix:合同签章申请服务插件 2024-09-23 14:33:15 +08:00
ljw
fc67b078e5 fix:根据单据注册对象创建JSon实现方法 2024-09-23 14:33:15 +08:00
ljw
b866ded5e9 fix:合同签章申请服务插件 2024-09-23 12:07:43 +08:00
ljw
5259803a0d fix:合同签章申请服务插件 2024-09-23 12:06:20 +08:00
ljw
5296c92cdc fix:根据单据注册对象创建JSon实现方法 2024-09-23 12:06:10 +08:00
ljw
49ac119c2d fix:衣总签章 2024-09-23 10:50:06 +08:00
ljw
ec654a8235 fix:收款单财务确认功能更改至认领确认后 2024-09-23 10:50:06 +08:00
ljw
2e95529cbe fix:衣总签章 2024-09-23 10:49:43 +08:00
ljw
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
ljw
211fffb305 fix:收款单 2024-09-21 22:08:44 +08:00
ljw
5c8b50b7a8 fix:收款单 2024-09-21 22:08:24 +08:00
ljw
7cb0c8645a fix:询价单审核时,价格库的禁用状态更新为可用 2024-09-21 20:37:37 +08:00
ljw
43ff122ca9 fix:发运明细表报错处理 2024-09-21 20:37:32 +08:00
ljw
c907de8ea4 fix:询价单审核时,价格库的禁用状态更新为可用 2024-09-21 20:36:46 +08:00
ljw
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
ljw
59f7649d36 fix:发运明细表报错处理
(cherry picked from commit 6b2bb8715e)
2024-09-21 16:09:36 +08:00
ljw
d90e101559 fix:配件价格库禁用按钮调用
(cherry picked from commit a878e6015d)
2024-09-21 16:09:35 +08:00
ljw
35f1156283 fix:发运明细表报错处理 2024-09-21 15:49:27 +08:00
ljw
6d06de8e69 fix:配件价格库禁用按钮调用 2024-09-21 15:22:06 +08:00
ljw
8705d697b1 Merge branch 'test' into dev-ljw 2024-09-21 15:20:28 +08:00
ljw
163a751eed fix:装箱单报错处理 2024-09-21 10:50:17 +08:00