pom,工艺路线,封装post提交asp
This commit is contained in:
@@ -7,6 +7,8 @@ import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
/**
|
||||
* ERP Api 实现类
|
||||
*
|
||||
@@ -21,7 +23,7 @@ public class ErpExternalApiImpl implements ErpExternalApi {
|
||||
private ErpConfig erpConfig;
|
||||
|
||||
@Override
|
||||
public ResponseEntity<String> submitDataToErp(ErpSubmitReqDTO reqDTO) {
|
||||
public HashMap<String, String> submitDataToErp(ErpSubmitReqDTO reqDTO) {
|
||||
return erpConfig.pushDataToErp(reqDTO);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -104,7 +104,7 @@ public class ErpAssetController {
|
||||
@PostMapping("/getErpAssetTask")
|
||||
@Operation(summary = "定时获得erp更新资产卡片")
|
||||
@PreAuthorize("@ss.hasPermission('sply:erp-asset:create')")
|
||||
public CommonResult<Boolean> getErpCompanyTask() {
|
||||
public CommonResult<Boolean> getErpAssetTask() {
|
||||
erpAssetService.callErpRfcInterface();
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
|
||||
public class ErpProcessPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "工厂编码")
|
||||
private BigDecimal factoryNumber;
|
||||
private String factoryNumber;
|
||||
|
||||
@Schema(description = "物料编码")
|
||||
private String materialNumber;
|
||||
|
||||
@@ -18,7 +18,7 @@ public class ErpProcessRespVO {
|
||||
|
||||
@Schema(description = "工厂编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("工厂编码")
|
||||
private BigDecimal factoryNumber;
|
||||
private String factoryNumber;
|
||||
|
||||
@Schema(description = "物料编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("物料编码")
|
||||
|
||||
@@ -16,7 +16,7 @@ public class ErpProcessSaveReqVO {
|
||||
|
||||
@Schema(description = "工厂编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "工厂编码不能为空")
|
||||
private BigDecimal factoryNumber;
|
||||
private String factoryNumber;
|
||||
|
||||
@Schema(description = "物料编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotEmpty(message = "物料编码不能为空")
|
||||
|
||||
@@ -34,7 +34,7 @@ public class ErpProcessDO {
|
||||
* 工厂编码
|
||||
*/
|
||||
@TableField("FACT_NUM")
|
||||
private BigDecimal factoryNumber;
|
||||
private String factoryNumber;
|
||||
/**
|
||||
* 物料编码
|
||||
*/
|
||||
@@ -63,7 +63,7 @@ public class ErpProcessDO {
|
||||
/**
|
||||
* 计量单位
|
||||
*/
|
||||
@TableField("UOM")
|
||||
@TableField("UNT")
|
||||
private String uom;
|
||||
/**
|
||||
* 用途
|
||||
|
||||
@@ -48,7 +48,7 @@ public class ErpProcessDetailDO {
|
||||
/**
|
||||
* 作业的计量单位
|
||||
*/
|
||||
@TableField("UOM")
|
||||
@TableField("UNT")
|
||||
private String uom;
|
||||
/**
|
||||
* 工作中心编号
|
||||
|
||||
@@ -312,8 +312,8 @@ public class ErpBomServiceImpl implements ErpBomService {
|
||||
items.add(item);
|
||||
req.put("item", items);
|
||||
reqDTO.setReq(req);
|
||||
ResponseEntity<String> response = erpExternalApi.submitDataToErp(reqDTO);
|
||||
if (response.getStatusCode() == HttpStatus.OK) {
|
||||
HashMap<String, String> response = erpExternalApi.submitDataToErp(reqDTO);
|
||||
if (response.get("result").isEmpty()) {
|
||||
log.info("ERP数据提交成功");
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user