opt:代码注释
This commit is contained in:
@@ -25,7 +25,7 @@ public class CrmToLmsController {
|
||||
@Log("CRM给LMS推送客户信息")
|
||||
|
||||
@SaIgnore
|
||||
public ResponseEntity<Object> momRollFoilWeighing(@RequestBody JSONObject jo) {
|
||||
public ResponseEntity<Object> getCustomerInfo(@RequestBody JSONObject jo) {
|
||||
return new ResponseEntity<>(crmToLmsService.getCustomerInfo(jo), HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
@@ -121,22 +121,32 @@ public class MesToLmsServiceImpl implements MesToLmsService {
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public JSONObject momRollFoilStart(JSONObject param) {
|
||||
log.info("momRollFoilStart接口输入参数为:-------------------" + param.toString());
|
||||
|
||||
//母卷号
|
||||
String containerName = param.getString("ContainerName");
|
||||
//机台编码
|
||||
String ResourceName = param.getString("ResourceName");
|
||||
//生产工单
|
||||
String MfgOrderName = param.getString("MfgOrderName");
|
||||
//产品编码
|
||||
String ProductName = param.getString("ProductName");
|
||||
//产品名称
|
||||
String Description = param.getString("Description");
|
||||
//理论长度(m)
|
||||
String TheoryHeight = param.getString("TheoryHeight");
|
||||
//设备生产速度m/s
|
||||
String EqpVelocity = param.getString("EqpVelocity");
|
||||
//上卷开始时间
|
||||
String UpCoilerDate = param.getString("UpCoilerDate");
|
||||
//是否重新更新
|
||||
String IsReloadSend = param.getString("IsReloadSend");
|
||||
//备用字段,SF2是锂电,SF1是标箔
|
||||
String Attribute1 = param.getString("Attribute1");
|
||||
if (StringUtils.isEmpty(Attribute1)) {
|
||||
Attribute1 = "SF2";
|
||||
}
|
||||
|
||||
//生箔点位库存表
|
||||
WQLObject pointTab = WQLObject.getWQLObject("ST_IVT_SbPointIvt");
|
||||
//生箔工序工单
|
||||
WQLObject orderTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder");
|
||||
|
||||
JSONObject result = new JSONObject();
|
||||
@@ -166,7 +176,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
|
||||
if (ObjectUtil.isEmpty(UpCoilerDate)) {
|
||||
throw new BadRequestException("开始时间不能为空");
|
||||
}
|
||||
|
||||
//查询当前生箔机台信息
|
||||
JSONObject jsonPoint = pointTab.query("ext_code ='" + ResourceName + "'").uniqueResult(0);
|
||||
if (ObjectUtil.isEmpty(jsonPoint)) {
|
||||
jsonPoint = new JSONObject();
|
||||
|
||||
Reference in New Issue
Block a user