销售订单报检区分物料属性

zouyu

昨天 a7418fdc3875d68b03f5d89ceaa0c66a8e3902cd

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

@@ -3,15 +3,14 @@
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.StringUtils;
import com.ruoyi.common.utils.api.MesApiUtils;
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
import lombok.extern.slf4j.Slf4j;
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;
@@ -36,6 +35,9 @@
    private MesApiUtils mesApiUtils;

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

    @Autowired
    private NumberGenerator<IfsSplitOrderRecord> splitOrderRecordNumberGenerator;

    @Before(value = "execution(* com.ruoyi.inspect.service.impl.InsOrderServiceImpl.moveRawMaterial(..))")
    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
@@ -66,6 +68,9 @@
                        //使用相同的系统编号
                        one.setSystemNo(quantityList.get(0).getSystemNo());
                    }
                    if(StringUtils.isBlank(one.getSystemNo())){
                        one.setSystemNo(splitOrderRecordNumberGenerator.generateNumberWithPrefix(IfsSplitOrderRecord.DIGIT,IfsSplitOrderRecord.PREFIX,IfsSplitOrderRecord::getSystemNo));
                    }
                    //同步MES实时库存
                    Map<String, Object> requestMap = new HashMap<>();
                    requestMap.put("partNo", one.getPartNo()); // 零件编号
@@ -92,6 +97,7 @@
                    if(b){
                        ifsSplitOrderRecordService.update(null,Wrappers.<IfsSplitOrderRecord>lambdaUpdate()
                                .set(IfsSplitOrderRecord::getSyncStatus,1)
                                .set(IfsSplitOrderRecord::getSystemNo,one.getSystemNo())
                                .eq(IfsSplitOrderRecord::getId,one.getId()));
                    }
                }