mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作站线边库的设置。

Browse Source
This commit is contained in:
JinLu.Yin 2022-09-10 10:38:59 +08:00
parent c23a068666
commit 7764262dc7
1 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java
View File

@ -4,10 +4,17 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ktg.common.constant.UserConstants; import com.ktg.common.constant.UserConstants;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.md.domain.MdWorkshop; import com.ktg.mes.md.domain.MdWorkshop;
import com.ktg.mes.md.service.*; import com.ktg.mes.md.service.*;
import com.ktg.mes.pro.domain.ProProcess; import com.ktg.mes.pro.domain.ProProcess;
import com.ktg.mes.pro.service.IProProcessService; import com.ktg.mes.pro.service.IProProcessService;
import com.ktg.mes.wm.domain.WmStorageArea;
import com.ktg.mes.wm.domain.WmStorageLocation;
import com.ktg.mes.wm.domain.WmWarehouse;
import com.ktg.mes.wm.service.IWmStorageAreaService;
import com.ktg.mes.wm.service.IWmStorageLocationService;
import com.ktg.mes.wm.service.IWmWarehouseService;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -55,6 +62,15 @@ public class MdWorkstationController extends BaseController
@Autowired @Autowired
private IMdWorkshopService mdWorkshopService; private IMdWorkshopService mdWorkshopService;
@Autowired
private IWmWarehouseService wmWarehouseService;
@Autowired
private IWmStorageLocationService wmStorageLocationService;
@Autowired
private IWmStorageAreaService wmStorageAreaService;
/** /**
* 查询工作站列表 * 查询工作站列表
*/ */
@ -111,6 +127,33 @@ public class MdWorkstationController extends BaseController
MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId()); MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId());
mdWorkstation.setWorkshopCode(workshop.getWorkshopCode()); mdWorkstation.setWorkshopCode(workshop.getWorkshopCode());
mdWorkstation.setWorkshopName(workshop.getWorkshopName()); mdWorkstation.setWorkshopName(workshop.getWorkshopName());
//线边库的设置
WmWarehouse warehouse = null;
WmStorageLocation location = null;
WmStorageArea area = null;
if(StringUtils.isNotNull(mdWorkstation.getWarehouseId())){
//如果有指定线边库
warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(mdWorkstation.getWarehouseId());
location = wmStorageLocationService.selectWmStorageLocationByLocationId(mdWorkstation.getLocationId());
area = wmStorageAreaService.selectWmStorageAreaByAreaId(mdWorkstation.getAreaId());
}else {
//设置默认的线边库
warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(UserConstants.VIRTUAL_WH);
if(StringUtils.isNull(warehouse)){
//如果没有找到默认的线边库，则进行一次初始化
warehouse = wmWarehouseService.initVirtualWarehouse();
}
location = wmStorageLocationService.selectWmStorageLocationByLocationCode(UserConstants.VIRTUAL_WS);
area = wmStorageAreaService.selectWmStorageAreaByAreaCode(UserConstants.VIRTUAL_WA);
}
mdWorkstation.setWarehouseCode(warehouse.getWarehouseCode());
mdWorkstation.setWorkstationName(warehouse.getWarehouseName());
mdWorkstation.setLocationCode(location.getLocationCode());
mdWorkstation.setLocationName(location.getLocationName());
mdWorkstation.setAreaCode(area.getAreaCode());
mdWorkstation.setAreaName(area.getAreaName());
return toAjax(mdWorkstationService.insertMdWorkstation(mdWorkstation)); return toAjax(mdWorkstationService.insertMdWorkstation(mdWorkstation));
} }
@ -135,6 +178,33 @@ public class MdWorkstationController extends BaseController
MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId()); MdWorkshop workshop = mdWorkshopService.selectMdWorkshopByWorkshopId(mdWorkstation.getWorkshopId());
mdWorkstation.setWorkshopCode(workshop.getWorkshopCode()); mdWorkstation.setWorkshopCode(workshop.getWorkshopCode());
mdWorkstation.setWorkshopName(workshop.getWorkshopName()); mdWorkstation.setWorkshopName(workshop.getWorkshopName());
//线边库的设置
WmWarehouse warehouse = null;
WmStorageLocation location = null;
WmStorageArea area = null;
if(StringUtils.isNotNull(mdWorkstation.getWarehouseId())){
//如果有指定线边库
warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(mdWorkstation.getWarehouseId());
location = wmStorageLocationService.selectWmStorageLocationByLocationId(mdWorkstation.getLocationId());
area = wmStorageAreaService.selectWmStorageAreaByAreaId(mdWorkstation.getAreaId());
}else {
//设置默认的线边库
warehouse = wmWarehouseService.selectWmWarehouseByWarehouseCode(UserConstants.VIRTUAL_WH);
if(StringUtils.isNull(warehouse)){
//如果没有找到默认的线边库，则进行一次初始化
warehouse = wmWarehouseService.initVirtualWarehouse();
}
location = wmStorageLocationService.selectWmStorageLocationByLocationCode(UserConstants.VIRTUAL_WS);
area = wmStorageAreaService.selectWmStorageAreaByAreaCode(UserConstants.VIRTUAL_WA);
}
mdWorkstation.setWarehouseCode(warehouse.getWarehouseCode());
mdWorkstation.setWorkstationName(warehouse.getWarehouseName());
mdWorkstation.setLocationCode(location.getLocationCode());
mdWorkstation.setLocationName(location.getLocationName());
mdWorkstation.setAreaCode(area.getAreaCode());
mdWorkstation.setAreaName(area.getAreaName());
return toAjax(mdWorkstationService.updateMdWorkstation(mdWorkstation)); return toAjax(mdWorkstationService.updateMdWorkstation(mdWorkstation));
} }