Commit Graph

1520 Commits

Author SHA1 Message Date
zzs
c83ac79ad3 fix:跟单任务控制台提交校验问题 2025-02-21 10:25:33 +08:00
zzs
be1d7fc1c0 fix:寄单放单提交校验,合同收汇百分比必须为100才校验全款
(cherry picked from commit 507b329217)
2025-02-20 18:00:59 +08:00
25655
a8dcf86a03 fix:
1.下单审批报错问题处理

(cherry picked from commit d6dd00f35e)
2025-02-20 14:43:19 +08:00
ljw
5126cd3e42 fix: 1.跟单任务控制台执行备料时,其他要求字段从商品明细携带到备料信息 2025-02-19 19:35:45 +08:00
25655
14e6a29297 fix:
1.全部回i款了,倒计时还一直在更新,另外能不能未超期的显示正数,超期的显示负数
2.跟单任务控制台执行备料时,其他要求字段从商品明细携带到备料信息
3.库区、库位调度计划可以定时获取CMMP数据,CMMP根据仓库业务管理库区和库位不一定什么时候会新增,这边需要能获取新增的数据。执行时只获取新增的数据,可以每天获取修改时间为前24小时的数据。
2025-02-19 17:15:11 +08:00
25655
74f729d6a0 fix:
1.销售出库单提交效验问题处理
2025-02-19 09:55:21 +08:00
25655
45ed3725bd fix:
1.跟单任务控制台,填写取消数量后,不能有整机生产信息
2025-02-18 18:03:10 +08:00
25655
8a29166da5 Merge remote-tracking branch 'orinin/test' into test 2025-02-18 17:57:02 +08:00
25655
5f82036c9e fix:
1.接1060行,全部回i款了,倒计时还一直在更新,另外能不能未超期的显示正数,超期的显示负数
  --检查定时任务更新逻辑,负数正数逻辑暂不处理
2.跟单任务控制台执行备料时,其他要求字段从商品明细携带到备料信息
2025-02-18 17:56:51 +08:00
zzs
67d6982a9a feat:报表,发车日报,取消跟单任务控制台查询审核过滤条件 2025-02-18 14:54:25 +08:00
zzs
9ee49b8002 Merge remote-tracking branch 'origin/test' into test 2025-02-18 14:36:33 +08:00
zzs
abbcb0c159 feat:报表,发车日报,未收款数量计算修改 2025-02-18 14:36:24 +08:00
25655
bf8f30b5a6 fix:
1.外销合同提交效验报错处理
2025-02-18 14:33:09 +08:00
25655
59a74aa002 fix:
1.外销合同提交效验报错处理
2025-02-18 11:08:12 +08:00
zzs
a065810553 feat:报表,国贸订单明细生产线有效数量取值错误问题 2025-02-15 16:58:03 +08:00
25655
6c73d074a9 fix:
1.1、基础资料申报要素增加字段,是否默认(枚举,是否,默认空);
  2、合同/发运/订舱,获取实际要素功能调整:
  原逻辑配置时,如果匹配到多条,手动选择;
  调整后:如果匹配到多条记录,取申报要素是否默认为是的记录,如果为空或者为否,则按照原逻辑不做处理,其他逻辑不变
  涉及调整:整机和配件需要同步调整,批量获取(获取申报要素按钮)和单独获取(选择明细字段)
  整机匹配逻辑:产品分类、基础机型、报关分类、海关编码;
  配件匹配逻辑:产品分类、物料编码、保管分类、海关编码

(cherry picked from commit 02ce990a09)
2025-02-15 15:28:02 +08:00
zzs
82a4a258bd feat:整机发运明细表增加字段,调拨日期
(cherry picked from commit 70fbbdfc57)
2025-02-14 14:10:26 +08:00
zzs
0b59343a3f feat:发车日报,修改未付款数量取值
(cherry picked from commit de8651140d)
2025-02-14 14:10:23 +08:00
zzs
8b62770290 feat:销售出库单修改发货日期为审核日志
(cherry picked from commit b15fb4b118)
2025-02-14 14:10:21 +08:00
zzs
1c201016e3 feat:报表国贸订单明细增加字段取消数量、有效数量
(cherry picked from commit 337ea83280)
2025-02-14 14:10:19 +08:00
zzs
6db4ccf9b3 feat:跟单任务控制台,填写取消数量后,不能有整机生产信息
(cherry picked from commit 23142ed75e)
2025-02-14 14:10:17 +08:00
25655
1599d5534e fix:
1.外销合同提交效验

