Commit Graph

1152 Commits

Author SHA1 Message Date
ljw
1d45f34ef8 fix:
1.生成随机资料时,只有业务分类为整机,且是否赠品为否的行生成
2024-11-26 17:10:31 +08:00
ljw
cd4b0d7f9d Merge remote-tracking branch 'orinin/main' 2024-11-26 16:35:56 +08:00
ljw
975ba7f974 fix:
1.配件发货明细表数据重复修复
2024-11-26 16:35:32 +08:00
zzs
9a81a8781f fix:报表国贸订单明细数据错误 2024-11-26 14:14:48 +08:00
zzs
03844240a0 feat:出口报关明细,海运费、保费改为取结算币别 2024-11-25 18:49:58 +08:00
ljw
c8188bfb40 fix:
1.外销合同贸易术语赋值
2024-11-25 18:49:54 +08:00
ljw
1a1e257be8 fix:
1.外销合同变更单打开签到日期赋值
2024-11-25 18:49:46 +08:00
zzs
e99e3380d3 fix:国贸订单明细重复行 2024-11-25 18:49:42 +08:00
zzs
606259d531 fix:生成替换关系取值断点时间错误 2024-11-25 18:49:36 +08:00
zzs
c6e602a675 fix:图册查询报错,断点时间为空 2024-11-25 18:49:33 +08:00
zzs
41802e5a72 feat:提交云之家日志 2024-11-25 18:48:46 +08:00
ljw
503cb7788d fix:
1.外销合同赠送配件页签汇总赋值
2024-11-25 18:47:22 +08:00
ljw
2af9172481 fix:
1.调拨订单 同步EAS的接口  业务类型  给他传单据字段  不穿默认值了
2024-11-25 17:19:04 +08:00
ljw
261d35ff59 fix:
1.外销合同赠送配件页签汇总赋值
2.发运明细单台数发运更新
2024-11-25 10:27:57 +08:00
zzs
2e5a292d3e fix:查询购买过的整机编码 2024-11-23 17:53:26 +08:00
zzs
52e9912eb1 fix:PLM生成替换关系 2024-11-23 17:53:25 +08:00
zzs
b7214cf204 doc:修改未查询到图册提示语 2024-11-23 09:21:57 +08:00
ljw
da686561af fix:
1.订舱通知单提交
2024-11-22 20:06:21 +08:00
ljw
c6f5c05e4c fix:
1.发运明细单金额价格条款赋值
2024-11-22 19:35:11 +08:00
ljw
90506a0127 fix:
1.寄单放单申请提交拼接
2024-11-22 19:35:08 +08:00
ljw
18824050e9 fix:
1.订舱通知单提交
2024-11-22 19:30:13 +08:00
ljw
f35fdecc63 fix:
1.整机发货明细表
2024-11-22 18:48:03 +08:00
ljw
883027d7c6 fix:
1.外销合同签订日期默认当前时间
2024-11-21 20:10:48 +08:00
ljw
6c37b4beaf fix:
1.外销合同签订日期默认当前时间
2024-11-21 20:04:11 +08:00
ljw
e31660e995 fix:
1.外销合同签订日期默认当前时间
2024-11-21 19:40:32 +08:00
ljw
f9f6c5fff7 fix:
1.水单附件必填效验
2024-11-21 19:26:30 +08:00
ljw
b796e9100e fix:
1.外销合同签订日期默认当前时间
2024-11-21 19:26:25 +08:00
zzs
210e61db9a fix:价格库查询到重复数据 2024-11-21 14:58:01 +08:00
ljw
09db507910 fix:
1.收款单认领合同过滤非贷记单
2024-11-21 14:40:01 +08:00
zzs
f76e7f23ca Merge remote-tracking branch 'origin/main' 2024-11-20 18:28:55 +08:00
zzs
99bdc4da6a feat:更新整机档案领料分析时间 2024-11-20 18:28:47 +08:00
ljw
e85ae88a64 fix:
1.订舱通知单额度确认效验修改
2024-11-20 18:14:55 +08:00
zzs
7d9aa70b93 feat:更新整机档案领料分析时间 2024-11-20 17:26:09 +08:00
ljw
fad828255f Merge remote-tracking branch 'orinin/main'
# Conflicts:
#	.gitignore
#	src/main/java/com/yem/rf/salescommission/SalesOfRoyaltyParts.java
#	src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
#	src/main/java/com/yem/wm/es/salescontrac/op/SalesContracUnauditOp.java
#	src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
#	src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
#	src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java
#	src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
#	src/main/java/com/yem/wm/es/shippingdetails/op/ShippingDetailsAuditOp.java
#	src/main/java/com/yem/wm/es/shippingdetails/op/XshippingDetailsSaveOp.java
#	src/main/java/com/yem/wm/im/csrCreditLine/task/CsrCreditLineTask.java
#	src/main/java/com/yem/wm/im/inquirylist/op/InquirylistAudit.java
#	src/main/java/com/yem/wm/syn/eas/api/OperationalUniversal.java
#	src/main/java/com/yem/wm/sys/utils/NewVersionHelper.java
#	src/main/java/com/yem/wm/utils/ContactSignUtils.java
2024-11-19 18:09:21 +08:00
zzs
04ad4b12d3 下单平台:配件价格根据名称模糊查询 2024-11-19 15:55:12 +08:00
ljw
07d1a90efe Merge remote-tracking branch 'orinin/test' into test 2024-11-19 14:24:54 +08:00
ljw
08b18bf7f6 fix:
1.订单产品需求单 调拨计划,调入调出仓库清空,不自动带出
2024-11-19 14:24:34 +08:00
zzs
db4a0dabe5 下单平台:只能查询购买过的资源
(cherry picked from commit 743bd6e277)
2024-11-19 10:19:44 +08:00
zzs
743bd6e277 下单平台:只能查询购买过的资源 2024-11-19 10:06:52 +08:00
ljw
1bf68b4811 fix:
1.报错修复
2024-11-18 22:29:40 +08:00
ljw
1fdaefba7b fix:
1.报错修复
2024-11-18 22:24:37 +08:00
ljw
77262dc8dc fix:
1.报错修复
2024-11-18 22:10:18 +08:00
ljw
60c3550fb6 fix:
1.报错修复
2024-11-18 22:10:11 +08:00
ljw
103140e352 fix:
1.报错修复
2024-11-18 22:10:08 +08:00
ljw
593050d6d5 fix:
1.报错修复
2024-11-18 22:10:01 +08:00
ljw
0bb09cf296 fix:
1.报错修复
2024-11-18 22:03:25 +08:00
ljw
d70a61c3f6 fix:
1.报错修复
2024-11-18 21:55:28 +08:00
ljw
1f3bf99c44 fix:
1.报错修复
2024-11-18 21:49:21 +08:00
ljw
6d5494f88b fix:
1.报错修复
2024-11-18 21:42:50 +08:00
ljw
8726d5f026 fix:
1.报错修复
2024-11-18 21:42:09 +08:00