|
@@ -11,6 +11,7 @@ import com.fdkankan.manage.service.ICompanyService;
|
|
import com.fdkankan.manage.service.IExcelService;
|
|
import com.fdkankan.manage.service.IExcelService;
|
|
import com.fdkankan.manage.util.ExcelUtil;
|
|
import com.fdkankan.manage.util.ExcelUtil;
|
|
import com.fdkankan.manage.vo.request.CameraInOutParam;
|
|
import com.fdkankan.manage.vo.request.CameraInOutParam;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
@@ -102,11 +103,8 @@ public class ExcelServiceImpl implements IExcelService {
|
|
throw new BusinessException(50003,"出库类型错误:"+outTypeString);
|
|
throw new BusinessException(50003,"出库类型错误:"+outTypeString);
|
|
}
|
|
}
|
|
int outType = outTypeEnum.getCode();
|
|
int outType = outTypeEnum.getCode();
|
|
- Company company = companyService.getCompanyByName(companyName);
|
|
|
|
CameraInOutParam param = new CameraInOutParam();
|
|
CameraInOutParam param = new CameraInOutParam();
|
|
- if(company != null){
|
|
|
|
- param.setCompanyId(company.getId());
|
|
|
|
- }
|
|
|
|
|
|
+ param.setCompanyName(companyName);
|
|
param.setOutType(outType);
|
|
param.setOutType(outType);
|
|
param.setOrderSn(orderSn);
|
|
param.setOrderSn(orderSn);
|
|
param.setSnCode(snCode);
|
|
param.setSnCode(snCode);
|