出入库及即入即出修改
This commit is contained in:
		
							parent
							
								
									b754dcfed1
								
							
						
					
					
						commit
						a01322f6c7
					
				| 
						 | 
				
			
			@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 | 
			
		|||
import lombok.Data;
 | 
			
		||||
import lombok.ToString;
 | 
			
		||||
 | 
			
		||||
import javax.validation.constraints.Min;
 | 
			
		||||
import javax.validation.constraints.NotNull;
 | 
			
		||||
import java.io.Serializable;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -38,6 +39,7 @@ public class ImsOutInventoryDetailAdd implements Serializable
 | 
			
		|||
    /** 出库数量 */
 | 
			
		||||
    @ApiModelProperty(value = "出库数量")
 | 
			
		||||
    @NotNull(message = "出库数量不能为空")
 | 
			
		||||
    @Min(value = 0, message = "出库数量不能小于0")
 | 
			
		||||
    private BigDecimal fetchNum;
 | 
			
		||||
 | 
			
		||||
    /** 总价 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -54,6 +54,9 @@ public class ImsIntoInventoryServiceImpl implements IImsIntoInventoryService
 | 
			
		|||
    @Autowired
 | 
			
		||||
    private  IOrderGoodsDetailService orderGoodsDetailService;
 | 
			
		||||
 | 
			
		||||
    @Autowired
 | 
			
		||||
    private IImsOutInventoryService iImsOutInventoryService;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    @Resource
 | 
			
		||||
| 
						 | 
				
			
			@ -109,9 +112,40 @@ public class ImsIntoInventoryServiceImpl implements IImsIntoInventoryService
 | 
			
		|||
        imsIntoInventory.setCreateBy(SecurityUtils.getUsername());
 | 
			
		||||
        imsIntoInventory.setIntoCode(NoGenerateUtils.generateIntoCode());
 | 
			
		||||
        int rows = imsIntoInventoryMapper.insertImsIntoInventory(imsIntoInventory);
 | 
			
		||||
        return insertImsIntoInventoryDetail(imsIntoInventoryAdd.getImsIntoInventoryDetailAddList(), imsIntoInventory, null);
 | 
			
		||||
        ImsIntoInventory imsIntoInventoryVO = insertImsIntoInventoryDetail(imsIntoInventoryAdd.getImsIntoInventoryDetailAddList(), imsIntoInventory, null);
 | 
			
		||||
        //即入即出
 | 
			
		||||
        long intoType = imsIntoInventoryAdd.getIntoType();
 | 
			
		||||
        System.err.println("intoType==================="+intoType);
 | 
			
		||||
        if(intoType == 4) {
 | 
			
		||||
            //新增验货单
 | 
			
		||||
 | 
			
		||||
            ImsOutInventoryAdd imsOutInventoryAdd = new ImsOutInventoryAdd();
 | 
			
		||||
            BeanUtils.copyProperties(imsIntoInventory, imsOutInventoryAdd);
 | 
			
		||||
            imsOutInventoryAdd.setOutType(intoType);
 | 
			
		||||
            imsOutInventoryAdd.setOutDate(imsIntoInventory.getIntoDate());
 | 
			
		||||
            List<ImsOutInventoryDetailAdd> imsOutInventoryDetailAddList =getImsOutInventoryDetailAddList(imsIntoInventory.getImsIntoInventoryDetailList());
 | 
			
		||||
            imsOutInventoryAdd.setImsOutInventoryDetailAddList(imsOutInventoryDetailAddList);
 | 
			
		||||
            iImsOutInventoryService.insertImsOutInventory(imsOutInventoryAdd);
 | 
			
		||||
        }
 | 
			
		||||
        return imsIntoInventoryVO;
 | 
			
		||||
       // return rows;
 | 
			
		||||
    }
 | 
			
		||||
    private void  addImsInspectGoods(Long orderGoodsId){
 | 
			
		||||
        OrderGoodsVO orderGoodsVO = orderGoodsService.selectOrderGoodsByOrderGoodsId(orderGoodsId);
 | 
			
		||||
        List<OrderGoodsDetailVO> orderGoodsDetailList = orderGoodsVO.getOrderGoodsDetailList();
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private List<ImsOutInventoryDetailAdd> getImsOutInventoryDetailAddList(List<ImsIntoInventoryDetail> imsIntoInventoryDetailAddList) {
 | 
			
		||||
        List<ImsOutInventoryDetailAdd> imsOutInventoryDetailAddList = new ArrayList<>();
 | 
			
		||||
        for (ImsIntoInventoryDetail intoInventoryDetail : imsIntoInventoryDetailAddList) {
 | 
			
		||||
            ImsOutInventoryDetailAdd outInventoryDetailAdd = new ImsOutInventoryDetailAdd();
 | 
			
		||||
            BeanUtils.copyProperties(intoInventoryDetail, outInventoryDetailAdd);
 | 
			
		||||
            outInventoryDetailAdd.setFetchNum(intoInventoryDetail.getPurNum());
 | 
			
		||||
            imsOutInventoryDetailAddList.add(outInventoryDetailAdd);
 | 
			
		||||
        }
 | 
			
		||||
        return imsOutInventoryDetailAddList;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 修改入库记录
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -320,6 +320,11 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService
 | 
			
		|||
                                imsOutInventoryDetailForInsert.setIntoDetailId(imsIntoInventoryDetail.getIntoDetailId());
 | 
			
		||||
                                imsOutInventoryDetailForInsert.setFetchNum(imsOutInventoryDetail.getFetchNum());
 | 
			
		||||
                                imsOutInventoryDetailForInsert.setTotalPrice(outTotalPrice);
 | 
			
		||||
                                imsOutInventoryDetailForInsert.setMaterialId(imsIntoInventoryDetail.getMaterialId());
 | 
			
		||||
                                imsOutInventoryDetailForInsert.setMaterialName(imsIntoInventoryDetail.getMaterialName());
 | 
			
		||||
                                imsOutInventoryDetailForInsert.setSupplierId(imsIntoInventoryDetail.getSupplierId());
 | 
			
		||||
                                imsOutInventoryDetailForInsert.setUnitId(imsIntoInventoryDetail.getUnitId());
 | 
			
		||||
                                imsOutInventoryDetailForInsert.setOutUnitPrice(imsIntoInventoryDetail.getUnitPrice());
 | 
			
		||||
                                list.add(imsOutInventoryDetailForInsert);
 | 
			
		||||
                            }else{
 | 
			
		||||
                                throw new ServiceException("出库失败");
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue