|
|
@ -35,10 +35,7 @@ import com.glxp.sale.admin.res.inout.WarehouseUserResponse;
|
|
|
|
import com.glxp.sale.admin.res.inventory.InvBusUserResponse;
|
|
|
|
import com.glxp.sale.admin.res.inventory.InvBusUserResponse;
|
|
|
|
import com.glxp.sale.admin.service.auth.AuthAdminService;
|
|
|
|
import com.glxp.sale.admin.service.auth.AuthAdminService;
|
|
|
|
import com.glxp.sale.admin.service.auth.CustomerService;
|
|
|
|
import com.glxp.sale.admin.service.auth.CustomerService;
|
|
|
|
import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
|
|
|
|
import com.glxp.sale.admin.service.basic.*;
|
|
|
|
import com.glxp.sale.admin.service.basic.BussinessTypeService;
|
|
|
|
|
|
|
|
import com.glxp.sale.admin.service.basic.UdiInfoService;
|
|
|
|
|
|
|
|
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
|
|
|
|
|
|
|
|
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
|
|
|
|
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
|
|
|
|
import com.glxp.sale.admin.service.info.CompanyService;
|
|
|
|
import com.glxp.sale.admin.service.info.CompanyService;
|
|
|
|
import com.glxp.sale.admin.service.inout.*;
|
|
|
|
import com.glxp.sale.admin.service.inout.*;
|
|
|
@ -111,6 +108,8 @@ public class WareHouseController {
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
UdiInfoUtils udiInfoUtils;
|
|
|
|
UdiInfoUtils udiInfoUtils;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private CustomService customService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1098,7 +1097,7 @@ public class WareHouseController {
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//计算实际数量
|
|
|
|
//计算实际数量
|
|
|
|
int reCount= udiInfoUtils.getActCount(warehouseEntity);
|
|
|
|
int reCount= customService.getActCount(warehouseEntity);
|
|
|
|
warehouseEntity.setReCount(reCount);
|
|
|
|
warehouseEntity.setReCount(reCount);
|
|
|
|
boolean b = codesTempService.update(warehouseEntity);
|
|
|
|
boolean b = codesTempService.update(warehouseEntity);
|
|
|
|
if (warehouseEntity.getMySupId() != null) {
|
|
|
|
if (warehouseEntity.getMySupId() != null) {
|
|
|
|