|
|
|
@ -1,6 +1,7 @@
|
|
|
|
|
package com.os.mes.base.service.impl;
|
|
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
import com.os.common.utils.DateUtils;
|
|
|
|
|
import com.os.common.utils.StringUtils;
|
|
|
|
|
import com.os.mes.base.domain.BaseProductLine;
|
|
|
|
@ -18,8 +19,7 @@ import com.os.mes.base.service.IBaseDeviceLedgerService;
|
|
|
|
|
* @date 2024-05-10
|
|
|
|
|
*/
|
|
|
|
|
@Service
|
|
|
|
|
public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
{
|
|
|
|
|
public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService {
|
|
|
|
|
@Autowired
|
|
|
|
|
private BaseDeviceLedgerMapper baseDeviceLedgerMapper;
|
|
|
|
|
|
|
|
|
@ -33,8 +33,7 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
* @return 设备台账
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public BaseDeviceLedger selectBaseDeviceLedgerByObjId(Long objId)
|
|
|
|
|
{
|
|
|
|
|
public BaseDeviceLedger selectBaseDeviceLedgerByObjId(Long objId) {
|
|
|
|
|
return baseDeviceLedgerMapper.selectBaseDeviceLedgerByObjId(objId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -45,8 +44,7 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
* @return 设备台账
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public List<BaseDeviceLedger> selectBaseDeviceLedgerList(BaseDeviceLedger baseDeviceLedger)
|
|
|
|
|
{
|
|
|
|
|
public List<BaseDeviceLedger> selectBaseDeviceLedgerList(BaseDeviceLedger baseDeviceLedger) {
|
|
|
|
|
return baseDeviceLedgerMapper.selectBaseDeviceLedgerList(baseDeviceLedger);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -57,8 +55,7 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public int insertBaseDeviceLedger(BaseDeviceLedger baseDeviceLedger)
|
|
|
|
|
{
|
|
|
|
|
public int insertBaseDeviceLedger(BaseDeviceLedger baseDeviceLedger) {
|
|
|
|
|
baseDeviceLedger.setCreateTime(DateUtils.getNowDate());
|
|
|
|
|
return baseDeviceLedgerMapper.insertBaseDeviceLedger(baseDeviceLedger);
|
|
|
|
|
}
|
|
|
|
@ -70,8 +67,7 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public int updateBaseDeviceLedger(BaseDeviceLedger baseDeviceLedger)
|
|
|
|
|
{
|
|
|
|
|
public int updateBaseDeviceLedger(BaseDeviceLedger baseDeviceLedger) {
|
|
|
|
|
baseDeviceLedger.setUpdateTime(DateUtils.getNowDate());
|
|
|
|
|
return baseDeviceLedgerMapper.updateBaseDeviceLedger(baseDeviceLedger);
|
|
|
|
|
}
|
|
|
|
@ -83,8 +79,7 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public int deleteBaseDeviceLedgerByObjIds(Long[] objIds)
|
|
|
|
|
{
|
|
|
|
|
public int deleteBaseDeviceLedgerByObjIds(Long[] objIds) {
|
|
|
|
|
return baseDeviceLedgerMapper.deleteBaseDeviceLedgerByObjIds(objIds);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -95,20 +90,20 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public int deleteBaseDeviceLedgerByObjId(Long objId)
|
|
|
|
|
{
|
|
|
|
|
public int deleteBaseDeviceLedgerByObjId(Long objId) {
|
|
|
|
|
return baseDeviceLedgerMapper.deleteBaseDeviceLedgerByObjId(objId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取设备编号
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String getDeviceCode() {
|
|
|
|
|
int incrementedNumber = 1;
|
|
|
|
|
String deviceCode = baseDeviceLedgerMapper.getDeviceCode();
|
|
|
|
|
if (StringUtils.isNotEmpty(deviceCode)){
|
|
|
|
|
if (StringUtils.isNotEmpty(deviceCode)) {
|
|
|
|
|
String numericPart = deviceCode.substring(1);
|
|
|
|
|
// 将数字部分转换为整数并加1
|
|
|
|
|
incrementedNumber = Integer.parseInt(numericPart) + 1;
|
|
|
|
@ -120,7 +115,8 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*通过设备编号查询设备台账
|
|
|
|
|
* 通过设备编号查询设备台账
|
|
|
|
|
*
|
|
|
|
|
* @param equipmentNo 设备台账
|
|
|
|
|
* @param processStage 工艺阶段
|
|
|
|
|
* @return
|
|
|
|
@ -128,17 +124,15 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
|
|
|
|
|
@Override
|
|
|
|
|
public BaseDeviceLedger selectBaseDeviceLedgerByDeviceCode(String equipmentNo, String processStage) {
|
|
|
|
|
BaseDeviceLedger baseDeviceLedger = baseDeviceLedgerMapper.selectBaseDeviceLedgerByDeviceCode(equipmentNo);
|
|
|
|
|
if (processStage.equals("出布") || processStage.equals("成型") || processStage.equals("包胶")) {
|
|
|
|
|
BaseProductLine productLine = new BaseProductLine();
|
|
|
|
|
productLine.setProductLineName(processStage);
|
|
|
|
|
productLine.setWorkCenterCode(baseDeviceLedger.getProductLineCode());
|
|
|
|
|
List<BaseProductLine> productLineList = baseProductLineMapper.selectBaseProductLineList(productLine);
|
|
|
|
|
if (!productLineList.isEmpty()){
|
|
|
|
|
if (!productLineList.isEmpty()) {
|
|
|
|
|
BaseProductLine baseProductLine = productLineList.get(0);
|
|
|
|
|
baseDeviceLedger.setProductLineCode(baseProductLine.getProductLineCode());//工位
|
|
|
|
|
baseDeviceLedger.setProcessCode(baseProductLine.getWorkCenterName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return baseDeviceLedger;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|