|
|
|
@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
|
|
|
|
import jakarta.annotation.Resource; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springblade.common.constant.CommonConstant; |
|
|
|
import org.springblade.common.constant.CommonConstant; |
|
|
|
@ -57,6 +58,9 @@ import org.springblade.desk.produce.pojo.entity.WorkOrder; |
|
|
|
import org.springblade.erpdata.feign.IErpYieldOrderClient; |
|
|
|
import org.springblade.erpdata.feign.IErpYieldOrderClient; |
|
|
|
import org.springblade.scheduling.pojo.entity.PartRelationEntity; |
|
|
|
import org.springblade.scheduling.pojo.entity.PartRelationEntity; |
|
|
|
import org.springblade.scheduling.pojo.entity.QualityGradeEntity; |
|
|
|
import org.springblade.scheduling.pojo.entity.QualityGradeEntity; |
|
|
|
|
|
|
|
import org.springblade.wms.feign.WmsTaskClient; |
|
|
|
|
|
|
|
import org.springblade.wms.pojo.dto.StGraphiteMoldOutDTO; |
|
|
|
|
|
|
|
import org.springblade.wms.pojo.entity.StGraphiteMoldOut; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.context.annotation.Lazy; |
|
|
|
import org.springframework.context.annotation.Lazy; |
|
|
|
@ -144,6 +148,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
@Value("${business.oldMes.pushSyncResult}") |
|
|
|
@Value("${business.oldMes.pushSyncResult}") |
|
|
|
private String addrPushSyncResult; |
|
|
|
private String addrPushSyncResult; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
private WmsTaskClient wmsTaskClient; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrderDto entity) { |
|
|
|
public IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrderDto entity) { |
|
|
|
List<YieldOrder> dataList = baseMapper.selectPage(page, entity, null); |
|
|
|
List<YieldOrder> dataList = baseMapper.selectPage(page, entity, null); |
|
|
|
@ -1458,6 +1465,12 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
yieldOrder.setGlassBiscuitStatus(YieldOrder.GLASS_BISCUIT_ISSUED); |
|
|
|
yieldOrder.setGlassBiscuitStatus(YieldOrder.GLASS_BISCUIT_ISSUED); |
|
|
|
this.updateById(yieldOrder); |
|
|
|
this.updateById(yieldOrder); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//生成烧结子件订单->石墨模 调用
|
|
|
|
|
|
|
|
if (yieldType.equals(YieldOrderEnum.YIELD_TYPE_6.getCode())) { |
|
|
|
|
|
|
|
StGraphiteMoldOutDTO stGraphiteMoldOutDTO = new StGraphiteMoldOutDTO(); |
|
|
|
|
|
|
|
stGraphiteMoldOutDTO.setCardNo(subYield.getCardNo()); |
|
|
|
|
|
|
|
R<List<StGraphiteMoldOut>> listR = wmsTaskClient.generatePreOutOrder(stGraphiteMoldOutDTO); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (CollectionUtils.isNotEmpty(idList)) { |
|
|
|
if (CollectionUtils.isNotEmpty(idList)) { |
|
|
|
//生成的烧结子订单也需要进行合规性校验,另起线程异步执行
|
|
|
|
//生成的烧结子订单也需要进行合规性校验,另起线程异步执行
|
|
|
|
|