change - 将员工工资上传ERP

main
yinq 4 months ago
parent 736d6e18ed
commit ba24a3b4d7

@ -4,7 +4,7 @@ import com.os.common.core.controller.BaseController;
import com.os.common.core.domain.AjaxResult;
import com.os.mes.api.domain.ERPParamDto;
import com.os.mes.api.service.IERPPortService;
import com.os.mes.base.service.IBaseCustomDataService;
import com.os.mes.record.domain.RecordStaffSalary;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -70,5 +70,15 @@ public class ERPPortController extends BaseController {
return AjaxResult.success(portService.getERPLatestSalaryData(paramDto));
}
/**
*
* @param recordStaffSalary
* @return
*/
@PostMapping("/addSalaryBreakdown")
public AjaxResult addSalaryBreakdown(@RequestBody RecordStaffSalary recordStaffSalary) {
return AjaxResult.success(portService.addSalaryBreakdown(recordStaffSalary));
}
}

@ -0,0 +1,204 @@
package com.os.mes.api.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.os.common.annotation.Excel;
import com.os.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
/**
* erp
*
* @author Yinq
* @date 2024-07-02
*/
public class ERPStaffSalary
{
private static final long serialVersionUID = 1L;
/**
*
*/
@JsonProperty(value = "AppCode")
private String AppCode;
/**
*
*/
@JsonProperty(value = "Controller")
private String Controller;
/**
*
*/
@JsonProperty(value = "ActionName")
private String ActionName;
/** 身份证 */
@JsonProperty(value = "IDCard")
private String idCard;
/** 班组编号 */
@JsonProperty(value = "GroupID")
private String groupId;
/** 事件日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonProperty(value = "EventDate")
private Date eventDate;
/** 薪资类别 */
@JsonProperty(value = "SalaryCategory")
private String salaryCategory;
/** 收入大类 */
@JsonProperty(value = "RevenueClass")
private String revenueClass;
/** 收入金额 */
@JsonProperty(value = "RevenueAmount")
private BigDecimal revenueAmount;
/** 收入理由 */
@JsonProperty(value = "RevenueReason")
private String revenueReason;
/** 扣罚大类 */
@JsonProperty(value = "FineClass")
private String fineClass;
/** 扣罚金额 */
@JsonProperty(value = "FineAmount")
private BigDecimal fineAmount;
/** 扣罚理由 */
@JsonProperty(value = "fineReason")
private String fineReason;
public String getAppCode() {
return AppCode;
}
public void setAppCode(String appCode) {
AppCode = appCode;
}
public String getController() {
return Controller;
}
public void setController(String controller) {
Controller = controller;
}
public String getActionName() {
return ActionName;
}
public void setActionName(String actionName) {
ActionName = actionName;
}
public String getIdCard() {
return idCard;
}
public void setIdCard(String idCard) {
this.idCard = idCard;
}
public String getGroupId() {
return groupId;
}
public void setGroupId(String groupId) {
this.groupId = groupId;
}
public Date getEventDate() {
return eventDate;
}
public void setEventDate(Date eventDate) {
this.eventDate = eventDate;
}
public String getSalaryCategory() {
return salaryCategory;
}
public void setSalaryCategory(String salaryCategory) {
this.salaryCategory = salaryCategory;
}
public String getRevenueClass() {
return revenueClass;
}
public void setRevenueClass(String revenueClass) {
this.revenueClass = revenueClass;
}
public BigDecimal getRevenueAmount() {
return revenueAmount;
}
public void setRevenueAmount(BigDecimal revenueAmount) {
this.revenueAmount = revenueAmount;
}
public String getRevenueReason() {
return revenueReason;
}
public void setRevenueReason(String revenueReason) {
this.revenueReason = revenueReason;
}
public String getFineClass() {
return fineClass;
}
public void setFineClass(String fineClass) {
this.fineClass = fineClass;
}
public BigDecimal getFineAmount() {
return fineAmount;
}
public void setFineAmount(BigDecimal fineAmount) {
this.fineAmount = fineAmount;
}
public String getFineReason() {
return fineReason;
}
public void setFineReason(String fineReason) {
this.fineReason = fineReason;
}
@Override
public String toString() {
return "ERPStaffSalary{" +
"AppCode='" + AppCode + '\'' +
", Controller='" + Controller + '\'' +
", ActionName='" + ActionName + '\'' +
", idCard='" + idCard + '\'' +
", groupId='" + groupId + '\'' +
", eventDate=" + eventDate +
", salaryCategory='" + salaryCategory + '\'' +
", revenueClass='" + revenueClass + '\'' +
", revenueAmount=" + revenueAmount +
", revenueReason='" + revenueReason + '\'' +
", fineClass='" + fineClass + '\'' +
", fineAmount=" + fineAmount +
", fineReason='" + fineReason + '\'' +
'}';
}
}

