PO单模板优化 ASN单模板优化

skyouc

8 天以前 f5b4f189e460480a96acf3d1864344d8d5d92695

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java

@@ -5,13 +5,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
import com.vincent.rsf.server.manager.enums.OrderSourceType;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.entity.excel.PurchaseTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.mapper.PurchaseItemMapper;
@@ -30,7 +30,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;

@@ -81,7 +80,7 @@
            }
            purchase.setType(OrderType.getTypeVal(template.getType()))
                    .setWkType(OrderWorkType.getWorkType(template.getWkType()))
                    .setSource(template.getSource())
                    .setSource(OrderSourceType.ORDER_SOURCE_TYPE_EXCEL.desc)
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId);
            if (!purchaseService.save(purchase)) {
@@ -101,13 +100,11 @@
                        .setMatnrCode(matnr.getCode())
                        .setPlatItemId(template.getPlatItemId())
                        .setAnfme(template.getAnfme())
                        .setQty(template.getQty())
                        .setPurchaseId(purchase.getId())
                        .setNromQty(matnr.getNromNum())
                        .setSplrBatch(template.getSplrBatch())
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId)
                        .setUnit(template.getUnit());
                        .setUpdateBy(loginUserId);

                if (StringUtils.isNotBlank(purchaseTemplate.getSplrCode())) {
                    Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()