suojin
/
jonhon-mes-svr
23
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能修改-sjx

Browse Source
liweidong
sunjianxi 2 months ago
parent 37851a3cdc
commit dba10fc5e1
4 changed files with 178 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
  2. 136
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeasurementRecordsExcel.java
  3. 84
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasurementRecordsController.java
  4. 71
      blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

6
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
Unescape View File

@ -129,6 +129,12 @@ public class EquipmentEntity extends BaseEntity {
*/
@Schema(description = "作业中心ID")
private Long workCenterId;
/**
* 作业中心名称
*/
@Schema(description = "作业中心名称")
private String workCenterName;
public void setDocking(String docking) {
// 核心逻辑：如果传入的是 null 或空字符串，则使用默认值 "0"
if (docking == null || docking.trim().isEmpty()) {

136
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/excel/MeasurementRecordsExcel.java
Unescape View File

@ -27,153 +27,69 @@ public class MeasurementRecordsExcel implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@ColumnWidth(20)
@ExcelProperty("名称(设备名称)")
//@Column("mc_name")
private String mcName;
@ColumnWidth(20)
@ExcelProperty("规格")
//@Column("norms")
private String norms;
@ColumnWidth(20)
@ExcelProperty("类别(管理类别)")
//@Column("mc_class")
private String mcClass;
@ColumnWidth(20)
@ExcelProperty("计量类型")
//@Column("label_no")
private String labelNo;
@ColumnWidth(20)
@ExcelProperty("计量子类型")
//@Column("str2")
private String str2;
@ColumnWidth(20)
@ExcelProperty("编号(测量设备编码)")
//@Column("mc_code")
private String mcCode;
@ColumnWidth(20)
@ExcelProperty("使用单位(试用部门)")
//@Column("use_unit")
private String useUnit;
@ColumnWidth(20)
@ExcelProperty("精度(精度等级)")
//@Column("accuracy")
private String accuracy;
@ColumnWidth(20)
@ExcelProperty("出厂编号")
//@Column("oem_code")
private String oemCode;
@ColumnWidth(20)
@ExcelProperty("生产厂家(制造厂商)")
//@Column("mc_oem")
private String mcOem;
@ColumnWidth(20)
@ExcelProperty("启用日期")
//@Column("enable_date")
private Date enableDate;
@ExcelProperty("类别(管理类别)")
private String mcClass;
@ColumnWidth(20)
@ExcelProperty("检定日期")
//@Column("when_dccept")
private String whenDccept;
@ExcelProperty("设备名称")
private String mcName;
@ColumnWidth(20)
@ExcelProperty("型号(型号)")
//@Column("mc_type")
@ExcelProperty("型号")
private String mcType;
@ColumnWidth(20)
@ExcelProperty("检定周期(检定周期)")
//@Column("test_cycle")
private Integer testCycle;
@ExcelProperty("使用单位")
private String useUnit;
@ColumnWidth(20)
@ExcelProperty("到期日期(有效日期)")
//@Column("due_date")
@ExcelProperty("到期日期")
private Date dueDate;
@ColumnWidth(20)
@ExcelProperty("报废日期")
//@Column("date2")
private Date date2;
@ColumnWidth(20)
@ExcelProperty("状态")
//@Column("belong")
private String belong;
@ColumnWidth(20)
@ExcelProperty("停用日期")
//@Column("when_buy")
private Date whenBuy;
@ExcelProperty("检定周期")
private Integer testCycle;
@ColumnWidth(20)
@ExcelProperty("检定部门")
//@Column("test_dept")
private String testDept;
@ColumnWidth(20)
@ExcelProperty("检定/校验方法(检定校准方法)")
//@Column("test_method")
private String testMethod;
@ColumnWidth(20)
@ExcelProperty("备注")
//@Column("str9")
private String str9;
@ExcelProperty("规格")
private String norms;
@ColumnWidth(20)
@ExcelProperty("备注2")
//@Column("str10")
private String str10;
@ExcelProperty("精度")
private String accuracy;
@ColumnWidth(20)
@ExcelProperty("使用人工号")
//@Column("assets_no")
private String assetsNo;
@ExcelProperty("生产厂家")
private String mcOem;
@ColumnWidth(20)
@ExcelProperty("责任人")
//@Column("str6")
private String str6;
@ExcelProperty("启用日期")
private Date enableDate;
@ColumnWidth(20)
@ExcelProperty("用途分类")
//@Column("purpose_class")
private String purposeClass;
@ExcelProperty("出厂编号")
private String oemCode;
@ColumnWidth(20)
@ExcelProperty("超期情况")
//@Column("is_over_str")
private String isOverStr;
@ExcelProperty("是否送检")
private String censorship;
@ColumnWidth(20)
@ExcelProperty("类型")
//@Column("cm_type")
private Short cmType;
@ExcelProperty("检验结果")
private String checkResult;
@ColumnWidth(20)
@ExcelProperty("是否送检")
//@Column("censorship")
private Boolean censorship;
@ExcelProperty("用途分类")
private String purposeClass;
@ColumnWidth(20)
@ExcelProperty("检验状态")
//@Column("check_status")
private Boolean checkStatus;
@ColumnWidth(20)
@ExcelProperty("检验结果")
//@Column("check_result")
private Boolean checkResult;
}

84
blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasurementRecordsController.java
Unescape View File

@ -1,8 +1,9 @@
package org.springblade.desk.device.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
@ -26,9 +27,11 @@ import org.springblade.desk.device.service.IMeasurementRecordsService;
import org.springblade.desk.device.wrapper.MeasurementRecordsWrapper;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
@ -149,4 +152,83 @@ public class MeasurementRecordsController extends BladeController {
ExcelUtil.export(response, "仪表计量记录数据" + DateUtil.time(), "仪表计量记录数据", excels, MeasurementRecordsExcel.class);
}
/**
* 导入模版
*/
@GetMapping("/importTemplate")
@ApiOperationSupport(order = 9)
@Operation(summary = "导入模版", description = "导入模版")
public void exportYieldOrder(HttpServletResponse response) {
List<MeasurementRecordsExcel> list = new ArrayList<>();
ExcelUtil.export(response, "计量记录" + DateUtil.time(), "计量记录数据表", list, MeasurementRecordsExcel.class);
}
/**
* [基础分类] 导入Excel
*/
@PostMapping("/import")
@ApiOperationSupport(order = 72)
@Operation(summary = "导入Excel", description = "MultipartFile")
public R importExcel(@RequestParam("file") MultipartFile file) {
String message = "导入成功！";
List<MeasurementRecordsEntity> resultList = new ArrayList<>();
List<MeasurementRecordsExcel> importList = ExcelUtil.read(
file, 0, 1, MeasurementRecordsExcel.class
);
if(CollectionUtils.isEmpty(importList)){
message = "无法导入空数据！";
return R.fail("无法导入空数据！");
}
List<String> codeList = importList.stream().filter(item -> StringUtils.isNotEmpty(item.getMcCode())).map(MeasurementRecordsExcel::getMcCode).collect(Collectors.toList());
List<MeasurementRecordsEntity> list = mesMeasurementRecordsService.list(Wrappers.<MeasurementRecordsEntity>lambdaQuery().in(MeasurementRecordsEntity::getMcCode,codeList));
if(CollectionUtils.isNotEmpty(list)){
String codeStr = list.stream().map(MeasurementRecordsEntity::getMcCode).collect(Collectors.joining(","));
message = "设备编号" + codeStr + "已存在，无法导入";
return R.fail(message);
}
for(MeasurementRecordsExcel record : importList){
if(StringUtils.isEmpty(record.getMcCode())){
message = "编码不能为空！";
return R.fail(message);
}
if(StringUtils.isEmpty(record.getMcName())){
message = "名称不能为空！";
return R.fail(message);
}
if(record.getDueDate() == null){
message = "到期日期不能为空！";
return R.fail(message);
}
if(StringUtils.isEmpty(record.getNorms())){
message = "规格不能为空！";
return R.fail(message);
}
if(record.getEnableDate() == null){
message = "启用日期不能为空！";
return R.fail(message);
}
if(StringUtils.isEmpty(record.getCheckResult())){
message = "检验结果不能为空！";
return R.fail(message);
}
if("合格".equals(record.getCheckResult())){
record.setCheckResult("1");
}else{
record .setCheckResult("0");
}
if("是".equals(record.getCensorship())){
record .setCensorship("1");
}else{
record.setCensorship("0");
}
MeasurementRecordsEntity entity = new MeasurementRecordsEntity();
BeanUtils.copyProperties(record,entity);
resultList.add(entity);
}
mesMeasurementRecordsService.saveBatch(resultList);
return R.data(message);
}
}

71
blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java
Unescape View File

@ -281,7 +281,6 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
purtosoList.forEach(mesRbPurtoso -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYpCode(mesRbPurtoso.getWono());
@ -290,6 +289,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setYoCode(mesRbPurtoso.getSono());//生产单号
yieldOrder.setBatchNo(mesRbPurtoso.getSplcode());//批次号
yieldOrder.setPartCode(mesRbPurtoso.getPrtno());//零件号
DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno());
if(part != null){
yieldOrder.setYpArea(part.getArea());
yieldOrder.setProductType(part.getProductType());
yieldOrder.setPartName(part.getPartName());
yieldOrder.setPrimaryCraft(part.getCraftWay());
yieldOrder.setPlate(part.getPlate());
}
yieldOrder.setProductIdent(mesRbPurtoso.getPrtlotno());
yieldOrder.setUseDept(mesRbPurtoso.getPrtudept());
yieldOrder.setDemandDate(mesRbPurtoso.getSoreqdat());//需求日期
@ -306,6 +313,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setReceiveTime(new Date());
yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode());
yieldOrder.setReceiveUser(2038615120549822465L);
yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode());
yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
@ -350,7 +358,6 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
pacturnrecordList.forEach(mesRbPacturnrecord -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYpMemo("临时工艺转工");
@ -359,6 +366,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setYoCode(mesRbPacturnrecord.getSono());//生产单号
yieldOrder.setBatchNo(mesRbPacturnrecord.getSplcode());//批次号
yieldOrder.setPartCode(mesRbPacturnrecord.getPrtno());//零件号
DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno());
if(part != null){
yieldOrder.setYpArea(part.getArea());
yieldOrder.setProductType(part.getProductType());
yieldOrder.setPartName(part.getPartName());
yieldOrder.setPrimaryCraft(part.getCraftWay());
yieldOrder.setPlate(part.getPlate());
}
yieldOrder.setProductIdent(mesRbPacturnrecord.getPrtlotno());
yieldOrder.setUseDept(mesRbPacturnrecord.getSedept());
yieldOrder.setDemandDate(mesRbPacturnrecord.getOreqdat());//需求日期
@ -377,8 +392,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
yieldOrder.setReceiveUser(2038615120549822465L);
yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode());
yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno());
if(part != null && part.getCraftWay() != null && part.getCraftWay().contains("封接")){
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
}
@ -415,7 +430,6 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
rbtosoList.forEach(mesRbtoso -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ);
yieldOrder.setManualIncrease(false);
@ -423,6 +437,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setYpCode(mesRbtoso.getWono());
yieldOrder.setBatchNo(mesRbtoso.getSplcode());//批次号
yieldOrder.setPartCode(mesRbtoso.getPrtno());//零件号
DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbtoso.getPrtno());
if(part != null){
yieldOrder.setYpArea(part.getArea());
yieldOrder.setProductType(part.getProductType());
yieldOrder.setPartName(part.getPartName());
yieldOrder.setPrimaryCraft(part.getCraftWay());
yieldOrder.setPlate(part.getPlate());
}
yieldOrder.setProductIdent(mesRbtoso.getPrtlotno());
yieldOrder.setUseDept(mesRbtoso.getPrtudept());
yieldOrder.setDemandDate(mesRbtoso.getSoreqdat());//需求日期
@ -441,6 +463,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
yieldOrder.setReceiveUser(2038615120549822465L);
yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode());
yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
yieldOrder.setRoamNoNext( "");
if(StringUtils.isNotEmpty(mesRbtoso.getFirseq())){
@ -473,7 +496,6 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
wxpromotionList.forEach(mesRbWxpromotion -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYpMemo("推进计划");
@ -482,6 +504,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setYpCode(mesRbWxpromotion.getWono());
yieldOrder.setBatchNo(mesRbWxpromotion.getSplcode());//批次号
yieldOrder.setPartCode(mesRbWxpromotion.getPrtno());//零件号
DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno());
if(part != null){
yieldOrder.setYpArea(part.getArea());
yieldOrder.setProductType(part.getProductType());
yieldOrder.setPartName(part.getPartName());
yieldOrder.setPrimaryCraft(part.getCraftWay());
yieldOrder.setPlate(part.getPlate());
}
yieldOrder.setProductIdent(mesRbWxpromotion.getPrtlotno());
yieldOrder.setUseDept(mesRbWxpromotion.getPrtudept());
yieldOrder.setDemandDate(mesRbWxpromotion.getSoreqdat());//需求日期
@ -498,6 +528,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode());
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
yieldOrder.setReceiveUser(2038615120549822465L);
yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode());
yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
@ -541,7 +572,6 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
mesRbSodelrecwxList.forEach(mesRbSodelrecwx -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(false);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setManualIncrease(false);
@ -549,6 +579,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setYpCode(mesRbSodelrecwx.getWono());
yieldOrder.setBatchNo(mesRbSodelrecwx.getSplcode());//批次号
yieldOrder.setPartCode(mesRbSodelrecwx.getPrtno());//零件号
DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbSodelrecwx.getPrtno());
if(part != null){
yieldOrder.setYpArea(part.getArea());
yieldOrder.setProductType(part.getProductType());
yieldOrder.setPartName(part.getPartName());
yieldOrder.setPrimaryCraft(part.getCraftWay());
yieldOrder.setPlate(part.getPlate());
}
yieldOrder.setProductIdent(mesRbSodelrecwx.getPrtlotno());
yieldOrder.setUseDept(mesRbSodelrecwx.getPrtudept());
yieldOrder.setDemandDate(mesRbSodelrecwx.getSoreqdat());//需求日期
@ -565,6 +603,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setReceiveTime(new Date());
yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode());
yieldOrder.setReceiveUser(2038615120549822465L);
yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode());
yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
@ -610,7 +649,6 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
mesRbSodelreczgList.forEach(mesRbSodelreczg -> {
//将查询出的数据放到单个的变量中
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYpMemo("正式工艺转工");
@ -619,6 +657,14 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setYpCode(mesRbSodelreczg.getWono());
yieldOrder.setBatchNo(mesRbSodelreczg.getSplcode());//批次号
yieldOrder.setPartCode(mesRbSodelreczg.getPrtno());//零件号
DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbSodelreczg.getPrtno());
if(part != null){
yieldOrder.setYpArea(part.getArea());
yieldOrder.setProductType(part.getProductType());
yieldOrder.setPartName(part.getPartName());
yieldOrder.setPrimaryCraft(part.getCraftWay());
yieldOrder.setPlate(part.getPlate());
}
yieldOrder.setProductIdent(mesRbSodelreczg.getPrtlotno());
yieldOrder.setUseDept(mesRbSodelreczg.getPrtudept());
yieldOrder.setDemandDate(mesRbSodelreczg.getSoreqdat());//需求日期
@ -635,6 +681,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode());
yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
yieldOrder.setReceiveUser(2038615120549822465L);
yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode());
yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());
@ -685,13 +732,20 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
List<YieldOrder> yieldOrderList=new ArrayList<>();
mesRbPkList.forEach(mesRbPk -> {
YieldOrder yieldOrder=new YieldOrder();
yieldOrder.setYpArea((double) 0);
yieldOrder.setSiteWork(true);
yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
yieldOrder.setYoCode(mesRbPk.getWono());//生产单号
yieldOrder.setYpCode(mesRbPk.getWono());
yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号
yieldOrder.setPartCode(mesRbPk.getPrtno());//零件号
DsPartEntity part = apsOrderClient.getDsCraftListByCode(mesRbPk.getPrtno());
if(part != null){
yieldOrder.setYpArea(part.getArea());
yieldOrder.setProductType(part.getProductType());
yieldOrder.setPartName(part.getPartName());
yieldOrder.setPrimaryCraft(part.getCraftWay());
yieldOrder.setPlate(part.getPlate());
}
yieldOrder.setProductIdent(mesRbPk.getPrtlotno());
yieldOrder.setUseDept(mesRbPk.getPrtudept());
yieldOrder.setDemandDate(mesRbPk.getSoreqdat());//需求日期
@ -711,6 +765,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
yieldOrder.setReceiveTime(new Date());
yieldOrder.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode());
yieldOrder.setReceiveUser(2038615120549822465L);
yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_NO.getCode());
yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
yieldOrder.setPriorityErp(YieldOrderEnum.PRIORITY_ERP_NORMAL.getCode());
yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode());

Write Preview
Loading…
Cancel
Save