李涛
1 day ago
parent
d613fca97b
commit
269151a6e4
20 changed files with 555 additions and 31 deletions
@ -0,0 +1,30 @@ |
||||
package org.springblade.job.processor.produce; |
||||
|
||||
import jakarta.annotation.Resource; |
||||
import lombok.Data; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.desk.produce.feign.IDisTaskingClient; |
||||
import org.springframework.stereotype.Component; |
||||
import tech.powerjob.worker.core.processor.ProcessResult; |
||||
import tech.powerjob.worker.core.processor.TaskContext; |
||||
import tech.powerjob.worker.core.processor.sdk.BasicProcessor; |
||||
|
||||
/** |
||||
* 已完成订单同步给erp |
||||
* |
||||
* @author litao |
||||
*/ |
||||
@Component |
||||
@Data |
||||
@Slf4j |
||||
public class TransferOrderProcessor implements BasicProcessor { |
||||
|
||||
@Resource |
||||
private IDisTaskingClient client; |
||||
|
||||
@Override |
||||
public ProcessResult process(TaskContext context) throws Exception { |
||||
log.info("已完成订单同步给erp开始"); |
||||
return new ProcessResult(client.rbTransferOrder()); |
||||
} |
||||
} |
||||
@ -0,0 +1,77 @@ |
||||
package org.springblade.desk.produce.pojo.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 未发送erp订单信息 视图实体类 |
||||
* |
||||
* @author BladeX |
||||
* @since 2026-02-04 |
||||
*/ |
||||
@Data |
||||
public class HandoverRecordVO { |
||||
|
||||
@Schema(description = "移交记录id") |
||||
private Long hrId; |
||||
|
||||
@Schema(description = "单号") |
||||
private String hrCode; |
||||
|
||||
@Schema(description = "计划单号") |
||||
private String ypCode; |
||||
|
||||
@Schema(description = "车间订单号") |
||||
private String woCode; |
||||
|
||||
@Schema(description = "零件号") |
||||
private String partCode; |
||||
|
||||
@Schema(description = "流程卡号") |
||||
private String cardNo; |
||||
|
||||
@Schema(description = "mes流程卡号") |
||||
private String mesCardNo; |
||||
|
||||
@Schema(description = "生产标识") |
||||
private String prodIdent; |
||||
|
||||
@Schema(description = "批次号") |
||||
private String batchNo; |
||||
|
||||
@Schema(description = "移交部门") |
||||
private String handoverUnit; |
||||
|
||||
@Schema(description = "移交数量") |
||||
private Integer handoverQty; |
||||
|
||||
@Schema(description = "B号") |
||||
private String roamNo; |
||||
|
||||
@Schema(description = "接收部门") |
||||
private String recDept; |
||||
|
||||
@Schema(description = "备注") |
||||
private String memo; |
||||
|
||||
@Schema(description = "创建时间") |
||||
private Date createTime; |
||||
|
||||
@Schema(description = "创建人") |
||||
private String createMan; |
||||
|
||||
@Schema(description = "外协交件单号") |
||||
private String deliverKey; |
||||
|
||||
@Schema(description = "试验数量") |
||||
private Integer testQty; |
||||
|
||||
@Schema(description = "消耗数量") |
||||
private Integer lossQty; |
||||
|
||||
@Schema(description = "报废数量") |
||||
private Integer scrapQty; |
||||
|
||||
} |
||||
@ -0,0 +1,23 @@ |
||||
package org.springblade.erpdata.pojo.vo; |
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* erp存储过程返回数据 视图实体类 |
||||
* |
||||
* @author litao |
||||
*/ |
||||
@Data |
||||
public class ErpReturnDataVO { |
||||
|
||||
@Schema(description = "返回信息") |
||||
private String excnote; |
||||
|
||||
@Schema(description = "状态码") |
||||
private String excflag; |
||||
|
||||
@Schema(description = "数据") |
||||
private String sqlerrm; |
||||
|
||||
} |
||||
@ -0,0 +1,55 @@ |
||||
package org.springblade.desk.produce.controller; |
||||
|
||||
import com.alibaba.fastjson.JSONObject; |
||||
import com.google.protobuf.ServiceException; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import jakarta.servlet.http.HttpServletRequest; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.desk.oldv1.constant.Constant; |
||||
import org.springblade.desk.oldv1.pojo.ResultInfo; |
||||
import org.springblade.desk.produce.pojo.vo.*; |
||||
import org.springblade.desk.quality.service.IReviewSheetService; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
/** |
||||
* aiwebapi接口 控制器 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
@Slf4j |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/aiWebapi") |
||||
@Tag(name = "aiWebapi接口", description = "供外部调用接口") |
||||
public class AiWebApiController extends BladeController { |
||||
|
||||
private final IReviewSheetService qcReviewSheetService; |
||||
|
||||
@PostMapping("/reviewResult") |
||||
@Operation(summary = "审理结束回调接口") |
||||
public ResultInfo reviewResult(HttpServletRequest request) throws Exception { |
||||
JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS); |
||||
if (params == null || params.isEmpty()) { |
||||
throw new ServiceException("参数传递异常!"); |
||||
} |
||||
try { |
||||
String trialId = params.getString("trialId"); |
||||
Short resultStatus = params.getShort("resultStatus"); |
||||
String reviewMan = params.getString("reviewMan"); |
||||
String liabilityPart = params.getString("liabilityPart"); |
||||
Integer scrapQty = params.getInteger("scrapQty"); |
||||
Integer reworkQty = params.getInteger("reworkQty"); |
||||
Integer concedeQty = params.getInteger("concedeQty"); |
||||
String memo = params.getString("memo"); |
||||
qcReviewSheetService.reviewResult(trialId, resultStatus, reviewMan, liabilityPart, scrapQty, reworkQty, concedeQty, memo); |
||||
log.error("审理结束回调接口{}", params.toJSONString()); |
||||
} catch (Exception e) { |
||||
log.error("审理结束回调接口{}", params.toJSONString(), e); |
||||
} |
||||
return ResultInfo.ok(); |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue