出库单取消功能优化

skyouc

7 天以前 b0409a8bac61d91d6db8755b15d4e2b9c4e3973c

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

@@ -96,9 +96,6 @@
    public synchronized R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
        ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
        if (result.getList().isEmpty()) {
            throw new CoolException("物料导入失败！！");
        }
        if (result.getList().isEmpty()) {
            throw new CoolException("表格内容不能为空！！");
        }
        List<AsnOrderTemplate> resultList = result.getList();
@@ -134,6 +131,7 @@
                    .setMemo(template.getMemo())
                    .setArrTime(date)
                    .setUpdateBy(loginUserId)
                    .setLogisNo(template.getLogicNo())
                    .setCreateBy(loginUserId)
                    .setType(OrderType.getTypeVal(template.getType()))
                    .setWkType(OrderWorkType.getWorkType(template.getWkType()));
@@ -171,6 +169,9 @@
                        .setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
//                        .setTrackCode(trackCode)
                        .setBarcode(trackCode)
                        .setPlatOrderCode(orderTemplate.getPlatOrderCode())
                        .setPlatWorkCode(orderTemplate.getPlatWorkCode())
                        .setProjectCode(orderTemplate.getProjectCode())
                        .setPoCode(orderTemplate.getPoCode())
                        .setPurUnit(matnr.getUnit())
                        .setCreateBy(loginUserId)