@ -5,7 +5,9 @@ import com.os.mes.api.domain.ERPParamDto;
import com.os.mes.api.domain.LatestSalary;
import com.os.mes.base.domain.BaseStaffInfo;
import com.os.mes.prod.domain.ProdOrderDetail;
import com.os.mes.record.domain.RecordStaffSalary;
import java.util.HashMap;
import java.util.List;
/**
@ -38,4 +40,11 @@ public interface IERPPortService {
*/
LatestSalary getERPLatestSalaryData(ERPParamDto paramDto);
/**
*
* @param recordStaffSalary
* @return
*/
String addSalaryBreakdown(RecordStaffSalary recordStaffSalary);
}

@ -4,10 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.os.common.utils.StringUtils;
import com.os.mes.api.domain.ERPParamDto;
import com.os.mes.api.domain.LatestSalary;
import com.os.mes.api.domain.RecordData;
import com.os.mes.api.domain.ResponseData;
import com.os.mes.api.domain.*;
import com.os.mes.api.service.IERPPortService;
import com.os.mes.api.utils.ApiUtils;
import com.os.mes.api.utils.ERPConstants;
@ -16,12 +13,16 @@ import com.os.mes.base.service.IBaseStaffInfoService;
import com.os.mes.prod.domain.ProdOrderDetail;
import com.os.mes.prod.service.IProdOrderInfoService;
import com.os.mes.prod.service.impl.ProdOrderInfoServiceImpl;
import com.os.mes.record.domain.RecordStaffSalary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -151,5 +152,58 @@ public class ERPPortServiceImpl implements IERPPortService {
return latestSalary;
}
/**
*
* @param recordStaffSalary
* @return
*/
@Override
public String addSalaryBreakdown(RecordStaffSalary recordStaffSalary) {
String objectId = null;//ERP返回数据的ObjectId
String requestParam = null;
String result = null;
ERPStaffSalary erpStaffSalary = new ERPStaffSalary();
erpStaffSalary.setAppCode(ERPConstants.addSalaryAppCode);
erpStaffSalary.setController(ERPConstants.addSalaryController);
erpStaffSalary.setActionName(ERPConstants.addSalaryActionName);
erpStaffSalary.setIdCard(recordStaffSalary.getIdCard());
erpStaffSalary.setGroupId(recordStaffSalary.getGroupId());
erpStaffSalary.setEventDate(recordStaffSalary.getEventDate());
erpStaffSalary.setSalaryCategory(recordStaffSalary.getSalaryCategory());
erpStaffSalary.setRevenueClass(recordStaffSalary.getRevenueClass());
erpStaffSalary.setRevenueAmount(recordStaffSalary.getRevenueAmount());
erpStaffSalary.setRevenueReason(recordStaffSalary.getRevenueReason());
try {
// 创建ObjectMapper实例 对象转JSON字符串
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE);
requestParam = objectMapper.writeValueAsString(erpStaffSalary);
// result = ApiUtils.sendERPHttpPost(ERPConstants.ERP_URL, requestParam);
result = "{\n" +
"\t\"Successful\": true,\n" +
"\t\"ErrorMessage\": null,\n" +
"\t\"Logined\": false,\n" +
"\t\"ReturnData\": {\n" +
"\t\t\"data\": {\n" +
"\t\t\t\"ObjectId\": \"25ff81b4-fb0b-4f1c-b9b1-6a2afab1cd0f\"\n" +
"\t\t},\n" +
"\t\t\"result\": \"success\",\n" +
"\t\t\"message\": \"创建成功!\"\n" +
"\t},\n" +
"\t\"DataType\": 0\n" +
"}";
// 处理接口返回消息
ObjectMapper resultMapper = new ObjectMapper();
// 将 JSON 字符串转换为 Java 对象
HashMap hashMap = resultMapper.readValue(result, HashMap.class);
HashMap returnData = (HashMap)hashMap.get("ReturnData");
HashMap<String, Object> data = (HashMap<String, Object>)returnData.get("data");
objectId = String.valueOf(data.get("ObjectId"));
} catch (Exception e) {
logger.warn("新增【薪资明细】异常:" + requestParam + "|" + result + "|" + e);
}
return objectId;
}
}

@ -42,5 +42,9 @@ public class ERPConstants {
public static final String employeeController = "EmployeeApiController";
public static final String employeeActionName = "GetEmployeeInfos";
//新增【薪资明细】
public static final String addSalaryAppCode = "Ad824e2774bf54eaa9493af5985b2f37b";
public static final String addSalaryController = "SalaryDetailApiController";
public static final String addSalaryActionName = "CreateSalaryDetail";
}

@ -110,4 +110,15 @@ public class RecordStaffSalaryController extends BaseController {
return success(list);
}
/**
*
* ERP
* @param recordStaffSalaryList
* @return
*/
@PostMapping("/uploadERPStaffSalary")
public AjaxResult uploadERPStaffSalary(@RequestBody List<RecordStaffSalary> recordStaffSalaryList) {
return toAjax(recordStaffSalaryService.uploadERPStaffSalary(recordStaffSalaryList));
}
}

@ -98,6 +98,17 @@ public class RecordStaffSalary extends BaseEntity
@Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
/** ERP数据的ObjectId */
private String objectId;
public String getObjectId() {
return objectId;
}
public void setObjectId(String objectId) {
this.objectId = objectId;
}
public Date getBeginDate() {
return beginDate;
}

