订单拆分功能调整

zouyu

5 小时以前 e4d0ac2171bb181144c4cca91506780b269a5e02

订单拆分功能调整

 inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java

@@ -3,7 +3,9 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.api.MesApiUtils;
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
@@ -11,15 +13,13 @@
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.*;

/**
 * 执行ifs移库操作后，同步推送mes实时库存
@@ -37,10 +37,7 @@

    private final static String LOCATION_NO = "WG-02-001";//mes外购合格库位

    public static final int DIGIT = 6;
    public static final String PREFIX ="KC";

    @AfterReturning(value = "execution(* com.ruoyi.inspect.service.impl.InsOrderServiceImpl.moveRawMaterial(..))")
    @Before(value = "execution(* com.ruoyi.inspect.service.impl.InsOrderServiceImpl.moveRawMaterial(..))")
    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
    public void doAfterReturning(JoinPoint joinPoint) {
        Object[] args = joinPoint.getArgs();
@@ -58,14 +55,25 @@
                        .last("limit 1")
                );
                if(Objects.nonNull(one)){
                    //生成系统编号

                    //查询对应记录相同批号和零件且已同步的订单记录
                    List<IfsSplitOrderRecord> quantityList = ifsSplitOrderRecordService.list(Wrappers.<IfsSplitOrderRecord>lambdaQuery()
                            .eq(IfsSplitOrderRecord::getPartNo,one.getPartNo())
                            .eq(IfsSplitOrderRecord::getLotBatchNo,one.getLotBatchNo())
                            .ne(IfsSplitOrderRecord::getId,one.getId())
                            .eq(IfsSplitOrderRecord::getSyncStatus,1)
                    );
                    if(!quantityList.isEmpty()){
                        //使用相同的系统编号
                        one.setSystemNo(quantityList.get(0).getSystemNo());
                    }
                    //同步MES实时库存
                    Map<String, Object> requestMap = new HashMap<>();
                    requestMap.put("partNo", one.getPartNo()); // 零件编号
                    requestMap.put("systemNo", one.getSystemNo()); // 系统编号
                    requestMap.put("newSystemNo", one.getSystemNo()); // 新系统编号
                    requestMap.put("spec", one.getSpec()); // 规格
                    requestMap.put("partBatchNo", one.getLotBatchNo()); // 零件批号
                    requestMap.put("newPartBatchNo", one.getLotBatchNo()); // 新零件批号
                    requestMap.put("stockQuantity", one.getLength()); // 库存数量1
                    requestMap.put("qty", one.getQtyStock()); // 库存数量2
                    requestMap.put("insulationColor", one.getInsulationColor()); // 绝缘颜色
@@ -78,6 +86,7 @@
                    requestMap.put("remark", one.getRemark()); // 备注

                    String jsonStr = JSONUtil.toJsonStr(Collections.singletonList(requestMap));
                    log.info("同步MES实时库存请求参数-->{}",jsonStr);
                    boolean b = mesApiUtils.batchAddStock(jsonStr);
                    //同步成功，更新同步状态
                    if(b){

 inspect-server/src/main/java/com/ruoyi/inspect/pojo/IfsSplitOrderRecord.java

@@ -21,6 +21,10 @@
    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

    public static final int DIGIT = 6;//系统编号生成位数

    public static final String PREFIX ="WG";//系统编号生成前缀

    /**
     * 主键id
     */

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java

@@ -104,6 +104,7 @@

    private InsUnqualifiedHandlerMapper insUnqualifiedHandlerMapper;

    private final NumberGenerator<IfsSplitOrderRecord> splitOrderRecordNumberGenerator;

    @Override
    public Result selectStandardTreeListByPartNo(String partNo) {
@@ -115,7 +116,7 @@
        for (FactoryDto factoryDto : factoryDtos) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
                    if (sampleTypeDto.getChildren().size() == 0) {
                    if (sampleTypeDto.getChildren().isEmpty()) {
                        sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
                    }
                    // 判断绑定的是否是当前零件号
@@ -942,16 +943,17 @@
        }
        //勾选同步到MES，保存订单拆分记录
        if(orderSplitDTO.getPushToMes()){
            List<IfsSplitOrderRecord> collect = orderSplitDTO.getSplitDetailList().stream().map(m -> {
            orderSplitDTO.getSplitDetailList().forEach(m -> {
                IfsSplitOrderRecord record = new IfsSplitOrderRecord();
                BeanUtil.copyProperties(m, record);
                record.setSystemNo(splitOrderRecordNumberGenerator.generateNumberWithPrefix(IfsSplitOrderRecord.DIGIT, IfsSplitOrderRecord.PREFIX, IfsSplitOrderRecord::getSystemNo));
                record.setOrderNo(ifsInventoryQuantity.getOrderNo());
                record.setLineNo(ifsInventoryQuantity.getLineNo());
                record.setReleaseNo(ifsInventoryQuantity.getReleaseNo());
                record.setReceiptNo(ifsInventoryQuantity.getReceiptNo());
                return record;
            }).collect(Collectors.toList());
            return ifsSplitOrderRecordService.saveBatch(collect);
                ifsSplitOrderRecordService.save(record);
            });
            return true;
        }
        return false;
    }