north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedProductOut.vue
@@ -293,6 +293,8 @@ ElMessage.warning(t('productStock.msg1')) }else if (res.data==="false2") { ElMessage.warning(t('productStock.msg2')) }else if (res.data==="false3") { ElMessage.warning(t('basicData.msg.quantityError')) }else { ElMessage.warning(t('productStock.deliveryFailed')) } north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java
@@ -39,6 +39,9 @@ FinishedGoodsInventory findOrderNumberd(@Param("orderId") String orderId, @Param("orderNumber") Integer orderNumber); OrderDetail findOrderDetailNumberd(@Param("orderId") String orderId, @Param("orderNumber") Integer orderNumber); Integer finishedGoodsInventorybycount(@Param("orderId") String orderId, @Param("orderNumber") Integer orderNumber); north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java
@@ -208,6 +208,7 @@ for (OrderDetail orderDetail : orderDetaillist) { //获取单号 String oddNumber= orderNumberSetting("出库"); OrderDetail orderDetailNew= finishedGoodsInventoryMapper.findOrderDetailNumberd(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber()); //添加出入库记录 finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber); Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber()); @@ -230,7 +231,7 @@ if (finishedGoodsInventorycount > 0) { //判断发货单是否已出库 if(deliveryDetail==null){ if(orderDetail.getWarehouseNum()>=orderDetail.getDeliveryDetail().getQuantity()){ if(orderDetailNew.getWarehouseNum()>=orderDetail.getDeliveryDetail().getQuantity()){ //修改库存表库存数量 finishedGoodsInventoryMapper.updateInventoryInventoryOut(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getQuantity()); //修改发货明细表状态 @@ -251,6 +252,9 @@ //修改发货表状态 finishedGoodsInventoryMapper.updateDeliveryDeliveryState(orderDetail.getDeliveryDetail().getDeliveryId(),2); } }else{ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); return "false3"; } }else{ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -547,6 +547,13 @@ </select> <select id="findOrderDetailNumberd" > select * from sd.`order_detail` where order_number = #{orderNumber} and order_id=#{orderId}; </select> <select id="finishedGoodsInventorybycount" > select quantity_available from mm.`finished_goods_inventory`