(cherry picked from commit 89083733e6)
2025-02-13 19:28:46 +08:00
25655
b42467d964 fix:
1.保存时更新表头业务类型

(cherry picked from commit 1eabe97182)
2025-02-13 19:28:37 +08:00
25655
ec5ba439fa fix:
1.外销合同提交效验
2025-02-13 19:14:39 +08:00
25655
63c02dda56 fix:
1.订舱通知单保存时更新表头业务类型
2025-02-13 11:48:30 +08:00
25655
441c44ad7a fix:
1.新增外销合同提交晓燕
2.外销合同点击是否赠品值更新错误修改

(cherry picked from commit a02ae13270)
2025-02-13 10:08:09 +08:00
zzs
0b5b41c8c3 feat:合同下单反写增加日志 2025-02-12 18:22:10 +08:00
zzs
3fc054fee7 feat:撤销出口报关单,金额数量修改
(cherry picked from commit 08fec93bc0)
2025-02-11 18:07:53 +08:00
zzs
959314b783 feat:合同生成的贷记单审核失败,不回滚合同
(cherry picked from commit 859bd67e1b)
2025-02-11 18:07:50 +08:00
zzs
4c35fd1594 feat:合同审核生成贷记单,增加财务确认状态字段默认值
(cherry picked from commit 21389ef181)
2025-02-11 18:07:48 +08:00
zzs
cf9a3450ab feat:下单平台接口增加业务主体字段
(cherry picked from commit cfc7e54140)
2025-02-11 18:07:45 +08:00
zzs
fc4eebf63e fix:生成整机档案时,默认携带业务主体
(cherry picked from commit cf24796b34)
2025-02-11 18:07:41 +08:00
25655
8bd2410f34 fix:
1.外销合同提交效验

(cherry picked from commit f2bc40b8ee)
2025-02-11 16:39:31 +08:00
25655
b95ea8433b fix:
2.单一窗口报关单对比

(cherry picked from commit c758398394)
2025-02-11 16:39:29 +08:00
25655
b74419a100 fix:
1.  订舱通知单审核 报错
2.单一窗口报关单对比

(cherry picked from commit 6ec3ec7d3c)
2025-02-11 16:39:28 +08:00
25655
9673fc4410 fix:
2.单一窗口报关单对比
2025-02-11 10:05:34 +08:00
zzs
e22e0ec409 fix:出口报关明细报表,金额数量字段取值修改
(cherry picked from commit c080eba304)
2025-02-11 09:10:25 +08:00
zzs
e420162b4c feat:出口报关明细表增加过滤条件,只显示已结关
(cherry picked from commit 0840e0d0de)
2025-02-10 16:55:37 +08:00
25655
08a34cc494 fix:
1.  订舱通知单审核 报错
2.单一窗口报关单对比

(cherry picked from commit 6ec3ec7d3c)
2025-02-10 10:42:57 +08:00
zzs
a1845331a6 fix:图册查询零件查询逻辑调整
(cherry picked from commit a9e6e8cab0)
2025-02-08 17:40:06 +08:00
zzs
c3f1363562 fix:整机合同分离下推内审预算单
(cherry picked from commit 1f852a0931)
2025-02-08 17:39:48 +08:00
zzs
6993c317ae fix:图册查询零件查询逻辑调整 2025-02-05 18:03:41 +08:00
25655
053580b929 fix:
贷记单提交效验
配件发货明细表报错处理
2025-01-25 13:24:45 +08:00
25655
d0b5fb9bdb fix:
贷记单提交效验
配件发货明细表报错处理
2025-01-25 12:47:48 +08:00
zzs
a2d704a76b fix:下单平台图册查询零件查询查不到数据问题 2025-01-24 18:07:06 +08:00
zzs
1844627ac8 fix:发运下推订舱,收款天数为携带 2025-01-24 17:52:55 +08:00
zzs
928703c963 feat:订舱下推寄单放单申请,计算应回款日期 2025-01-24 16:47:46 +08:00
zzs
31c908471a feat:合同回款预警 2025-01-24 15:53:35 +08:00
zzs
76cc84885f feat:寄单放单申请提交校验 2025-01-24 15:08:06 +08:00
zzs
42d6b00789 feat:寄单放单申请提交校验 2025-01-24 14:15:57 +08:00