Browse Source

availability control id 不允许其他出库

master
han\hanst 3 months ago
parent
commit
493561770d
  1. 9
      src/main/java/com/gaotao/modules/handlingunit/controller/HandlingUnitController.java
  2. 2
      src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java
  3. 8
      src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java
  4. 6
      src/main/java/com/gaotao/modules/scrap/controller/ScrapController.java

9
src/main/java/com/gaotao/modules/handlingunit/controller/HandlingUnitController.java

@ -46,6 +46,15 @@ public class HandlingUnitController extends AbstractController {
return R.ok().put("data", detail);
}
/**
* 扫描处理单元标签用于其他出库模块
*/
@PostMapping("scanHandlingUnitLabelForOther")
public R scanHandlingUnitLabelForOther(@RequestBody HandlingUnitDto dto) {
HandlingUnitDto detail = handlingUnitService.scanHandlingUnitLabelForOther(dto.getSite(), dto.getUnitId());
return R.ok().put("data", detail);
}
/**
* 装Handling Unit托盘/
*/

2
src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java

@ -24,6 +24,8 @@ public interface HandlingUnitService extends IService<HandlingUnit> {
*/
HandlingUnitDto getHandlingUnitDetail(String site, String unitId);
HandlingUnitDto scanHandlingUnitLabelForYiKu(String site, String unitId);
HandlingUnitDto scanHandlingUnitLabelForOther(String site, String unitId);
/**
* 装Handling Unit托盘/
*/

8
src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java

@ -65,6 +65,14 @@ public class HandlingUnitServiceImpl extends ServiceImpl<HandlingUnitMapper, Han
return baseMapper.selectHandlingUnitDetail(site, unitId);
}
@Override
public HandlingUnitDto scanHandlingUnitLabelForOther(String site, String unitId) {
if(!wmsAvailabilityControlIdService.checkPartOperationAllowed(site,unitId,"part_non_order_issue_control")){
throw new RuntimeException("本标签的 availability control id 不允许其他出库!");
}
return baseMapper.selectHandlingUnitDetail(site, unitId);
}
@Override
@Transactional
public String packHandlingUnit(HandlingUnitPackDto packDto) {

6
src/main/java/com/gaotao/modules/scrap/controller/ScrapController.java

@ -5,6 +5,7 @@ import com.gaotao.modules.scrap.entity.ScrapLabelDto;
import com.gaotao.modules.scrap.entity.ScrapConfirmDto;
import com.gaotao.modules.scrap.service.ScrapService;
import com.gaotao.modules.sys.controller.AbstractController;
import com.gaotao.modules.warehouse.service.WmsAvailabilityControlIdService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -20,12 +21,17 @@ public class ScrapController extends AbstractController {
@Autowired
private ScrapService scrapService;
@Autowired
private WmsAvailabilityControlIdService wmsAvailabilityControlIdService;
/**
* 扫描报废标签
*/
@PostMapping("scanScrapLabel")
public R scanScrapLabel(@RequestBody ScrapLabelDto dto) {
if(!wmsAvailabilityControlIdService.checkPartOperationAllowed(dto.getSite(),dto.getLabelCode(),"part_scrap_control")){
throw new RuntimeException("本标签的 availability control id 不允许报废!");
}
try {
ScrapLabelDto labelInfo = scrapService.scanScrapLabel(dto);
if (labelInfo != null) {

Loading…
Cancel
Save