diff --git a/ruoyi-admin/src/main/resources/mailTemplate/mailOrderDeliveryTemplate.html b/ruoyi-admin/src/main/resources/mailTemplate/mailOrderDeliveryTemplate.html new file mode 100644 index 00000000..44e105fa --- /dev/null +++ b/ruoyi-admin/src/main/resources/mailTemplate/mailOrderDeliveryTemplate.html @@ -0,0 +1,59 @@ + + + + + + + + + +
+

尊敬的供应商：您好！

+

这是贵公司负责生产的项目订单发货通知。

+

请在收到本邮件之日起五个工作日内，按照订单中的设备清单、规格型号及交货时间，安排对应批次货物的发货事宜（可登录紫光汇智 + OMS系统，在 “出库管理” 模块查看订单详情并更新发货进度）。

+

本次发货清单：

+ + + + + + + + + + + + + + + + + + + + + +
序号产品编码产品名称产品型号仓库数量
+

发货地址：重庆市南岸区广褔大道12号行政中心B区3号楼14-17

+

联系人：叶宇豪 联系电话：18983595207

+

若贵司无法按期发货，请于收到本邮件之日起两个工作日内在紫光汇智OMS系统中进行退回，并回复此邮件说明具体原因及预计发货时间。如果贵公司未按时反馈且未按期发货，导致订单超出约定交货期，由此造成的客户投诉、订单违约等相关后果和损失，将由贵司承担。 + 感谢您的配合！

+
+ +

紫光汇智信息技术有限公司

+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mailTemplate/mailPartnerTemplate.html b/ruoyi-admin/src/main/resources/mailTemplate/mailPartnerTemplate.html new file mode 100644 index 00000000..7ce37e56 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mailTemplate/mailPartnerTemplate.html @@ -0,0 +1,32 @@ + + + + + + + + + +
+

尊敬的代理商: 您好!

+

这是贵公司项目订单进货和供货执行通知。

+

请在订单发放之日起四个工作日内按照订单通知的设备清单和进货价格向我司订货（在紫光汇智公共号渠道服务使用授权账号确认订单）。

+

贵司如果不接受此单，请于订单发放之日起四个工作日内在紫光汇智公共号渠道服务内拒收此执行单，并回复此邮件“不接此单”。如果贵公司未按时作"不接此单”的回复，则视同贵公司认同，若因贵公司的原因导致自订单通知发放之日起超过有效期仍未执行，造成的不利后果和影响由贵司承担。

+
+ +

紫光汇智信息技术有限公司

+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mailTemplate/passwordTemplate.html b/ruoyi-admin/src/main/resources/mailTemplate/passwordTemplate.html new file mode 100644 index 00000000..d75aa29c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mailTemplate/passwordTemplate.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+

尊敬的用户：您好！

+

您在OMS系统的密码已被重置,重置密码为:[[${password}]]

+
+ +

紫光汇智信息技术有限公司

