Browse Source

修改

master
shenzhouyu 3 months ago
parent
commit
25523a8c17
  1. 4
      src/main/java/com/gaotao/modules/customer/controller/CustomerIssueController.java
  2. 2
      src/main/java/com/gaotao/modules/customer/service/CustomerIssueService.java
  3. 16
      src/main/java/com/gaotao/modules/customer/service/impl/CustomerIssueServiceImpl.java
  4. 4
      src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java

4
src/main/java/com/gaotao/modules/customer/controller/CustomerIssueController.java

@ -93,8 +93,8 @@ public class CustomerIssueController {
@PostMapping("/customerIssueConfirm") @PostMapping("/customerIssueConfirm")
@ResponseBody @ResponseBody
public R customerIssueConfirm(@RequestBody CustomerIssueDto dto) throws Exception { public R customerIssueConfirm(@RequestBody CustomerIssueDto dto) throws Exception {
customerIssueService.customerIssueConfirm(dto);
return R.ok();
List<String> ids = customerIssueService.customerIssueConfirm(dto);
return R.ok().put("unitIds",ids);
} }
/** /**

2
src/main/java/com/gaotao/modules/customer/service/CustomerIssueService.java

@ -35,7 +35,7 @@ public interface CustomerIssueService {
/** /**
* 客户发料确认 * 客户发料确认
*/ */
void customerIssueConfirm(CustomerIssueDto dto)throws Exception ;
List<String> customerIssueConfirm(CustomerIssueDto dto)throws Exception ;
/** /**
* 获取库存物料信息 * 获取库存物料信息

16
src/main/java/com/gaotao/modules/customer/service/impl/CustomerIssueServiceImpl.java

@ -129,7 +129,7 @@ public class CustomerIssueServiceImpl implements CustomerIssueService {
@Override @Override
@Transactional @Transactional
public void customerIssueConfirm(CustomerIssueDto customerIssueDto) throws Exception {
public List<String> customerIssueConfirm(CustomerIssueDto customerIssueDto) throws Exception {
// 验证工单状态 // 验证工单状态
if(customerIssueDto.getSelectedMaterials() != null && customerIssueDto.getSelectedMaterials().size()>0){ if(customerIssueDto.getSelectedMaterials() != null && customerIssueDto.getSelectedMaterials().size()>0){
boolean b = validateHandingUnitQty(customerIssueDto.getSelectedMaterials()); boolean b = validateHandingUnitQty(customerIssueDto.getSelectedMaterials());
@ -166,7 +166,7 @@ public class CustomerIssueServiceImpl implements CustomerIssueService {
subList.add(subDto); subList.add(subDto);
} }
changeAndAddHandlingUnit(customerIssueDto);
List<String> ids = changeAndAddHandlingUnit(customerIssueDto);
transCommonRequestDto.setSubList(subList); transCommonRequestDto.setSubList(subList);
List<TransDetail> out = transHeaderService.genTransAndChangeInventoryStock(transCommonRequestDto, "OUT"); List<TransDetail> out = transHeaderService.genTransAndChangeInventoryStock(transCommonRequestDto, "OUT");
@ -202,6 +202,8 @@ public class CustomerIssueServiceImpl implements CustomerIssueService {
} }
if(BigDecimal.ZERO.compareTo(hu.getQty()) !=0){ if(BigDecimal.ZERO.compareTo(hu.getQty()) !=0){
hu.setInStockFlag("Y"); hu.setInStockFlag("Y");
}else{
hu.setInStockFlag("N");
} }
handlingUnits.add(hu); handlingUnits.add(hu);
if (material.getIssueQty() != null) { if (material.getIssueQty() != null) {
@ -211,13 +213,15 @@ public class CustomerIssueServiceImpl implements CustomerIssueService {
productionIssueMapper.updateHandingUnit(handlingUnits); productionIssueMapper.updateHandingUnit(handlingUnits);
//返回出库中间表 //返回出库中间表
customerIssueMapper.updateCustomerStatus(customerIssueDto.getWorkOrderNo(),customerIssueDto.getSite()); customerIssueMapper.updateCustomerStatus(customerIssueDto.getWorkOrderNo(),customerIssueDto.getSite());
//调用ifs接口
ShipmentCreateDto createDto = new ShipmentCreateDto(); ShipmentCreateDto createDto = new ShipmentCreateDto();
createDto.setIfsSiteID(customerIssueDto.getSite()); createDto.setIfsSiteID(customerIssueDto.getSite());
createDto.setIfsShipmentID(customerIssueDto.getWorkOrderNo()); createDto.setIfsShipmentID(customerIssueDto.getWorkOrderNo());
createDto.setIfsShipmentType(customerIssueDto.getShipmentType()); createDto.setIfsShipmentType(customerIssueDto.getShipmentType());
createDto.setIfsLocationNo(customerIssueDto.getLocationNo()); createDto.setIfsLocationNo(customerIssueDto.getLocationNo());
ifsApiIssueAndReturnService.addShipmentCreatePickList(createDto); ifsApiIssueAndReturnService.addShipmentCreatePickList(createDto);
return ids;
} }
@Override @Override
@ -470,7 +474,8 @@ public class CustomerIssueServiceImpl implements CustomerIssueService {
} }
@Transactional @Transactional
public void changeAndAddHandlingUnit(CustomerIssueDto customerIssueDto){
public List<String> changeAndAddHandlingUnit(CustomerIssueDto customerIssueDto){
List<String> ids = new ArrayList<>();
for(WorkOrderMaterialDto material : customerIssueDto.getSelectedMaterials()){ for(WorkOrderMaterialDto material : customerIssueDto.getSelectedMaterials()){
// 修改现有处理单元的数量 // 修改现有处理单元的数量
HandlingUnit handlingUnit = customerIssueMapper.selectHandlingUtil(customerIssueDto.getSite(), material.getLabelCode()); HandlingUnit handlingUnit = customerIssueMapper.selectHandlingUtil(customerIssueDto.getSite(), material.getLabelCode());
@ -554,8 +559,11 @@ public class CustomerIssueServiceImpl implements CustomerIssueService {
remainderQty.doubleValue(), "SYSTEM", remainderQty.doubleValue(), "SYSTEM",
"Y", "保存成功" "Y", "保存成功"
); );
ids.add(unitId);
} }
} }
return ids;
} }
} }

4
src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java

@ -244,6 +244,8 @@ public class ProductionIssueServiceImpl implements ProductionIssueService {
} }
if(BigDecimal.ZERO.compareTo(hu.getQty()) !=0){ if(BigDecimal.ZERO.compareTo(hu.getQty()) !=0){
hu.setInStockFlag("Y"); hu.setInStockFlag("Y");
}else{
hu.setInStockFlag("N");
} }
handlingUnits.add(hu); handlingUnits.add(hu);
if (material.getIssueQty() != null) { if (material.getIssueQty() != null) {
@ -612,6 +614,8 @@ public class ProductionIssueServiceImpl implements ProductionIssueService {
} }
if(BigDecimal.ZERO.compareTo(hu.getQty()) !=0){ if(BigDecimal.ZERO.compareTo(hu.getQty()) !=0){
hu.setInStockFlag("Y"); hu.setInStockFlag("Y");
}else{
hu.setInStockFlag("N");
} }
handlingUnits.add(hu); handlingUnits.add(hu);
} }

Loading…
Cancel
Save