提交 7118139f authored 作者: 000516's avatar 000516

修改质检报告接口

......@@ -6,10 +6,7 @@ import com.sfa.operation.service.zzhao.IZzProQualityCoreService;
import com.sfa.system.api.domain.SysDept;
import com.sfa.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* @author : liqiulin
......@@ -34,4 +31,16 @@ public class ZzProQualityCoreController {
vo.setDeptId(dept.getDeptId());
zzProQualityCoreService.add(vo);
}
/**
* 修改质检报告
*/
@PutMapping("/put")
public void update(@RequestBody ZzProductQualityVo vo) {
LoginUser loginUser = SecurityUtils.getLoginUser();
SysDept dept = loginUser.getSysUser().getDept();
vo.setUpdateBy(loginUser.getNickName());
vo.setDeptId(dept.getDeptId());
zzProQualityCoreService.update(vo);
}
}
......@@ -13,4 +13,6 @@ public interface IZzProductQualityDao {
void insert(ZzProductQualityDto dto);
PageInfo page(ZzProductQualityWq wq);
ZzProductQualityDto update(ZzProductQualityDto dto);
}
......@@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.exception.WXLSQLException;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
......@@ -53,6 +54,25 @@ public class ZzProductQualityDaoImpl implements IZzProductQualityDao {
return pageInfo;
}
@Override
public ZzProductQualityDto update(ZzProductQualityDto dto) {
ZzProductQuality zzProductQualityOld = zzProductQualityMapper.selectById(dto.getZpqId());
if (zzProductQualityOld == null) {
throw new CheckedException(ECode.DATA_NULL_ERROR);
}
// 判断创建时间是否已超过48小时
if ((zzProductQualityOld.getCreateTime().getTime() + (48 * 60 * 60 * 1000)) < System.currentTimeMillis()) {
throw new CheckedException(ECode.ZZ_PRODUCT_QUALITY_UPDATE_ERROR);
}
if (!dto.getDeptId().equals(zzProductQualityOld.getDeptId())){
throw new CheckedException(ECode.ZZ_PRODUCT_QUALITY_DEPT_ERROR);
}
ZzProductQuality entity = new ZzProductQuality();
BeanUtils.copyProperties(dto, entity);
zzProductQualityMapper.updateById(entity);
return com.sfa.common.core.utils.bean.BeanUtils.transitionDto(zzProductQualityOld, ZzProductQualityDto.class);
}
private LambdaQueryWrapper<ZzProductQuality> buildQw(ZzProductQualityWq wq){
LambdaQueryWrapper<ZzProductQuality> qw = new LambdaQueryWrapper<>();
if (Objects.nonNull(wq.getDeptId())){
......@@ -71,7 +91,7 @@ public class ZzProductQualityDaoImpl implements IZzProductQualityDao {
if (StringUtils.isNotBlank(wq.getManufacturersNameLike())){
qw.like(ZzProductQuality::getManufacturersName, wq.getManufacturersNameLike());
}
qw.orderByDesc(ZzProductQuality::getShipDate);
qw.orderByDesc(ZzProductQuality::getCreateTime,ZzProductQuality::getShipDate);
return qw;
}
}
......@@ -59,6 +59,8 @@ public class ZzProductQuality implements Serializable {
*/
private String createBy;
private Date createTime;
private String updateBy;
private Date updateTime;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
......
......@@ -11,6 +11,7 @@ import java.util.Date;
*/
@Data
public class ZzProductQualityVo {
private Long zpqId;
/**
* 料号
*/
......@@ -51,6 +52,7 @@ public class ZzProductQualityVo {
*/
private String createBy;
private String updateBy;
private String manufacturersNameLike;
/**
......
......@@ -11,7 +11,7 @@ import java.util.Date;
*/
@Data
public class ZzProductQualityDto {
private Long zpqId;
/**
* 料号
*/
......@@ -50,4 +50,5 @@ public class ZzProductQualityDto {
*/
private String createBy;
private String updateBy;
}
......@@ -9,4 +9,6 @@ import com.sfa.operation.pojo.zzhao.request.ZzProductQualityVo;
*/
public interface IZzProQualityCoreService {
void add(ZzProductQualityVo vo);
void update(ZzProductQualityVo vo);
}
......@@ -10,9 +10,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
/**
* @author : liqiulin
* @date : 2025-10-30 16
......@@ -45,4 +42,33 @@ public class ZzProQualityCoreServiceImpl implements IZzProQualityCoreService {
t100Util.createProQuality(deptJson);
}
@Override
public void update(ZzProductQualityVo vo) {
ZzProductQualityDto dto = new ZzProductQualityDto();
BeanUtils.copyProperties(vo, dto);
ZzProductQualityDto oldDto = zzProductQualityDao.update(dto);
JSONObject oldMap = new JSONObject();
// 料号、批号、检验连接、厂家
oldMap.put("imjyuc001",oldDto.getPrdCode());
oldMap.put("imjyuc002",oldDto.getManufactureBatchNo());
oldMap.put("imjyuc003",oldDto.getQualityUrl());
JSONObject newMap = new JSONObject();
// 料号、批号、检验连接、厂家
newMap.put("imjyuc001",vo.getPrdCode());
newMap.put("imjyuc002",vo.getManufactureBatchNo());
newMap.put("imjyuc003",vo.getQualityUrl());
JSONObject parameterMap = new JSONObject();
parameterMap.put("old",oldMap);
parameterMap.put("new",newMap);
JSONObject deptJson = new JSONObject();
deptJson.putObject("payload").putObject("std_data").put("parameter",parameterMap);
// 数据同步T100
t100Util.updateProQuality(deptJson);
}
}
......@@ -43,6 +43,23 @@ public class T100Util {
log.info("T100-A-质检报告结果:{}",msg);
}
/**
* 修改产品质检报告
*/
public void updateProQuality(JSONObject deptJson){
deptJson.put("host",getHost());
JSONObject datakey = new JSONObject();
datakey.put("CompanyId","BJHQ");
datakey.put("EntId",entId);
deptJson.put("datakey",datakey);
JSONObject service = new JSONObject();
service.put("name","upd_cimi001");
deptJson.put("service",service);
log.info("T100-PUT-质检报告传参:{}",deptJson);
String body = HttpUtil.createPost(url).body(deptJson.toString()).execute().body();
String msg = body.replaceAll("\n", "");
log.info("T100-PUT-质检报告结果:{}",msg);
}
private JSONObject getHost(){
JSONObject host = new JSONObject();
host.put("acct","tiptop");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论