|
@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.text.DecimalFormat;
|
|
import java.text.DecimalFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -98,6 +99,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
private ApsProcessOperationProcessEquBackupDao apsProcessOperationProcessEquBackupDao;
|
|
private ApsProcessOperationProcessEquBackupDao apsProcessOperationProcessEquBackupDao;
|
|
@Autowired
|
|
@Autowired
|
|
private ApsScheduleConfigService apsScheduleConfigService;
|
|
private ApsScheduleConfigService apsScheduleConfigService;
|
|
|
|
+ @Resource
|
|
|
|
+ private ApsProductionOrderDao apsProductionOrderDao;
|
|
|
|
|
|
|
|
|
|
private final static Map<String, String> UNIT_MAP = new HashMap<String, String>() {{
|
|
private final static Map<String, String> UNIT_MAP = new HashMap<String, String>() {{
|
|
@@ -934,11 +937,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
apsProcessOperationProcessEquService.updateProductionStatus(commonUpdateProductionStatusReq);
|
|
apsProcessOperationProcessEquService.updateProductionStatus(commonUpdateProductionStatusReq);
|
|
|
|
|
|
//更新订单的状态
|
|
//更新订单的状态
|
|
- ApsProductionOrderDo apsProductionOrderDo = new ApsProductionOrderDo();
|
|
|
|
- apsProductionOrderDo.setId(orderId);
|
|
|
|
- apsProductionOrderDo.setChangedate(DateUtil.date());
|
|
|
|
- apsProductionOrderDo.setAuditstatus("待计划评审");
|
|
|
|
- apsProductionOrderService.updateById(apsProductionOrderDo);
|
|
|
|
|
|
+ apsProductionOrderDao.changeOrderById(orderId);
|
|
return R.ok();
|
|
return R.ok();
|
|
}
|
|
}
|
|
|
|
|