|
@ -121,22 +121,32 @@ public class MesToLmsServiceImpl implements MesToLmsService { |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public JSONObject momRollFoilStart(JSONObject param) { |
|
|
public JSONObject momRollFoilStart(JSONObject param) { |
|
|
log.info("momRollFoilStart接口输入参数为:-------------------" + param.toString()); |
|
|
log.info("momRollFoilStart接口输入参数为:-------------------" + param.toString()); |
|
|
|
|
|
//母卷号
|
|
|
String containerName = param.getString("ContainerName"); |
|
|
String containerName = param.getString("ContainerName"); |
|
|
|
|
|
//机台编码
|
|
|
String ResourceName = param.getString("ResourceName"); |
|
|
String ResourceName = param.getString("ResourceName"); |
|
|
|
|
|
//生产工单
|
|
|
String MfgOrderName = param.getString("MfgOrderName"); |
|
|
String MfgOrderName = param.getString("MfgOrderName"); |
|
|
|
|
|
//产品编码
|
|
|
String ProductName = param.getString("ProductName"); |
|
|
String ProductName = param.getString("ProductName"); |
|
|
|
|
|
//产品名称
|
|
|
String Description = param.getString("Description"); |
|
|
String Description = param.getString("Description"); |
|
|
|
|
|
//理论长度(m)
|
|
|
String TheoryHeight = param.getString("TheoryHeight"); |
|
|
String TheoryHeight = param.getString("TheoryHeight"); |
|
|
|
|
|
//设备生产速度m/s
|
|
|
String EqpVelocity = param.getString("EqpVelocity"); |
|
|
String EqpVelocity = param.getString("EqpVelocity"); |
|
|
|
|
|
//上卷开始时间
|
|
|
String UpCoilerDate = param.getString("UpCoilerDate"); |
|
|
String UpCoilerDate = param.getString("UpCoilerDate"); |
|
|
|
|
|
//是否重新更新
|
|
|
String IsReloadSend = param.getString("IsReloadSend"); |
|
|
String IsReloadSend = param.getString("IsReloadSend"); |
|
|
|
|
|
//备用字段,SF2是锂电,SF1是标箔
|
|
|
String Attribute1 = param.getString("Attribute1"); |
|
|
String Attribute1 = param.getString("Attribute1"); |
|
|
if (StringUtils.isEmpty(Attribute1)) { |
|
|
if (StringUtils.isEmpty(Attribute1)) { |
|
|
Attribute1 = "SF2"; |
|
|
Attribute1 = "SF2"; |
|
|
} |
|
|
} |
|
|
|
|
|
//生箔点位库存表
|
|
|
WQLObject pointTab = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); |
|
|
WQLObject pointTab = WQLObject.getWQLObject("ST_IVT_SbPointIvt"); |
|
|
|
|
|
//生箔工序工单
|
|
|
WQLObject orderTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); |
|
|
WQLObject orderTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); |
|
|
|
|
|
|
|
|
JSONObject result = new JSONObject(); |
|
|
JSONObject result = new JSONObject(); |
|
@ -166,7 +176,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { |
|
|
if (ObjectUtil.isEmpty(UpCoilerDate)) { |
|
|
if (ObjectUtil.isEmpty(UpCoilerDate)) { |
|
|
throw new BadRequestException("开始时间不能为空"); |
|
|
throw new BadRequestException("开始时间不能为空"); |
|
|
} |
|
|
} |
|
|
|
|
|
//查询当前生箔机台信息
|
|
|
JSONObject jsonPoint = pointTab.query("ext_code ='" + ResourceName + "'").uniqueResult(0); |
|
|
JSONObject jsonPoint = pointTab.query("ext_code ='" + ResourceName + "'").uniqueResult(0); |
|
|
if (ObjectUtil.isEmpty(jsonPoint)) { |
|
|
if (ObjectUtil.isEmpty(jsonPoint)) { |
|
|
jsonPoint = new JSONObject(); |
|
|
jsonPoint = new JSONObject(); |
|
|