@ -65,4 +65,12 @@ public interface IRecordStaffSalaryService {
* @return
*/
List<RecordStaffSalary> selectTeamEmployeesWages(RecordStaffSalary recordStaffSalary);
/**
*
* ERP
* @param recordStaffSalaryList
* @return
*/
public int uploadERPStaffSalary(List<RecordStaffSalary> recordStaffSalaryList);
}

@ -2,13 +2,11 @@ package com.os.mes.record.service.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Stream;
import com.os.common.utils.DateUtils;
import com.os.common.utils.Threads;
import com.os.common.utils.uuid.PlanCodeUtils;
import com.os.mes.api.domain.ERPParamDto;
import com.os.mes.api.domain.LatestSalary;
@ -131,10 +129,19 @@ public class RecordStaffSalaryServiceImpl implements IRecordStaffSalaryService {
LatestSalary salaryData = portService.getERPLatestSalaryData(new ERPParamDto());
ProdOrderInfo orderInfo = new ProdOrderInfo();
orderInfo.setParams(recordStaffSalary.getParams());
Map<String, Object> params = recordStaffSalary.getParams();
Date beginOrderDate = null;
Date endOrderDate = null;
if (params.containsKey("beginOrderDate")){
beginOrderDate = DateUtils.parseDate(String.valueOf(params.get("beginOrderDate")));
}
if (params.containsKey("endOrderDate")){
endOrderDate = DateUtils.parseDate(String.valueOf(params.get("endOrderDate")));
}
orderInfo.setParams(params);
List<ProdOrderInfo> orderInfoList = prodOrderInfoMapper.selectProdOrderInfoList(orderInfo);
Long objId = 1L;
long objId = 1L;
String taskCode = PlanCodeUtils.getTaskCode();
//按照班组 分工资;
for (BaseTeamMembers team : membersList) {
@ -186,6 +193,8 @@ public class RecordStaffSalaryServiceImpl implements IRecordStaffSalaryService {
staffSalary.setStaffName(staffInfo.getStaffName());
staffSalary.setCardId(staffInfo.getCardId());
staffSalary.setTeamName(team.getTeamName());
staffSalary.setBeginDate(beginOrderDate);
staffSalary.setEndDate(endOrderDate);
result.add(staffSalary);
}
@ -193,4 +202,24 @@ public class RecordStaffSalaryServiceImpl implements IRecordStaffSalaryService {
return result;
}
/**
*
* ERP
* @param recordStaffSalaryList
* @return
*/
@Override
public int uploadERPStaffSalary(List<RecordStaffSalary> recordStaffSalaryList) {
Thread thread = new Thread(() -> {
for (RecordStaffSalary staffSalary : recordStaffSalaryList) {
String objectId = portService.addSalaryBreakdown(staffSalary);
staffSalary.setObjectId(objectId);
recordStaffSalaryMapper.insertRecordStaffSalary(staffSalary);
}
});
thread.start(); //启动新线程
return 1;
}
}

@ -21,6 +21,8 @@
<result property="salaryCoefficient" column="salary_coefficient"/>
<result property="beginDate" column="begin_date"/>
<result property="endDate" column="end_date"/>
<result property="endDate" column="end_date"/>
<result property="objectId" column="object_id"/>
</resultMap>
<sql id="selectRecordStaffSalaryVo">
@ -38,6 +40,7 @@
create_time,
task_code,
salary_coefficient,
object_id,
begin_date,
end_date
from record_staff_salary
@ -60,8 +63,7 @@
<if test="fineReason != null and fineReason != ''">and fine_reason = #{fineReason}</if>
<if test="taskCode != null and taskCode != ''">and task_code = #{taskCode}</if>
<if test="salaryCoefficient != null ">and salary_coefficient = #{salaryCoefficient}</if>
<if test="beginDate != null ">and begin_date = #{beginDate}</if>
<if test="endDate != null ">and end_date = #{endDate}</if>
<if test="objectId != null ">and object_id = #{objectId}</if>
</where>
</select>
@ -88,6 +90,7 @@
<if test="salaryCoefficient != null">salary_coefficient,</if>
<if test="beginDate != null">begin_date,</if>
<if test="endDate != null">end_date,</if>
<if test="objectId != null">object_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="idCard != null">#{idCard},</if>
@ -105,6 +108,7 @@
<if test="salaryCoefficient != null">#{salaryCoefficient},</if>
<if test="beginDate != null">#{beginDate},</if>
<if test="endDate != null">#{endDate},</if>
<if test="objectId != null">#{objectId},</if>
</trim>
</insert>
@ -126,6 +130,7 @@
<if test="salaryCoefficient != null">salary_coefficient = #{salaryCoefficient},</if>
<if test="beginDate != null">begin_date = #{beginDate},</if>
<if test="endDate != null">end_date = #{endDate},</if>
<if test="objectId != null">object_id = #{objectId},</if>
</trim>
where obj_id = #{objId}
</update>

Loading…
Cancel
Save