+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/layout/product-list.html b/ruoyi-admin/src/main/resources/templates/layout/product-list.html index 11bc057b..37f44a46 100644 --- a/ruoyi-admin/src/main/resources/templates/layout/product-list.html +++ b/ruoyi-admin/src/main/resources/templates/layout/product-list.html @@ -351,7 +351,7 @@ - + 删除 diff --git a/ruoyi-admin/src/main/resources/templates/project/info/add.html b/ruoyi-admin/src/main/resources/templates/project/info/add.html index bc0f378b..54485058 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/add.html @@ -200,15 +200,15 @@ - 代理商 + 进货商 - 代理商联系人 + 进货商联系人 - 代理商 TEL + 进货商 TEL @@ -405,7 +405,7 @@ function selectPartner() { var url = prefix + "/selectPartner"; var options = { - title: '选择代理商', + title: '选择进货商', width: "800", height: '600', url: url, @@ -459,7 +459,7 @@ function doSubmitPartner(index, layero) { var rows = layero.find("iframe")[0].contentWindow.getSelections(); if (rows.length == 0) { - $.modal.alertWarning("请选择一个代理商"); + $.modal.alertWarning("请选择一个进货商"); return; } $('[name="partnerCode"]').val(rows[0].partnerCode); diff --git a/ruoyi-admin/src/main/resources/templates/project/info/edit.html b/ruoyi-admin/src/main/resources/templates/project/info/edit.html index dceaca5f..c1327fbd 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/edit.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/edit.html @@ -217,16 +217,16 @@ - 代理商 + 进货商 - 代理商联系人 + 进货商商联系人 - 代理商 TEL + 进货商 TEL @@ -490,7 +490,7 @@ function selectPartner() { var url = prefix + "/selectPartner"; var options = { - title: '选择代理商', + title: '选择进货商', width: "800", height: '600', url: url, @@ -542,7 +542,7 @@ function doSubmitPartner(index, layero) { var rows = layero.find("iframe")[0].contentWindow.getSelections(); if (rows.length == 0) { - $.modal.alertWarning("请选择一个代理商"); + $.modal.alertWarning("请选择一个进货商"); return; } $('[name="partnerCode"]').val(rows[0].partnerCode); diff --git a/ruoyi-admin/src/main/resources/templates/project/order/add.html b/ruoyi-admin/src/main/resources/templates/project/order/add.html index 192f4b24..344787c5 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html @@ -100,7 +100,9 @@ padding: 30px 40px; width: 300px; } - + .hidden-td{ + display: none; + } .saveRemark { font-size: 10px; color: #999999; @@ -222,7 +224,6 @@ @@ -237,10 +238,14 @@ - + 总代* + + + + 供货商* - - + + @@ -299,30 +304,31 @@ + + + 付款方式* + + + + 付款比例* + + + + + + 付款条件 + + + + 其他特别说明 - - 付款方式 - - - - 付款比例 - - - - - - 描述 - - - -
@@ -529,6 +535,16 @@ $('[name="businessPhone"]').val(data.contactPhone); changeBg() $('[name="industryType"]').val(data.industryType); + $('[name="partnerName"]').val(data.partnerName); + $('[name="partnerCode"]').val(data.partnerCode); + $('[name="partnerUserName"]').val(data.partnerUserName); + $('[name="partnerEmail"]').val(data.partnerEmail); + $('[name="partnerPhone"]').val(data.contactWay); + $('[name="level"]').val(data.level); + + + + initProjectList(data) window.localStorage.removeItem('getDetail') @@ -603,9 +619,11 @@ $paymentMethodSelect.append(''); if (orderChannel == '1') { // 总代 + $('.zd-td').removeClass("hidden-td") $paymentMethodSelect.append(''); $paymentMethodSelect.append(''); } else if (orderChannel == '2') { // 直签 + $('.zd-td').addClass("hidden-td") $paymentMethodSelect.append(''); $paymentMethodSelect.append(''); $paymentMethodSelect.append(''); diff --git a/ruoyi-admin/src/main/resources/templates/project/order/approve.html b/ruoyi-admin/src/main/resources/templates/project/order/approve.html index dc5baffa..6930b2d8 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/approve.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/approve.html @@ -357,45 +357,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 付款条件 + + + + 其他特别说明 - - 付款方式 - - - - 付款比例 - - - - - - - 描述 - - -
@@ -436,7 +437,7 @@ [[${file.id}]] - [[${fileStat.index+1==1?'合同':fileStat.index+1==2?'商务审批':'补充附件'}]] + [[${fileStat.index+1==1?'商务折扣审批':fileStat.index+1==2?'合同':'补充附件'}]] [[${file.fileName}]] [[${file.uploadUserName}]] [[${#dates.format(file.uploadTime,'yyyy-MM-dd')}]] @@ -693,12 +694,16 @@ // 如果是商务审批，收集税率数据 const taskName = [[${todo.taskName}]]; - if (taskName && taskName.startsWith('商务')) { + if (taskName && (taskName.startsWith('商务') || taskName.startsWith('财务'))) { const taxRateList = collectTaxRateData(); if (taxRateList) { for (let i = 0; i < taxRateList.length; i++) { for (let key in taxRateList[i]) { data['taxRateData[' + i + '].' + key] = taxRateList[i][key]; + if(key=='taxRate' && (taxRateList[i][key]>100 || taxRateList[i][key]<0)){ + $.modal.msgError("税率区间为0-100") + return + } } } } @@ -735,7 +740,7 @@ $.modal.msgError("审批意见必填") return false } - let data = [[${todo}]] + let {taxRateData, ...data} = [[${todo}]] data.approveOpinion = value data.approveStatus = 2 data.variables = { @@ -745,7 +750,7 @@ // 如果是商务审批，收集税率数据 const taskName = [[${todo.taskName}]]; - if (taskName && taskName.startsWith('商务')) { + if (taskName && (taskName.startsWith('商务')|| taskName.startsWith('财务'))) { const taxRateList = collectTaxRateData(); if (taxRateList) { for (let i = 0; i < taxRateList.length; i++) { @@ -886,6 +891,7 @@ $('#approve-detail').find('input,select,textarea').each(function () { $(this).prop("disabled", true); }) + initTaxRateEditability() let headerHtml=$(`
- @@ -298,6 +300,10 @@ + 总代* + + + 供货商* @@ -359,33 +365,34 @@ - - 其他特别说明 - - - - + - 付款方式 + 付款方式* - - 付款比例 + 付款比例* + max="100" th:field="*{paymentRatio}" oninput="updateDescriptionText()" required> - 描述 + 付款条件 + + 其他特别说明 + + + +
@@ -457,7 +464,7 @@ [[${fileStat.index+1}]] - [[${fileStat.index+1==1?'合同':fileStat.index+1==2?'折扣审批':'补充附件'}]] + [[${fileStat.index+1==1?'商务折扣审批':fileStat.index+1==2?'合同':'补充附件'}]] [[${file.id}]] [[${file.fileName}]] [[${file.uploadUserName}]] @@ -613,7 +620,7 @@ }, } }); - const file_log_arr = ["（请上传合同信息）.pdf/.jpg/.png", "（请上传商务折扣审批邮件信息）.pdf/.jpg/.png", "（请上传现金折扣审批邮件信息）.pdf/.jpg/.png", "（补充附件）.zip/.rar/.jpg/.png"] + const file_log_arr = [ "（请上传商务折扣审批邮件信息）.pdf/.jpg/.png","（请上传合同信息）.pdf/.jpg/.png", "（请上传现金折扣审批邮件信息）.pdf/.jpg/.png", "（补充附件）.zip/.rar/.jpg/.png"] var softwareProjectProductInfoList = [] var hardwareProjectProductInfoList = [] var maintenanceProjectProductInfoList = [] @@ -814,7 +821,7 @@ let flag=false; $('#file-version-content .current-version').find('tbody tr').each(function (trIndex, trElement) { - if (trIndex==1) { + if (trIndex==0) { $(trElement).find('td').each(function (index, element) { if (index === 2 && $(element).text()!='-1') { @@ -1227,16 +1234,16 @@ } $(trElement).find('td').each(function (index, element) { if (index === 1) { - $(element).text(sortNum==1?'合同':sortNum==2?'折扣审批':'补充附件') + $(element).text(sortNum==0?'商务折扣审批':sortNum==1?'合同':'补充附件') } else if (index === 2) { $(element).text(data.id) } else if (index === 3) { $(element).text(data.fileName) - } else if (index === 3) { - $(element).text(data.uploadUserName) } else if (index === 4) { - $(element).text(data.uploadTime) + $(element).text(data.uploadUserName) } else if (index === 5) { + $(element).text(data.uploadTime) + } else if (index === 6) { $(element).html(`预览 @@ -1383,9 +1390,11 @@ $paymentMethodSelect.append(''); if (orderChannel == '1') { // 总代 + $('.zd-td').removeClass("hidden-td") $paymentMethodSelect.append(''); $paymentMethodSelect.append(''); } else if (orderChannel == '2') { // 直签 + $('.zd-td').addClass("hidden-td") $paymentMethodSelect.append(''); $paymentMethodSelect.append(''); $paymentMethodSelect.append(''); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java index 2ce36ba0..133078c9 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java @@ -383,6 +383,7 @@ public class ProjectOrderInfoController extends BaseController projectOrderFileLog.setOrderId(orderId); projectOrderFileLog.setUploadTime(DateUtils.getNowDate()); projectOrderFileLog.setUploadUser(ShiroUtils.getUserId().toString()); + projectOrderFileLog.setUploadUserName(ShiroUtils.getSysUser().getUserName().toString()); projectOrderFileLog.setFileName(file.getOriginalFilename()); projectOrderFileLog.setFileSort(fileSort); projectOrderFileLog.setFileVersionCode(versionCode); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java index b3f6533f..4e5065e0 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectInfo.java @@ -149,6 +149,7 @@ public class ProjectInfo extends BaseEntity /** 币种 */ // @Excel(name = "币种") private String currencyType; + private String level; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index 31beacc4..a969d9d6 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -102,7 +102,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To private static final List LS_LIST = Arrays.asList("3130A6LD"); private static final List ONE_STOR_LIST = Arrays.asList("3130A4NA", "3130A4N9", "3130A4N5"); private static final List N_VIDIA_LIST = Arrays.asList("0504A14F", "0504A14G", "0504A1JX"); - private static final List FILE_INFO_LIST = Arrays.asList("（请上传合同信息）.pdf/.jpg/.png", "（请上传商务折扣审批邮件信息）.pdf/.jpg/.png", "（补充附件）.zip/.rar/.jpg/.png"); + private static final List FILE_INFO_LIST = Arrays.asList( "（请上传商务折扣审批邮件信息）.pdf/.jpg/.png","（请上传合同信息）.pdf/.jpg/.png", "（补充附件）.zip/.rar/.jpg/.png"); @Autowired private TaskService taskService; @@ -418,15 +418,16 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To complete(null, null, getFlowBusinessKey(existProjectOrderInfo.getOrderCode(), projectOrderInfo.getProcessType())); projectOrderInfo.setOrderStatus(ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode()); //根据提交类型判断折上折是 100% 98.8%或者98.5% - if ("0".equals(projectOrderInfo.getProcessTemplate())) { - //直签 98.8 - projectOrderInfo.setDiscountFold(new BigDecimal("0.985")); - } else if ("1".equals(projectOrderInfo.getProcessTemplate())) { - //总代 98.5 - projectOrderInfo.setDiscountFold(new BigDecimal("0.985")); - } else { - projectOrderInfo.setDiscountFold(BigDecimal.ONE); - } + projectOrderInfo.setDiscountFold(BigDecimal.ONE); +// if ("0".equals(projectOrderInfo.getProcessTemplate())) { +// //直签 98.8 +// projectOrderInfo.setDiscountFold(new BigDecimal("0.985")); +// } else if ("1".equals(projectOrderInfo.getProcessTemplate())) { +// //总代 98.5 +// projectOrderInfo.setDiscountFold(new BigDecimal("0.985")); +// } else { +// projectOrderInfo.setDiscountFold(BigDecimal.ONE); +// } } return projectOrderInfoMapper.updateProjectOrderInfo(projectOrderInfo); } diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml index c16a9fb1..5dd786e5 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml @@ -68,13 +68,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t1.create_time, t1.update_by, t1.update_time, - t1.customer_user_name,t1.customer_phone,t1.partner_email,t1.partner_user_name,t1.h3c_person,t1.poc,t1.h3c_phone, + t1.customer_user_name,t1.customer_phone,t1.partner_user_name,t1.h3c_person,t1.poc,t1.h3c_phone, t2.agent_name,t2.contact_email,t2.contact_phone,t2.contact_person, t3.user_name as hz_support_user_name, + t5.level, + t5.contact_email as partner_email, ifnull(t4.work_time,t1.update_time) as last_work_update_time from project_info t1 left join agent_info t2 on t1.agent_code = t2.agent_code left join sys_user t3 on t1.hz_support_user=t3.user_id + left join partner_info t5 on t1.partner_code=t5.partner_code left join (select max(work_time) work_time,project_id from project_work_progress group by project_id) t4 ON t1.id=t4.project_id diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml index 316e05fc..fd1487ea 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml @@ -508,7 +508,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - version_code = cast(version_code as int) +1, + version_code = cast(version_code as UNSIGNED) +1, version_code = #{versionCode},