lsh#

1

1 天以前 a217781623d225f955b658e20a076de9ef49d086

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java

@@ -9,6 +9,8 @@
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.service.impl.UserServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +32,8 @@

    @Autowired
    private ReceiveMsgService receiveMsgService;
    @Autowired
    private UserServiceImpl userService;

    /**
     * @author Ryan
@@ -169,8 +173,9 @@
            // 业务验证
            new SyncOrderValidator().validateBatchOrders(orders);

            User erp = userService.getByUsername("erp", 1L);
            // 处理业务
            return receiveMsgService.syncCheckOrder(orders, getLoginUserId());
            return receiveMsgService.syncCheckOrder(orders, erp.getId());
        } catch (IllegalArgumentException e) {
            return R.error(e.getMessage());
        } catch (Exception e) {